bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-cq-bug' of http://192.168.0.56:3000/bonus/devicesmgt into dev-cq-bug

This commit is contained in:
BianLzhaoMin 2024-05-07 11:14:15 +08:00
parent 5a7856a150 0f3675df58
commit b340c8ec01
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java
View File

@ -300,6 +300,7 @@ public class BackApplyServiceImpl implements BackApplyService {
List<BackApplyInfo> backApplyDetails = bean.getBackApplyDetails(); List<BackApplyInfo> backApplyDetails = bean.getBackApplyDetails();
for (BackApplyInfo backApplyDetail : backApplyDetails) { for (BackApplyInfo backApplyDetail : backApplyDetails) {
bean.setAuditNum(backApplyDetail.getNum()); bean.setAuditNum(backApplyDetail.getNum());
bean.setTypeId(backApplyDetail.getTypeId());
re = backApplyMapper.audit(bean); re = backApplyMapper.audit(bean);
} }
} }

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
View File

@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id 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() SET bad.audit_num=#{auditNum},bai.direct_audit_by=#{createBy},bai.status=#{status},bai.direct_audit_time=NOW()
WHERE WHERE
bai.id = #{id} bad.type_id = #{typeId}
<if test="companyId != null and companyId != ''"> <if test="companyId != null and companyId != ''">
and bai.company_id = #{companyId} and bai.company_id = #{companyId}
</if> </if>

4
sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
View File

@ -244,10 +244,10 @@ export default {
//正则校验配件数量--维修数量 //正则校验配件数量--维修数量
numberIntegerValidator(rule, value, callback) { numberIntegerValidator(rule, value, callback) {
const reg = /^\+?[1-9][0-9]*$/ 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() callback()
} else { } else {
callback(new Error('请输入大于0的并且小于维修总量的正整数')) callback(new Error('请输入大于0并且小于维修总量的正整数'))
} }
}, },
getList() { getList() {

4
sgzb-ui/vue.config.js
View File

@ -46,8 +46,8 @@ module.exports = {
// target: `http://10.40.92.8:8080`, //超 // target: `http://10.40.92.8:8080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://10.40.92.153:8080`, //帅 target: `http://10.40.92.140:28080`, //帅
target: `http://10.40.92.5:28080`, //福 // target: `http://10.40.92.5:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;