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/inventorytask/index.vue | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 100 insertions(+), 16 deletions(-)
diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue
index 411bdbd..28cfe68 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,16 +39,18 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import inventory from './inventory';
+import detail from './detail';
import * as finsystenant from '@/api/baseSetting/finsystenant';
import myImport from '@/views/components/myImport';
import { getBaseUrl } from '@/utils/base';
import { selectTenantWarehouse } from '@/api/baseSetting/finsystenant';
-import { inventoryListApi } from '@/api/stock/inventory';
+import { inventoryListApi, inventoryDel } from '@/api/stock/inventory';
import * as DateFormatter from '@/utils/DateFormatter';
+import { mapGetters } from 'vuex';
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit, myImport, inventory },
+ components: { MyButton, MyTableV2, edit, myImport, inventory,detail },
data() {
return {
// 鎼滅储妗�
@@ -76,13 +79,13 @@
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鐩樼偣鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -126,6 +129,12 @@
orgId: '',
show: false,
},
+ inventoryDetail:{
+ title: '',
+ id: '',
+ orgId: '',
+ show: false,
+ },
// 琛ㄦ牸鏁版嵁
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
@@ -153,11 +162,11 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鐩樼偣鍗曞彿', field: 'businessFormCode', align: 'left' },
- { title: '浠诲姟鍚嶇О', field: 'businessFormName', align: 'center' },
- { title: '鐩樼偣浠撳簱', field: 'warehouseName', align: 'center' },
- { title: '鐩樼偣浜�', field: 'operatorName', align: 'center' },
- { 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',
@@ -179,7 +188,8 @@
{
title: '鐘舵��',
field: 'states',
- align: 'left',
+ align: 'center',
+ width: 90,
type: 'primary',
formatter: (row) => {
return {
@@ -192,19 +202,77 @@
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '150', // 鍒楀
+ align: 'left',
+ width: '220', // 鍒楀
attr: [
{
title: '缂栬緫',
+ hidden: (row) => {
+ if (row.states != 0) {
+ return true;
+ }
+ },
events: (row) => {
this.showAudit(row);
},
},
{
+ title: '鍒犻櫎',
+ hidden: (row) => {
+ if (row.states != 0) {
+ return true;
+ }
+ },
+ events: (row) => {
+ this.del(row);
+ },
+ },
+ {
title: '鐩樼偣',
type: 'success',
+ hidden: (row) => {
+ if (row.states != 0) {
+ return true;
+ }
+ },
events: (row) => {
this.showInventory(row);
+ },
+ },
+ {
+ title: '缁х画鐩樼偣',
+ type: 'success',
+ hidden: (row) => {
+ if (row.states != 1) {
+ return true;
+ }
+ },
+ events: (row) => {
+ this.showInventory(row);
+ },
+ },
+ {
+ title: '鐩樼偣璇︽儏',
+ type: 'info',
+ hidden: (row) => {
+ if (row.states != 2) {
+ return true;
+ }
+ },
+ events: (row) => {
+ this.showInventoryDetail(row);
+ },
+ },
+ {
+ title: '鐢熸垚鐩樼偣琛�',
+ type: 'primary',
+ hidden: (row) => {
+ if (row.states != 2) {
+ return true;
+ }
+ },
+ events: (row) => {
+ this.showInventoryDetail(row);
},
},
],
@@ -222,13 +290,16 @@
},
};
},
+ computed: {
+ ...mapGetters(['userInfo']),
+ },
created() {
- selectTenantWarehouse().then((res) => {
+ selectTenantWarehouse({ agencyId: this.userInfo.tenantId }).then((res) => {
this.items.forEach((v) => {
if (v.label == '鐩樼偣浠撳簱') {
v.options = res.map((item) => {
item.label = item.warehouseName;
- item.vlaue = item.id;
+ item.value = item.id;
return item;
});
}
@@ -251,9 +322,9 @@
},
del(row) {
this.$modal
- .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�')
+ .confirm('鏄惁纭鍒犻櫎鍗曞彿涓猴細' + row.businessFormCode + ' 鐨勬暟鎹悧锛�')
.then(() => {
- finsystenant.del({ id: row.id }).then((res) => {
+ inventoryDel({ id: row.id }).then((res) => {
this.$message.success('鍒犻櫎鎴愬姛锛�');
this.search();
});
@@ -276,8 +347,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.inventoryDetail.id = row.id;
+ this.inventoryDetail.info = JSON.stringify(row);
+ this.inventoryDetail.title = '鐩樼偣璇︽儏';
+ this.inventoryDetail.show = true;
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
@@ -289,6 +366,13 @@
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
+
+ if (this.filterFrom.startTime) {
+ this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
+ }
+ if (this.filterFrom.endTime) {
+ this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
+ }
this.search(1);
},
},
--
Gitblit v1.9.1