From b29bd79cf6bf5f1f8f0e80bd483ad3247eca9eaf Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 24 Apr 2023 10:15:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/dept/invWarehouse.vue | 27 ++++++++++++++++++++++++++ src/views/system/role/index.vue | 8 ++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 469f037e..85c6a306 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -295,6 +295,7 @@ 查询 + 重置 @@ -507,6 +508,32 @@ export default { invWarehouseCode: null }; }, + onResetintent(){ + debugger + this.$router.push({ + path: "", + }); + this.thirdSubQuery = { + thirdSysFk: this.thirdSubQuery.thirdSysFk, + page:1, + limit: 10 + } + + filterThridSubByInv(this.thirdSubQuery).then((res) => { + if (res.code == 20000) { + this.thrSubWarehouseData = res.data.list; + this.subTotal = res.data.total || 0; + } else { + this.$message.error(res.message); + } + + }).catch((error) => { + this.thrWarehouseData = []; + this.subTotal = 0; + this.$message.error("第三方分库库数据加载失败"); + }); + + }, onSubmit() { //提交查询 this.query.advanceType=this.subDataType.advanceType; diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index e609a7a6..ec7e1626 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -123,12 +123,8 @@ - {{ dict.label }} - + 正常 + 禁用 From 177fae9f87c2dc0033ef984061f4fd8270437497 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 24 Apr 2023 10:31:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=B4=A7=E4=BD=8D?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inventory/InvSpaceManage.vue | 28 +++-- src/views/remind/supCertRemindMsg.vue | 166 +++++++++++++++++-------- src/views/system/dept/invWarehouse.vue | 5 +- 3 files changed, 133 insertions(+), 66 deletions(-) diff --git a/src/views/inventory/InvSpaceManage.vue b/src/views/inventory/InvSpaceManage.vue index ae652229..afc3791a 100644 --- a/src/views/inventory/InvSpaceManage.vue +++ b/src/views/inventory/InvSpaceManage.vue @@ -22,7 +22,6 @@ - @@ -68,10 +67,24 @@ v-if="modifySpaceVisible" > + + + + + + + + + + + + - @@ -83,12 +96,6 @@ - - - - - 启用 @@ -171,13 +178,11 @@ export default { type: null, invStorageCode: this.invInfo.invStorageCode, invWarehouseCode: this.invInfo.invWarehouseCode, + invName: this.invInfo.invName, status: 1, remark: null }, rules: { - code: [ - {required: true, message: "请输入货位编码", trigger: "blur"} - ], name: [ {required: true, message: "请输入货位名称", trigger: "blur"} ], @@ -291,6 +296,7 @@ export default { type: null, invStorageCode: this.invInfo.invStorageCode, invWarehouseCode: this.invInfo.invWarehouseCode, + invName: this.invInfo.invName, status: 1, remark: null } diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue index 58bf9147..cf48fad7 100644 --- a/src/views/remind/supCertRemindMsg.vue +++ b/src/views/remind/supCertRemindMsg.vue @@ -23,21 +23,20 @@ - - - - - - - - - - - + + + + + + + + + + + + + + @@ -68,16 +67,13 @@ - - - + + + - + @@ -85,13 +81,15 @@ - + + + - - + + @@ -183,8 +243,10 @@ export default { msgNameMap: { 1: "配送企业名称", 2: "生产企业名称", - 3: "产品名称" - } + 3: "物资名称" + }, + confirmVisible: false, + confirmQuery: {}, }; }, methods: { @@ -229,26 +291,28 @@ export default { this.total = 0; }); }, + + confirmMsg(row) { - this.$prompt('请输入处理方式', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - }).then(({value}) => { - let params = { - id: row.id, - handleMsg: value - }; - confirmMsg(params).then((res) => { - if (res.code === 20000) { - this.$message.success("已确认"); - this.getList(); - } else { - this.$message.error(res.message); - } - }) - }).catch(() => { - }); + this.confirmVisible = true; + this.confirmQuery = row; + }, + postConfirm() { + confirmMsg(this.confirmQuery).then((res) => { + if (res.code === 20000) { + this.confirmVisible = false; + this.$message.success("已确认"); + this.getList(); + } else { + this.$message.error(res.message); + } + }) + }, + + closeDialog() { + this.confirmVisible = false; }, + ignoreMsg(row) { this.ignoreVisible = true; this.currentId = row.id; @@ -273,13 +337,7 @@ export default { }, typeChange(val) { this.msgName = this.msgNameMap[val]; - }, - statusFilterType(status) { - const statusMap = { - 1: "warning", - 2: "success", - }; - }, + } }, created() { // 加载表格数据 diff --git a/src/views/system/dept/invWarehouse.vue b/src/views/system/dept/invWarehouse.vue index 85c6a306..2f0716ba 100644 --- a/src/views/system/dept/invWarehouse.vue +++ b/src/views/system/dept/invWarehouse.vue @@ -481,6 +481,7 @@ export default { currentInvInfo: { invStorageCode: null, invWarehouseCode: null, + invName: null }, sysList: [], sysSubList: [], @@ -505,7 +506,8 @@ export default { this.currentInvInfo = { invStorageCode: null, - invWarehouseCode: null + invWarehouseCode: null, + invName: null }; }, onResetintent(){ @@ -836,6 +838,7 @@ export default { this.currentInvInfo = { invStorageCode: row.parentId, invWarehouseCode: row.code, + invName: row.name, flag: row.id, page: 1 };