From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 17:49:32 +0800
Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接
---
admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index c137a58..59eb80b 100644
--- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
+++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
@@ -21,6 +21,7 @@
@close="inventorySetting.show = false"
@search="search"
/>
+ <detail v-if="inventoryDetail.show" :setting="inventoryDetail" @close="inventoryDetail.show = false" @search="search" />
</el-card>
</el-container>
</el-container>
@@ -38,17 +39,17 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import inventory from './inventory';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
+import detail from './detail';
+import {selectTenantWarehouse} from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
-import { getBaseUrl } from '@/utils/base';
-import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
-import { inventoryListApi, inventoryDel } from '@/api/stock/inventory';
+import {getBaseUrl} from '@/utils/base';
+import {inventoryDel, inventoryListApi} from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit, myImport, inventory },
+ components: { MyButton, MyTableV2, edit, myImport, inventory,detail },
data() {
return {
// 鎼滅储妗�
@@ -127,6 +128,12 @@
orgId: '',
show: false,
},
+ inventoryDetail:{
+ title: '',
+ id: '',
+ orgId: '',
+ show: false,
+ },
// 琛ㄦ牸鏁版嵁
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
@@ -154,11 +161,11 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' },
- { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left' },
- { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left' },
- { title: '鐩樼偣浜�', field: 'operatorName', align: 'left' },
- { title: '鐩戠洏浜�', field: 'operatorName2', align: 'left' },
+ { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 },
+ { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'left', minWidth: 140 },
+ { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'left', minWidth: 130 },
+ { title: '鐩樼偣浜�', field: 'operatorName', align: 'center', width: 120 },
+ { title: '鐩戠洏浜�', field: 'operatorName2', align: 'center', width: 120 },
{
title: '鐩樼偣鏃堕棿',
field: 'inventoryDate',
@@ -180,7 +187,8 @@
{
title: '鐘舵��',
field: 'states',
- align: 'left',
+ align: 'center',
+ width: 90,
type: 'primary',
formatter: (row) => {
return {
@@ -255,7 +263,7 @@
},
},
{
- title: '鐢熶骇鐩樼偣琛�',
+ title: '鐢熸垚鐩樼偣琛�',
type: 'primary',
hidden: (row) => {
if (row.states != 2) {
@@ -338,14 +346,14 @@
showInventory(row) {
this.inventorySetting.id = row.id;
this.inventorySetting.info = JSON.stringify(row);
- this.inventorySetting.title = '鐩樼偣';
+ this.inventorySetting.title = '鐩樼偣浠诲姟';
this.inventorySetting.show = true;
},
showInventoryDetail(row) {
- this.inventorySetting.id = row.id;
- this.inventorySetting.info = JSON.stringify(row);
- this.inventorySetting.title = '鐩樼偣';
- this.inventorySetting.show = true;
+ this.inventoryDetail.id = row.id;
+ this.inventoryDetail.info = JSON.stringify(row);
+ this.inventoryDetail.title = '鐩樼偣璇︽儏';
+ this.inventoryDetail.show = true;
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1