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 ); } 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() { 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 @@ >