From aacc8ebe28d455658a770a8e804452f4440a3067 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 8 Aug 2022 14:57:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9=E4=BB=93=E5=BA=93=EF=BC=8C?= =?UTF-8?q?=E5=88=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/打包备份.txt | 2 +- src/views/business/stockOrder.vue | 15 +- src/views/business/stockOrderDelSearch.vue | 15 +- src/views/business/stockOrderEditor.vue | 27 +- src/views/business/stockOrderNew.vue | 15 +- src/views/business/stockOrderSearch.vue | 18 +- src/views/business/stockOrderWaitCheck.vue | 17 +- src/views/inout/IOCheckErrorOrder.vue | 2113 ++++++++++---------- src/views/inout/IOCheckWaitOrder.vue | 16 +- src/views/inout/IOFinishOrder.vue | 17 +- src/views/inout/IONewOrder.vue | 16 +- 11 files changed, 1202 insertions(+), 1069 deletions(-) diff --git a/public/打包备份.txt b/public/打包备份.txt index 0a4d78e..d8be088 100644 --- a/public/打包备份.txt +++ b/public/打包备份.txt @@ -24,7 +24,7 @@ { "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/", "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC", - "SERVER_IP": "http://140.9.178.73:8080/UDI_WMS_MC/", + "SERVER_IP": "http://139.9.178.73:8080/UDI_WMS_MC/", "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/", "hosp_name": "平和县医院" } diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index 7d20805..a444a84 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -792,7 +792,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -813,6 +813,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderDelSearch.vue b/src/views/business/stockOrderDelSearch.vue index a09baa7..44863c1 100644 --- a/src/views/business/stockOrderDelSearch.vue +++ b/src/views/business/stockOrderDelSearch.vue @@ -856,7 +856,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -877,6 +877,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue index 9ebbd95..546f26c 100644 --- a/src/views/business/stockOrderEditor.vue +++ b/src/views/business/stockOrderEditor.vue @@ -100,12 +100,12 @@ {{ scope.row.status | statusFilterName }} - - - - - - + + + + + + @@ -952,7 +952,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -972,6 +972,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue index 32508ae..107b3eb 100644 --- a/src/views/business/stockOrderNew.vue +++ b/src/views/business/stockOrderNew.vue @@ -924,7 +924,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -944,6 +944,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue index 51b4bcc..50d9e87 100644 --- a/src/views/business/stockOrderSearch.vue +++ b/src/views/business/stockOrderSearch.vue @@ -350,7 +350,8 @@ - + @@ -937,7 +938,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -958,6 +959,19 @@ export default { }); }, + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + + subInvChange() { this.getBusType(); }, diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue index 06e7a75..8356b55 100644 --- a/src/views/business/stockOrderWaitCheck.vue +++ b/src/views/business/stockOrderWaitCheck.vue @@ -789,8 +789,8 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.query.locStorageCode = this.storageList[0].code; - this.invChange(); + // this.query.locStorageCode = this.storageList[0].code; + this.getSubInvList(); this.getList(); } }) @@ -810,6 +810,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.query.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/IOCheckErrorOrder.vue b/src/views/inout/IOCheckErrorOrder.vue index 9b12a37..281deb7 100644 --- a/src/views/inout/IOCheckErrorOrder.vue +++ b/src/views/inout/IOCheckErrorOrder.vue @@ -1,472 +1,472 @@ diff --git a/src/views/inout/IOCheckWaitOrder.vue b/src/views/inout/IOCheckWaitOrder.vue index 988bfb9..624086e 100644 --- a/src/views/inout/IOCheckWaitOrder.vue +++ b/src/views/inout/IOCheckWaitOrder.vue @@ -842,7 +842,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -862,6 +862,20 @@ export default { .catch(() => { }); }, + + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/IOFinishOrder.vue b/src/views/inout/IOFinishOrder.vue index 7b16557..92781b7 100644 --- a/src/views/inout/IOFinishOrder.vue +++ b/src/views/inout/IOFinishOrder.vue @@ -601,8 +601,8 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.filterQuery.locStorageCode = this.storageList[0].code; - this.invChange(); + // this.filterQuery.locStorageCode = this.storageList[0].code; + this.getSubInvList(); this.getList(); } }) @@ -911,6 +911,19 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + subInvChange() { this.getBusType(); }, diff --git a/src/views/inout/IONewOrder.vue b/src/views/inout/IONewOrder.vue index cf65b48..eb37126 100644 --- a/src/views/inout/IONewOrder.vue +++ b/src/views/inout/IONewOrder.vue @@ -426,7 +426,7 @@ export default { .then((response) => { this.storageList = response.data || []; if (this.storageList.length > 0) { - this.invChange(); + this.getSubInvList(); this.getList(); } }) @@ -668,6 +668,20 @@ export default { .catch(() => { }); }, + + getSubInvList() { + let query = { + pcode: this.filterQuery.locStorageCode + }; + filterSubByInv(query) + .then((response) => { + this.subInvList = response.data || []; + }) + .catch(() => { + }); + }, + + subInvChange() { this.getBusType(); }, From fcb65885155b65866603712429edf7a8464e86e6 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 8 Aug 2022 17:40:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=EF=BC=88=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/role.js | 2 +- src/utils/axios.js | 2 +- src/utils/axios2.js | 2 +- src/views/basic/UdiRlDetailDialog.vue | 2 +- .../business/stockOrderEditDistribution.vue | 43 ++++++++++++++++--- src/views/inout/DialogSelectErpOrder.vue | 19 +++++--- src/views/inout/DialogSelectUnit.vue | 18 ++++---- src/views/inout/IOAddOrder.vue | 2 +- src/views/inout/errorCode.vue | 1 + 9 files changed, 65 insertions(+), 26 deletions(-) diff --git a/src/role.js b/src/role.js index 6b9e809..4e8b212 100644 --- a/src/role.js +++ b/src/role.js @@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => { }) .catch(() => { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); let redirect = to.fullPath; store.dispatch("loginOut").then(() => { next({ diff --git a/src/utils/axios.js b/src/utils/axios.js index 9c4ee9d..d999d46 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -42,7 +42,7 @@ service.interceptors.response.use( if (data.code) { if (data.code === 2) { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); router.push({ path: "/login", query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来 diff --git a/src/utils/axios2.js b/src/utils/axios2.js index 65cde7c..d2f020e 100644 --- a/src/utils/axios2.js +++ b/src/utils/axios2.js @@ -21,7 +21,7 @@ service.interceptors.response.use( if (data.code) { if (data.code === 2) { store.dispatch("fedLogout").then(() => { - Message.error("验证失败,请重新登录"); + Message.error("登录失效,请重新登录"); router.push({ path: "/login", query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来 diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue index d8ec7b8..3ce65d3 100644 --- a/src/views/basic/UdiRlDetailDialog.vue +++ b/src/views/basic/UdiRlDetailDialog.vue @@ -393,7 +393,7 @@ export default { methods: { getThirdSysDetail() { let query = { - id: this.editQuery.id, + id: this.editQuery.rlId, }; thirdSysDetail(query) diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue index 2da8d2e..c7c0c09 100644 --- a/src/views/business/stockOrderEditDistribution.vue +++ b/src/views/business/stockOrderEditDistribution.vue @@ -135,6 +135,22 @@ + + + +
+ +
+ + + + 允许无库存出库 + + + + + @@ -380,7 +396,21 @@ export default { page: 1, limit: 10, }, - formData: {}, + formData: { + + noInvOut: false, + locStorageCode: null, + invWarehouseCode: null, + fromSubInvCode: null, + billNo: null, + billdate: "", + customerId: store.getters.customerId, + billType: "", + type: null, + corpName: "", + corpId: "", + + }, formRules: { corpName: [ {required: true, message: "请输入供应商", trigger: "blur"} @@ -1061,13 +1091,16 @@ export default { this.invChange(); } else { this.formData = { + billNo: null, billdate: "", - corpName: store.getters.companyName, customerId: store.getters.customerId, - // billType: "deliveryNote", billType: "", - type: "1", - // type: "", + type: "2", + corpName: "", + corpId: "", + noInvOut: "", + locStorageCode: store.getters.locInvCode, + invWarehouseCode: store.getters.locSubInvCode, }; this.iCount = 0; this.orderEditor = false; diff --git a/src/views/inout/DialogSelectErpOrder.vue b/src/views/inout/DialogSelectErpOrder.vue index f9e08c1..f4bab3a 100644 --- a/src/views/inout/DialogSelectErpOrder.vue +++ b/src/views/inout/DialogSelectErpOrder.vue @@ -115,25 +115,30 @@ > - + + diff --git a/src/views/inout/DialogSelectUnit.vue b/src/views/inout/DialogSelectUnit.vue index 95d7fd3..1a42a90 100644 --- a/src/views/inout/DialogSelectUnit.vue +++ b/src/views/inout/DialogSelectUnit.vue @@ -90,15 +90,15 @@ export default { }, methods: { getUnitList() { - this.loading = true; - getBasicUnitMaintains(this.unitquery) - .then((response) => { - this.loading = false; - this.unitlist = response.data.page.list || []; - }) - .catch(() => { - this.loading = false; - }); + // this.loading = true; + // getBasicUnitMaintains(this.unitquery) + // .then((response) => { + // this.loading = false; + // this.unitlist = response.data.page.list || []; + // }) + // .catch(() => { + // this.loading = false; + // }); }, getUnitListByCode(row) { let query = { diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue index 650f7d2..c0d8102 100644 --- a/src/views/inout/IOAddOrder.vue +++ b/src/views/inout/IOAddOrder.vue @@ -589,9 +589,9 @@ export default { }, closeCodeDialog() { //编辑完，获取编辑之后的条码 - this.getCodeList(); this.editCodeVisible = false; this.editOriginCodeVisible = false; + this.getCodeList(); }, editCode(row) { this.codeDetail = row; diff --git a/src/views/inout/errorCode.vue b/src/views/inout/errorCode.vue index 67f6042..be99e6a 100644 --- a/src/views/inout/errorCode.vue +++ b/src/views/inout/errorCode.vue @@ -355,6 +355,7 @@ export default { }, closeCodeDialog() { this.editCodeVisible = false; + this.getCodeList(); }, editCode(row) { this.codeDetail = row; From c3ce5cca1b44e9245dfad8fd96e2f9b184de8984 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 9 Aug 2022 18:57:00 +0800 Subject: [PATCH 3/4] =?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/basic/BasicEntrutsRece.vue | 625 +++++++++--------- src/views/business/stockOrder.vue | 2 +- .../business/stockOrderEditDistribution.vue | 6 +- src/views/business/stockOrderEditor.vue | 6 +- .../business/stockOrderNewDistribution.vue | 9 +- src/views/business/stockOrderQRCodeDetail.vue | 45 +- src/views/inout/IOAddOrder.vue | 5 +- src/views/inout/IOAdditionalOrder.vue | 7 +- src/views/inout/IOFinishOrder.vue | 2 +- src/views/inout/IONewOrder.vue | 20 +- src/views/inout/errorCode.vue | 11 +- src/views/thrsys/thrOrderNew.vue | 6 +- 12 files changed, 375 insertions(+), 369 deletions(-) diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue index 479b1af..b4a2161 100644 --- a/src/views/basic/BasicEntrutsRece.vue +++ b/src/views/basic/BasicEntrutsRece.vue @@ -1,334 +1,357 @@ diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue index a444a84..19ac0e9 100644 --- a/src/views/business/stockOrder.vue +++ b/src/views/business/stockOrder.vue @@ -324,7 +324,7 @@ { this.detailLoading = false; if (response.code === 20000) { diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue index 72f6c61..bd863ef 100644 --- a/src/views/business/stockOrderNewDistribution.vue +++ b/src/views/business/stockOrderNewDistribution.vue @@ -565,9 +565,9 @@ export default { // return this.$message.error('批次号不能为空'); // } // } - if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { - return this.$message.error('生产日期与失效日期不能全部为空'); - } + // if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) { + // return this.$message.error('生产日期与失效日期不能全部为空'); + // } // if (this.$isBlank(this.codeArray[i].expireDate)) { // return this.$message.error('失效日期不能为空'); // } @@ -759,7 +759,6 @@ export default { selectProductFunction(event) { if (event == null) { - // this.$refs.inputRef.focus(); } else { event.target.select(); } @@ -790,12 +789,14 @@ export default { if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.locStorageCode, + invWarehouseCode: this.formData.invWarehouseCode, }; this.selectInvProductVisible = true; } else if (item.mainAction == "WareHouseIn" && this.curAction.corpType == 1 && this.formData.noInvOut != true) { this.invQueryData = { locStorageCode: this.formData.corpId, + invWarehouseCode: this.formData.fromSubInvCode, }; this.selectInvProductVisible = true; } else { diff --git a/src/views/business/stockOrderQRCodeDetail.vue b/src/views/business/stockOrderQRCodeDetail.vue index ac72842..6340a34 100644 --- a/src/views/business/stockOrderQRCodeDetail.vue +++ b/src/views/business/stockOrderQRCodeDetail.vue @@ -63,23 +63,10 @@ - - - - - + - - - - - - - - - - - + - - - - - - - - - - -
@@ -123,8 +99,13 @@