From 1497d383150698b3215f05186d7d983805dd4a17 Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Wed, 31 Jul 2024 15:03:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/claimAndreturn/picking/outbound/index.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue index 965b48ec..ed44e7f5 100644 --- a/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue +++ b/sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue @@ -539,6 +539,7 @@ v-model.number="scope.row.inputNum" placeholder="请输入出库数量" type="number" + @input="checkNum(scope.row)" clearable style="width: 100%" /> @@ -872,9 +873,9 @@ export default { // console.log(this.dialogQuery) getLeaseAuditListDetail(this.dialogQuery).then((response) => { // 待出库数量为负数时显示为 0 - response.data.rows.forEach(item => { + /* response.data.rows.forEach(item => { item.outNum = item.outNum < 0 ? 0 : item.outNum - }) + }) */ this.dialogList = response.data.rows this.dialogTotal = response.data.total }) @@ -987,6 +988,7 @@ export default { }, //编码出库保存 saveCodeOut() { + if (this.maCodeList.length <= this.outObj.outNum) { let params = this.maCodeList.map((item) => { let obj = { id: this.outObj.id, @@ -1008,6 +1010,9 @@ export default { this.handleDialogQuery() this.handleQuery() }) + } else { + this.$modal.msgError('所选机具编码已超出出库数量！') + } }, //数量出库保存 saveNumOut() { From 50469522ef9ae596211a132e40818a9a0ec37081 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 1 Aug 2024 09:03:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=A0=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java index 32b6f5d7..99c66fd5 100644 --- a/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java +++ b/sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java @@ -25,12 +25,6 @@ public class SgzbGatewayApplication implements CommandLineRunner { private StringEncryptor encryptor; @Override public void run(String... args) throws Exception { - String mysqlNm = encrypt("root" ); - String mysqlPs = encrypt("Bonus@admin123!" ); - String redis = encrypt("Dszbns@Redis123!" ); - System.err.println( "mysqlNm原始明文密码加密后的结果为：" + mysqlNm ); - System.err.println( "mysqlPs原始明文密码加密后的结果为：" + mysqlPs ); - System.err.println( "redis原始明文密码加密后的结果为：" + redis ); } From 0c227faf44a3900fa9178a883b8f97914c53453c Mon Sep 17 00:00:00 2001 From: FrancisHu <2756004617@qq.com> Date: Thu, 1 Aug 2024 15:43:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=80=80=E6=96=99=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/claimAndreturn/return/apply/component/home.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue index 1088a231..dea8a366 100644 --- a/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue +++ b/sgzb-ui/src/views/claimAndreturn/return/apply/component/home.vue @@ -241,15 +241,12 @@ >