From b5e07364793962890fd64958ddb498d485f9d3d7 Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Tue, 7 May 2024 09:15:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=201478=20=E5=BE=85=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=85=88=E8=BE=93=E5=86=99=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=A1=B9=E5=86=85=E5=AE=B9=EF=BC=8C=E5=86=8D=E5=B0=86=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=88=A0=E9=99=A4=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=8C=89=E9=92=AE=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=93=8D=E4=BD=9C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue | 4 ++-- sgzb-ui/vue.config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue index 4cfe0162..2bd40d2b 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue @@ -188,10 +188,10 @@ export default { //正则校验配件数量--维修数量 numberIntegerValidator(rule, value, callback) { const reg = /^\+?[1-9][0-9]*$/ - if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) { + if ((value && reg.test(value)) && value <= this.rowObj.repairNum) { callback() } else { - callback(new Error('请输入大于0的并且小于维修总量的正整数')) + callback(new Error('请输入大于0并且小于维修总量的正整数')) } }, getList() { diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index 12ac2c0f..ade9be5f 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.74:8080`,//旭/ - // target: `http://10.40.92.153:8080`, //帅 - target: `http://10.40.92.5:28080`, //福 + target: `http://10.40.92.140:28080`, //帅 + // target: `http://10.40.92.5:28080`, //福 //******** 注意事项 ********* */ //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; From 0f3675df58c19d9bf3a7f0d1bd345a0aeaad3ea8 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 7 May 2024 10:21:12 +0800 Subject: [PATCH 2/2] bug --- .../bonus/sgzb/material/service/impl/BackApplyServiceImpl.java | 1 + .../src/main/resources/mapper/material/BackApplyMapper.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java index 087e59b5..76db470e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java @@ -300,6 +300,7 @@ public class BackApplyServiceImpl implements BackApplyService { List backApplyDetails = bean.getBackApplyDetails(); for (BackApplyInfo backApplyDetail : backApplyDetails) { bean.setAuditNum(backApplyDetail.getNum()); + bean.setTypeId(backApplyDetail.getTypeId()); re = backApplyMapper.audit(bean); } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml index b725d29d..2df77eb5 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml @@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN back_apply_details bad on bad.parent_id=bai.id SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW() WHERE - bai.id = #{id} + bad.type_id = #{typeId} and bai.company_id = #{companyId}