From fd5fc9c2663267c2081b3d248db03c1f239f7d55 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 12 Aug 2022 09:08:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=86=E5=BA=93?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=92=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=9C=AA=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=90=9C=E7=B4=A2=E6=97=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/invWarehouse.vue | 32 ++++++++++++------- src/views/warehouse/DialogcChangeNewOrder.vue | 11 +++++-- src/views/warehouse/IOWaitOrder.vue | 1 - src/views/warehouse/errorCode.vue | 2 +- src/views/warehouse/stockOrderDelete.vue | 15 ++------- src/views/warehouse/stockOrderSearch.vue | 30 ++++++++++------- 6 files changed, 52 insertions(+), 39 deletions(-) diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index 77c2927..fc3904d 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -825,8 +825,8 @@ export default { pidData: {}, deleteLoading: false, uploadFileUrl: null, - userData: null, - bussinessTypeData: null, + userData: [], + bussinessTypeData: [], userList: null, bussinessTypeList: null, userFormVisible: false, @@ -1400,13 +1400,18 @@ export default { if (res.code === 20000) { this.userFormVisible = false; this.$message.success("添加成功"); - let loadParam = { - code: this.currentCode - }; + this.userQuery = { + code: this.currentCode, + page: 1, + limit: 10 + } //重新加载数据 - warehouseUserList(loadParam).then((res) => { - this.userData = res.data; + warehouseUserList(this.userQuery).then((res) => { + this.userData = res.data.list; + this.userTotal = res.data.total; }).catch((error) => { + this.userData = []; + this.userTotal = 0; }); } else { this.$message.error(res.message); @@ -1455,12 +1460,17 @@ export default { saveWarehouseBussinessType(query).then((res) => { this.$message.success("添加成功"); //重新加载数据表格 - let loadParam = { - code: this.currentCode + this.busQuery = { + code: this.currentCode, + page: 1, + limit: 10 } - warehouseBussinessTypeList(loadParam).then((res) => { - this.bussinessTypeData = res.data; + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; }).catch((error) => { + this.bussinessTypeData = []; + this.busTotal = 0; }); }).catch((error) => { }); diff --git a/src/views/warehouse/DialogcChangeNewOrder.vue b/src/views/warehouse/DialogcChangeNewOrder.vue index c76054c..f61548d 100644 --- a/src/views/warehouse/DialogcChangeNewOrder.vue +++ b/src/views/warehouse/DialogcChangeNewOrder.vue @@ -226,6 +226,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType"; import {submitOrderWeb} from "@/api/warehouse/order"; import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {isBlank} from "@/utils/strUtil"; export default { name: "DialogcChangeNewOrder", @@ -432,7 +433,12 @@ export default { storageChange(row) { this.formData.fromCorpId = row.code; this.formData.fromCorp = row.name; - this.findSubStorageMethod(); + if (isBlank(this.formData.fromCorp)) { + this.fromSubStorageOptions = []; + this.formData.fromSubInvCode = null; + } else { + this.findSubStorageMethod(); + } }, unitChange(row) { @@ -441,7 +447,8 @@ export default { }, actionChange(item) { this.curAction = this.getActionItem(item); - // this.formData.locStorageCode = this.curAction.storageCode; + this.formData.fromCorp = null; + this.formData.fromSubInvCode = null; this.findMethod(); }, getActionItem(action) { diff --git a/src/views/warehouse/IOWaitOrder.vue b/src/views/warehouse/IOWaitOrder.vue index 162b6c6..fa8771b 100644 --- a/src/views/warehouse/IOWaitOrder.vue +++ b/src/views/warehouse/IOWaitOrder.vue @@ -1010,7 +1010,6 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.getSubInvList(); this.getList(); } }) diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index 4cd3f32..f93a12f 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -52,7 +52,7 @@ > - - - @@ -298,9 +289,9 @@ "8": "平衡补录单据", }, erpCheckStatus: { - 1: "已完成", - 0: "已完成", - 2: "已完成", + 0: "未校验", + 1: "失败", + 2: "成功", }, isSp: store.getters.customerId, detailFormData: {}, diff --git a/src/views/warehouse/stockOrderSearch.vue b/src/views/warehouse/stockOrderSearch.vue index fa85a1c..feab805 100644 --- a/src/views/warehouse/stockOrderSearch.vue +++ b/src/views/warehouse/stockOrderSearch.vue @@ -467,10 +467,11 @@ import stockQRCodeExport from "./stockQRCodeExport"; import draggable from "vuedraggable"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import store from "../../store"; -import {getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType"; -import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse"; +import {getLocalJoinByUser} from "../../api/basic/busLocalType"; +import {filterAllByUser} from "@/api/basic/invWarehouse"; import StockOrderEdit from "@/views/warehouse/stockOrderEdit"; import {filterSubByInv} from "@/api/basic/invSubWarehouse"; +import {isBlank} from "@/utils/strUtil"; export default { name: "stockOrderSearch", @@ -948,7 +949,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.getSubInvList(); + // this.getSubInvList(); this.getList(); } }) @@ -958,15 +959,20 @@ export default { invChange() { this.query.invWarehouseCode = ""; this.subInvList = []; - let query = { - pcode: this.query.locStorageCode - }; - filterSubByInv(query) - .then((response) => { - this.subInvList = response.data || []; - }) - .catch(() => { - }); + + if (!isBlank(this.query.locStorageCode)) { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + } else { + this.subInvList = []; + } }, getSubInvList() { From ce0fbb5a1c9ad865837487b44caeef48218ccded Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 12 Aug 2022 16:06:24 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=A2=AB=E6=8C=A4=E5=8E=8B=E4=BD=8D=E7=A7=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/UdiInfoRelevance.vue | 101 ++++++++++++++------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue index 2dc7e4c..780c7b3 100644 --- a/src/views/basic/UdiInfoRelevance.vue +++ b/src/views/basic/UdiInfoRelevance.vue @@ -15,55 +15,58 @@
- - - - - - - - - - - - - - - - - - - - - - {{ item.thirdName }} - {{ item.thirdId }} - - - - - 查询 - + + + + + + + + + + + + + + + + + + + + + + + + {{ item.thirdName }} + {{ item.thirdId }} + + + + + 查询 + + Date: Mon, 15 Aug 2022 16:47:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=9F=A5=E8=AF=A2=E4=BA=A7=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouse/addHosOrder.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 73fef8e..d356795 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -998,6 +998,7 @@ export default { filterSubByInv(query) .then((response) => { this.subInvList = response.data || []; + this.fromSubStorageOptions = response.data || []; if (this.subInvList != null && this.subInvList.length == 1) { this.formData.invWarehouseCode = this.subInvList[0].code; this.getBusType(); @@ -1193,7 +1194,7 @@ export default { } } this.findSubInvByInv(this.formData.locStorageCode); - this.findSubStorageMethod(); + // this.findSubStorageMethod(); this.getBusType(); From c07fcf502515f324d8c7ad1081180556541b89e1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 16 Aug 2022 10:51:26 +0800 Subject: [PATCH 4/6] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/warehouse/DialogSelectErpOrder.vue | 4 -- src/views/warehouse/IOErrorOrder.vue | 40 ++++++++++---------- src/views/warehouse/addHosOrder.vue | 15 +++++++- src/views/warehouse/addOrder.vue | 9 ++++- src/views/warehouse/stockOrderEditor.vue | 24 ++++++------ 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/src/views/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue index e666587..7fbd649 100644 --- a/src/views/warehouse/DialogSelectErpOrder.vue +++ b/src/views/warehouse/DialogSelectErpOrder.vue @@ -56,10 +56,6 @@ >导入比对 - - diff --git a/src/views/warehouse/IOErrorOrder.vue b/src/views/warehouse/IOErrorOrder.vue index 119d7fa..c454939 100644 --- a/src/views/warehouse/IOErrorOrder.vue +++ b/src/views/warehouse/IOErrorOrder.vue @@ -81,27 +81,27 @@ - + diff --git a/src/views/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index d356795..3444be6 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -784,12 +784,22 @@ export default { }); } else if (response.code == 507) { - this.editTitle = response.message; this.editOriginCodeVisible = true; + this.editTitle = response.message; this.formData.produceDate = response.data.produceDate; this.formData.expireDate = response.data.expireDate; this.formData.batchNo = response.data.batchNo; this.formData.serialNo = response.data.serialNo; + + this.$message({ + type: 'error', + message: "提交失败！" + this.editTitle, + customClass: 'messageIndex' + }); + + // this.$message.error("提交失败！" + this.editTitle); + + } else { this.$alert(response.message, '提示', { confirmButtonText: '确定', @@ -1204,6 +1214,9 @@ export default {