From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
index 3c1b726..2ba53aa 100644
--- a/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
+++ b/admin-web/src/views/stock/inventorycount/exceptionDetails/index.vue
@@ -10,7 +10,7 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
</el-card>
@@ -23,16 +23,12 @@
import MyTableV2 from '@/components/myTable/myTableV2';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
-import { mapGetters } from 'vuex';
-import { selectTenantWarehouse, goodsModel } from '@/api/baseSetting/finsystenant';
-import { getDicts } from '@/api/system/dict/data';
+import {mapGetters} from 'vuex';
import * as DateFormatter from '@/utils/DateFormatter';
export default {
name: 'index',
- components: { MyButton, MyTableV2 },
+ components: {MyButton, MyTableV2},
data() {
return {
// 鎼滅储妗�
@@ -42,7 +38,7 @@
dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
defaultValue: '',
options: [],
},
@@ -66,7 +62,7 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- cascader: [{ key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId' }],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
optionsConfig: {
label: 'goodsName',
value: 'id',
@@ -158,8 +154,7 @@
// 鏍戞暟鎹�
treeDataList: [],
// 鎼滅储鏉′欢
- filterFrom: {
- },
+ filterFrom: {},
// 琛ㄦ牸鏁版嵁
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
@@ -180,30 +175,35 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '浠撳簱', field: 'warehouseName', align: 'left' },
- { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' },
- { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' },
- { title: '绫诲瀷', field: 'inventoryResultType', align: 'center' },
- { title: '搴撳瓨鏁伴噺', field: 'initCounts', align: 'left' },
- { title: '鐩樼偣鏁伴噺', field: 'inventoryCounts', align: 'left' },
- { title: '寮傚父鏁伴噺', field: 'errorCounts', align: 'left' },
+ {title: '浠撳簱', field: 'warehouseName', align: 'left', width: 140},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 130},
+ {title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 120},
+ {title: '绫诲瀷', field: 'inventoryResultType', align: 'center'},
+ {title: '搴撳瓨鏁伴噺', field: 'initCounts', align: 'left'},
+ {title: '鐩樼偣鏁伴噺', field: 'inventoryCounts', align: 'left'},
+ {title: '寮傚父鏁伴噺', field: 'errorCounts', align: 'left'},
{
title: '鍑哄叆搴撶被鍨�',
field: 'inventoryType',
- align: 'left',
+ align: 'center',
+ width: 100,
formatter: (row) => {
- return { value: row.inventoryType, type: row.inventoryType && row.inventoryType.includes('鐩樼泩') ? 'success' : 'danger' };
+ return {
+ value: row.inventoryType,
+ type: row.inventoryType && row.inventoryType.includes('鐩樼泩') ? 'success' : 'danger'
+ };
},
},
- { title: '鍑哄叆搴撳崟鍙�', field: 'warehouseFormCode', align: 'left' },
- { title: '鏈烘瀯', field: 'agencyName', align: 'left' },
- { title: '鎿嶄綔浜�', field: 'operatorName', align: 'left' },
+ {title: '鍑哄叆搴撳崟鍙�', field: 'warehouseFormCode', align: 'center', width: 130},
+ {title: '鏈烘瀯', field: 'agencyName', align: 'left', width: 130},
+ {title: '鎿嶄綔浜�', field: 'operatorName', align: 'center', width: 90},
{
title: '鎿嶄綔鏃堕棿',
field: 'operatorTime',
align: 'center',
+ width: 160,
formatter: (row) => {
- return { value: row.operatorTime ? DateFormatter.LongToDateTime(row.operatorTime) : '-' };
+ return {value: row.operatorTime ? DateFormatter.LongToDateTime(row.operatorTime) : '-'};
},
},
],
@@ -230,7 +230,8 @@
computed: {
...mapGetters(['userInfo']),
},
- created() {},
+ created() {
+ },
methods: {
showAudit(row) {
this.editSetting.id = row.id;
--
Gitblit v1.9.1