From a6acf1f8924a8fabaa4b74f6771ddbe41ab6b204 Mon Sep 17 00:00:00 2001 From: haoyahui <2032914783@qq.com> Date: 星期一, 20 十一月 2023 18:47:09 +0800 Subject: [PATCH] 盘点编辑 --- admin-web/src/views/stock/inventorycount/inventorytask/index.vue | 180 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 113 insertions(+), 67 deletions(-) diff --git a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue index 97040e4..dbe6bdf 100644 --- a/admin-web/src/views/stock/inventorycount/inventorytask/index.vue +++ b/admin-web/src/views/stock/inventorycount/inventorytask/index.vue @@ -41,6 +41,10 @@ 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,inventoryDel } from '@/api/stock/inventory'; +import * as DateFormatter from '@/utils/DateFormatter'; +import {mapGetters} from 'vuex' export default { name: 'index', @@ -51,16 +55,36 @@ items: [ { type: 'text', - dataIndex: 'name', + dataIndex: 'businessFormCode', label: '鐩樼偣鍗曞彿', placeholder: '璇疯緭鍏�', defaultValue: '', }, { type: 'text', - dataIndex: 'name', + dataIndex: 'businessFormName', label: '浠诲姟鍚嶇О', placeholder: '璇疯緭鍏�', + defaultValue: '', + }, + { + type: 'select', + dataIndex: 'warehouseId', + label: '鐩樼偣浠撳簱', + placeholder: '璇烽�夋嫨', + defaultValue: '', + options: [], + }, + { + type: 'date-picker', + dataIndex: 'startTime', + label: '鐩樼偣鏃堕棿', + defaultValue: '', + }, + { + type: 'date-picker', + dataIndex: 'endTime', + label: '鑷�', defaultValue: '', }, ], @@ -107,7 +131,7 @@ table: { showIndex: true, // 鏄惁鏄剧ず搴忓彿 expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁 - url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃 + url: SettingIplatform.apiBaseURL + inventoryListApi(), // 璇锋眰鍦板潃 // 宸ュ叿鏉� tools: { columnsCtrl: { @@ -130,29 +154,77 @@ }, // 鍒椾俊鎭� columns: [ - { title: '鐩樼偣鍗曞彿', field: 'name', align: 'left' }, - { title: '浠诲姟鍚嶇О', field: 'code', align: 'center' }, - { title: '鐩樼偣浠撳簱', field: 'lv', align: 'center' }, - { title: '鐩樼偣浜�', field: 'lv', align: 'center' }, - { title: '鐩戠洏浜�', field: 'summary', align: 'left' }, - { title: '鐩樼偣鏃堕棿', field: 'summary', align: 'left' }, - { title: '鍒涘缓鏃堕棿', field: 'summary', align: 'left' }, - { title: '鐘舵��', field: 'summary', align: 'left' }, + { 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: 'inventoryDate', + align: 'center', + width: 160, + formatter: (row) => { + return { value: row.inventoryDate ? DateFormatter.LongToDateTime(row.inventoryDate) : '-' }; + }, + }, + { + title: '鍒涘缓鏃堕棿', + field: 'createTime', + align: 'center', + width: 160, + formatter: (row) => { + return { value: DateFormatter.LongToDateTime(row.createTime) }; + }, + }, + { + title: '鐘舵��', + field: 'states', + align: 'left', + type: 'primary', + formatter: (row) => { + return { + value: row.states == 0 ? '鏈紑濮�' : row.states == 1 ? '杩涜涓�' : '宸茬洏鐐�', + type: row.states == 0 ? 'danger' : row.states == 1 ? 'success' : 'primary', + }; + }, + }, ], // 鎿嶄綔淇℃伅 operation: { show: true, // 鏄剧ず鎿嶄綔鍒� - width: '150', // 鍒楀 + 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', + type: 'success', + hidden:(row)=>{ + if(row.states!=0){ + return true + } + }, events: (row) => { this.showInventory(row); }, @@ -172,9 +244,21 @@ }, }; }, + computed:{ + ...mapGetters(['userInfo']) + }, created() { - // 鑾峰彇鏈烘瀯鏍� - this.initTreeData(); + selectTenantWarehouse({agencyId: this.userInfo.tenantId}).then((res) => { + this.items.forEach((v) => { + if (v.label == '鐩樼偣浠撳簱') { + v.options = res.map((item) => { + item.label = item.warehouseName; + item.value = item.id; + return item; + }); + } + }); + }); }, methods: { //瀵煎叆 @@ -190,41 +274,14 @@ callBack(); }; }, - // 宸︿晶鏍戝垵濮嬪寲 - initTreeData() { - finsystenant.getTree().then((res) => { - const content = res || []; - this.treeDataList.splice(0, this.treeDataList.length); - this.treeDataList = content; - if (content.length > 0) { - this.importSetting.fileSettings.data = { pid: content[0].id }; - } - }); - }, - updState(row) { - let vm = this; - let text = row.status == 0 ? '鍚敤' : '绂佺敤'; - vm.$modal.confirm('纭瑕�' + text + '"' + row.name + '"鍚楋紵').then(function () { - let params = Object.assign({}, row); - params.status = row.status == 1 ? 0 : 1; - finsystenant.edit(params).then((res) => { - if (res) { - row.status = row.status === 1 ? 0 : 1; - vm.$modal.msgSuccess(text + '鎴愬姛'); - vm.search(); - } - }); - }); - }, del(row) { this.$modal - .confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.name + '"鐨勬満鏋勫悧锛�') - .then(function () { - finsystenant.del({ id: row.id }).then((res) => {}); - }) - .then((res) => { - this.$message.success('鍒犻櫎鎴愬姛锛�'); - this.search(); + .confirm('鏄惁纭鍒犻櫎鍗曞彿涓猴細' + row.businessFormCode + ' 鐨勬暟鎹悧锛�') + .then(() => { + inventoryDel({ id: row.id }).then((res) => { + this.$message.success('鍒犻櫎鎴愬姛锛�'); + this.search(); + }); }) .catch(() => {}); }, @@ -240,30 +297,12 @@ this.editSetting.title = '缂栬緫'; this.editSetting.show = true; }, + // 鐩樼偣 showInventory(row) { this.inventorySetting.id = row.id; this.inventorySetting.info = JSON.stringify(row); this.inventorySetting.title = '鐩樼偣'; this.inventorySetting.show = true; - }, - nodeClick(param) { - param = param || {}; - this.p = Object.assign( - {}, - { - id: param.id, - name: param.name, - }, - ); - if (this.p.id != undefined && this.p.id != null) { - this.filterFrom.tenantId = this.p.id; - this.editSetting.orgId = this.p.id; - } else { - this.filterFrom.tenantId = null; - this.editSetting.orgId = null; - } - this.importSetting.fileSettings.data = { pid: param.id }; - this.search(1); }, // 鏌ヨtable鍒楄〃 search(pageNum) { @@ -275,6 +314,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