From 0cf0bfb2031388d14baf39cc30b18e747a32e478 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 6 Mar 2023 17:38:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E8=B4=A7?= =?UTF-8?q?=E4=BD=8D=E7=9B=B8=E5=85=B3=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.bat | 5 +++ src/views/inout/IoCreateOrder.vue | 5 +++ src/views/inout/IoEditOrder.vue | 13 ++----- .../inventory/DeviceReceiveOrderAudit.vue | 2 +- .../inventory/DeviceReceiveOrderCompleted.vue | 6 +-- .../inventory/DeviceReceiveOrderModify.vue | 4 +- src/views/inventory/DeviceReceiveOrderNew.vue | 2 +- src/views/inventory/InvCountOrderAudit.vue | 2 +- .../inventory/InvCountOrderCompleted.vue | 2 +- src/views/inventory/InvCountOrderModify.vue | 2 +- src/views/inventory/InvCountOrderNew.vue | 2 +- src/views/inventory/InvMAOrderAudit.vue | 2 +- src/views/inventory/InvMAOrderCompleted.vue | 2 +- src/views/inventory/InvMAOrderModify.vue | 38 ++++++++++++------- src/views/inventory/InvMAOrderNew.vue | 12 +++--- 15 files changed, 57 insertions(+), 42 deletions(-) create mode 100644 package.bat diff --git a/package.bat b/package.bat new file mode 100644 index 00000000..aa946b36 --- /dev/null +++ b/package.bat @@ -0,0 +1,5 @@ +rd /s /q UDI_WMS_NEW + +npm run build:prod + +exit diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue index 7a56d482..dd954b62 100644 --- a/src/views/inout/IoCreateOrder.vue +++ b/src/views/inout/IoCreateOrder.vue @@ -162,6 +162,7 @@ :closeDialog="closeDialog" :orderQuery="idQuery" :viewType="viewType" + :errView="errView" > { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/DeviceReceiveOrderCompleted.vue b/src/views/inventory/DeviceReceiveOrderCompleted.vue index 3595b7a3..9a053a6d 100644 --- a/src/views/inventory/DeviceReceiveOrderCompleted.vue +++ b/src/views/inventory/DeviceReceiveOrderCompleted.vue @@ -91,8 +91,8 @@ - + { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/DeviceReceiveOrderModify.vue b/src/views/inventory/DeviceReceiveOrderModify.vue index 9318f4b0..efbd2161 100644 --- a/src/views/inventory/DeviceReceiveOrderModify.vue +++ b/src/views/inventory/DeviceReceiveOrderModify.vue @@ -406,7 +406,7 @@ export default { getDeptUserList() { this.userList = []; let params = {deptId: this.formData.fromDeptCode}; - listDeptUser(params).then((res) =>{ + listDeptUser(params).then((res) => { this.userList = res.data.list || []; }) }, @@ -426,7 +426,7 @@ export default { invChange() { this.formData.invSpaceCode = null; this.spaceList = []; - let params = {invStorageCode: this.formData.fromDeptCode}; + let params = {invWarehouseCode: this.formData.fromInvCode, status: 1}; getInvSpaceList(params).then((res) => { if (!isBlank(this.deviceReceiveOrder.fromInvSpaceCode)) { this.formData.fromInvSpaceCode = this.deviceReceiveOrder.fromInvSpaceCode; diff --git a/src/views/inventory/DeviceReceiveOrderNew.vue b/src/views/inventory/DeviceReceiveOrderNew.vue index f2ddfab3..e1839c46 100644 --- a/src/views/inventory/DeviceReceiveOrderNew.vue +++ b/src/views/inventory/DeviceReceiveOrderNew.vue @@ -231,7 +231,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/InvCountOrderAudit.vue b/src/views/inventory/InvCountOrderAudit.vue index c82ebd8a..681b8530 100644 --- a/src/views/inventory/InvCountOrderAudit.vue +++ b/src/views/inventory/InvCountOrderAudit.vue @@ -261,7 +261,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/InvCountOrderCompleted.vue b/src/views/inventory/InvCountOrderCompleted.vue index 884ddca4..85079556 100644 --- a/src/views/inventory/InvCountOrderCompleted.vue +++ b/src/views/inventory/InvCountOrderCompleted.vue @@ -242,7 +242,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/InvCountOrderModify.vue b/src/views/inventory/InvCountOrderModify.vue index 0b509503..d8f7f711 100644 --- a/src/views/inventory/InvCountOrderModify.vue +++ b/src/views/inventory/InvCountOrderModify.vue @@ -338,7 +338,7 @@ export default { }); this.formData.invSpaceCode = null; this.spaceList = []; - let params = {invWarehouseCode: this.formData.invCode}; + let params = {invWarehouseCode: this.formData.invCode, status: 1}; getInvSpaceList(params).then((res) => { if (!isBlank(this.countOrder.invSpaceCode)) { this.formData.invSpaceCode = this.countOrder.invSpaceCode; diff --git a/src/views/inventory/InvCountOrderNew.vue b/src/views/inventory/InvCountOrderNew.vue index c054c19e..c927ef53 100644 --- a/src/views/inventory/InvCountOrderNew.vue +++ b/src/views/inventory/InvCountOrderNew.vue @@ -228,7 +228,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; this.getList(); diff --git a/src/views/inventory/InvMAOrderAudit.vue b/src/views/inventory/InvMAOrderAudit.vue index 9b61381d..9cee3e78 100644 --- a/src/views/inventory/InvMAOrderAudit.vue +++ b/src/views/inventory/InvMAOrderAudit.vue @@ -229,7 +229,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; }) diff --git a/src/views/inventory/InvMAOrderCompleted.vue b/src/views/inventory/InvMAOrderCompleted.vue index 16221a96..fc21a16b 100644 --- a/src/views/inventory/InvMAOrderCompleted.vue +++ b/src/views/inventory/InvMAOrderCompleted.vue @@ -212,7 +212,7 @@ export default { }); }, getSpaceList() { - let params = {invWarehouseCode: this.filterQuery.invCode}; + let params = {invWarehouseCode: this.filterQuery.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; }) diff --git a/src/views/inventory/InvMAOrderModify.vue b/src/views/inventory/InvMAOrderModify.vue index 6a89ce3c..69e5ffca 100644 --- a/src/views/inventory/InvMAOrderModify.vue +++ b/src/views/inventory/InvMAOrderModify.vue @@ -318,7 +318,7 @@ export default { invChange() { this.formData.invSpaceCode = null; this.spaceList = []; - let params = {invWarehouseCode: this.formData.invCode}; + let params = {invWarehouseCode: this.formData.invCode, status: 1}; getInvSpaceList(params).then((res) => { this.spaceList = res.data.list || []; }); @@ -346,19 +346,31 @@ export default { //更新单据 updateInvMAOrder(this.formData).then((res) => { if (!isBlank(this.formData.code)) { - //扫码添加库存养护记录详情 - let params = { - orderIdFk: this.formData.orderId, - code: this.formData.code - } - addInvMAOrderDetail(params).then((res) => { - if (res.code === 20000) { - this.$message.success("添加成功！"); - this.getList(); - } else { - this.$message.error(res.message); + //判断此条码在列表中是否存在，如果已存在则表示已添加 + let flag = false; + for (let i = 0; i < this.detailList.length; i++) { + if (this.detailList[i].code === this.formData.code) { + flag = true; + break; } - }); + } + + //此条码未保存，关闭弹窗之前调用接口添加详情记录 + if (!flag) { + //扫码添加库存养护记录详情 + let params = { + orderIdFk: this.formData.orderId, + code: this.formData.code + }; + addInvMAOrderDetail(params).then((res) => { + if (res.code === 20000) { + this.$message.success("添加成功！"); + this.getList(); + } else { + this.$message.error(res.message); + } + }); + } } }).catch((error) => { this.$message.error("更新单据信息失败！"); diff --git a/src/views/inventory/InvMAOrderNew.vue b/src/views/inventory/InvMAOrderNew.vue index 04b2243b..9991f4c1 100644 --- a/src/views/inventory/InvMAOrderNew.vue +++ b/src/views/inventory/InvMAOrderNew.vue @@ -43,17 +43,17 @@ - - - - + + + + - +