From 908af9994956ae634c3876fe255837b5f0683e4c Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 13:10:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?HL-5359=20=E5=9C=A8=E5=BC=80=E5=85=B3?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=EF=BC=9A?= =?UTF-8?q?semiProductReceipCommitValidate=EF=BC=8C=E5=9C=A8=E9=A2=84?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=AE=8C=E5=B7=A5=E6=94=B6=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=8F=90=E4=BA=A4=E6=97=B6=E6=A0=B9=E6=8D=AE=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E8=A6=81=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E6=89=AB=E6=8F=8F=E7=9B=AE=E6=A0=87=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E5=8F=96=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84=E7=9B=AE?= =?UTF-8?q?=E6=A0=87=E5=BA=93=E4=BD=8D=EF=BC=8C=E5=8F=82=E8=80=83=E8=A3=85?= =?UTF-8?q?=E9=85=8D=E4=BB=BB=E5=8A=A1=E4=B8=AD=E7=9A=84fgProductReceipCom?= =?UTF-8?q?mitValidate=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/index/index.vue | 2 +- .../job/productReceiptDetail.vue | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8fb3b6c7..1fa86ce7 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -388,7 +388,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; + var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,semiProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate,CreateProductputawayRequestAfterProductreceiptRecordCreated"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data) diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index 7a898713..1c6c3cb3 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -85,7 +85,8 @@ import { goHome, navigateBack, - getPackingNumberAndBatch, + getPackingNumberAndBatch, + getSwitchInfoByCode } from '@/common/basic.js'; import { @@ -334,18 +335,21 @@ }); }, - commit() { + commit() { this.scanCount = getScanCount(this.subList); if (this.scanCount == 0) { this.showErrorMessage("扫描数为0,请先扫描") return; + } + var valiDate = getSwitchInfoByCode("semiProductReceipCommitValidate") + //校验库位、 + if(valiDate){ + if (!this.checkLocation()) { + return + } + }else{ + this.toLocationCode = this.jobToLocationCode } - //校验库位、 - if (!this.checkLocation()) { - return - } - - //扫描数量和任务数量相等，直接提交 if (this.scanCount == this.subList.length) { if (this.checkCount()) { From 110767de2ade859596c77b47a4d5a0490d84f7ce Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 14:50:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?HL-4766=20=E5=9C=A8WMS=E7=9A=84=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=92=8CPDA=E7=9A=84=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 2 +- src/pages/login/index.vue | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/api/request2.js b/src/api/request2.js index f654afbd..8dc5ef33 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -19,7 +19,7 @@ export function getCaptchaImage(params) { */ export function login(username, password, code, uuid, tenantName) { return request({ - url: baseApi + '/system/auth/login', + url: baseApi + '/system/auth/loginNoCode', headers: { isToken: false }, diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 50420dd7..71ac4b30 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -65,13 +65,13 @@ - + - + @@ -119,7 +119,8 @@ imageSrc: "", code: "", uuid: "", - version: "" + version: "", + needCode:false } }, // computed: mapState(['forcedLogin', 'hasLogin']), @@ -185,13 +186,15 @@ icon: 'none', mask: true }) - } else if (this.code === '') { + } + else if (this.needCode&&this.code === '') { uni.showToast({ title: '验证码不能为空', icon: 'none', mask: true }) - } else { + } + else { // console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg) let logininfo = { username: "",