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} diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue index 3c4f220d..c4fe9b9d 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue @@ -244,10 +244,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;