From 5655e6a1aa175f2f0b20440921483707833c3349 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 8 Aug 2022 17:38:38 +0800 Subject: [PATCH] =?UTF-8?q?2=E7=BA=A7bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/role.js | 4 +- src/utils/axios.js | 2 +- src/views/basic/UdiRlDetailDialog.vue | 2 +- src/views/warehouse/DialogSelectErpOrder.vue | 19 +++-- src/views/warehouse/DialogSelectUnit.vue | 18 ++--- src/views/warehouse/addHosOrder.vue | 1 + src/views/warehouse/errorCode.vue | 1 + src/views/warehouse/stockHospOrderNew.vue | 19 ----- .../warehouse/stockOrderEditDistribution.vue | 69 +++++++++++-------- src/views/warehouse/stockOrderNew.vue | 21 ++++-- .../warehouse/stockOrderNewDistribution.vue | 10 +++ 11 files changed, 91 insertions(+), 75 deletions(-) diff --git a/src/role.js b/src/role.js index e3dd15d..51be483 100644 --- a/src/role.js +++ b/src/role.js @@ -101,7 +101,7 @@ router.beforeEach((to, from, next) => { // accessedRouters[1].children.splice(5,1); //删除admin里面不显示的客户用户管理 // accessedRouters[3].children.splice(8,1);//删除admin里面不显示的用户信息管理 // } - + // 生成可访问的路由表 router.addRoutes(accessedRouters); // 动态添加可访问路由表 next({ ...to }); // hack方法 确保addRoutes已完成 @@ -112,7 +112,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 f1380bf..7d43b0d 100644 --- a/src/utils/axios.js +++ b/src/utils/axios.js @@ -46,7 +46,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..3171970 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/warehouse/DialogSelectErpOrder.vue b/src/views/warehouse/DialogSelectErpOrder.vue index 26e4486..a2b8a20 100644 --- a/src/views/warehouse/DialogSelectErpOrder.vue +++ b/src/views/warehouse/DialogSelectErpOrder.vue @@ -110,25 +110,30 @@ > - + + diff --git a/src/views/warehouse/DialogSelectUnit.vue b/src/views/warehouse/DialogSelectUnit.vue index 64e605b..501a82b 100644 --- a/src/views/warehouse/DialogSelectUnit.vue +++ b/src/views/warehouse/DialogSelectUnit.vue @@ -91,15 +91,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/warehouse/addHosOrder.vue b/src/views/warehouse/addHosOrder.vue index 1366a36..d545d76 100644 --- a/src/views/warehouse/addHosOrder.vue +++ b/src/views/warehouse/addHosOrder.vue @@ -591,6 +591,7 @@ export default { closeCodeDialog() { this.editCodeVisible = false; this.editOriginCodeVisible = false; + this.getCodeList(); }, editCode(row) { this.codeDetail = row; diff --git a/src/views/warehouse/errorCode.vue b/src/views/warehouse/errorCode.vue index ced106c..014fbc0 100644 --- a/src/views/warehouse/errorCode.vue +++ b/src/views/warehouse/errorCode.vue @@ -245,6 +245,7 @@ export default { }, closeCodeDialog() { this.editCodeVisible = false; + this.getCodeList(); }, deleteDialog() { this.$confirm("是否删除所选条码?", "提示", { diff --git a/src/views/warehouse/stockHospOrderNew.vue b/src/views/warehouse/stockHospOrderNew.vue index bb3b35b..7cd707b 100644 --- a/src/views/warehouse/stockHospOrderNew.vue +++ b/src/views/warehouse/stockHospOrderNew.vue @@ -560,17 +560,9 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - // if (this.$isBlank(this.codeArray[i].batchNo)) { - // if (!this.codeArray[i].allowNoBatch) { - // 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('失效日期不能为空'); - // } } @@ -580,14 +572,6 @@ export default { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { return this.$message.error('单据数量不能为0'); } - - // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) { - // return this.$message.error('生产日期格式错误'); - // } - // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) { - // return this.$message.error('失效日期不能为空'); - // } - } } @@ -704,15 +688,12 @@ export default { this.loading = true; let tQuery = this.formData; tQuery.status = status; - // if (!this.orderEditor) { tQuery.subErpOrders = this.codeArray; if (status == '3') { tQuery.subErpOrders.forEach((obj) => { obj.reCount = obj.count; }); } - - insertStockOrderWeb(tQuery) .then(response => { this.loading = false; diff --git a/src/views/warehouse/stockOrderEditDistribution.vue b/src/views/warehouse/stockOrderEditDistribution.vue index ab7262c..768955c 100644 --- a/src/views/warehouse/stockOrderEditDistribution.vue +++ b/src/views/warehouse/stockOrderEditDistribution.vue @@ -135,6 +135,24 @@ + + + + +
+ +
+ + + + 允许无库存出库 + + + + + + @@ -263,33 +281,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -