diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 2dfb0951..141b43d1 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -174,7 +174,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 - axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 @@ -187,14 +187,14 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 - // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址 - // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 - // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 + axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.9.249:9820/' //四川网城正式地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:34568/' //四川网城外网映射地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index f77fea38..10b2d768 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -2779,10 +2779,13 @@ export default { } const result = { ...this.replyData, - violatorId: this.replyData.violatorId.join(","), + // violatorId: this.replyData.violatorId.join(","), qualityId: valId, createUser: this.userIdInfo, } + if(type == 1 && statusType == 2) { + result.violatorId = this.replyData.violatorId.join(","); + } console.log("整改提交的表单数据:::", result); addQualityRectifyRecordApi(result).then((res) => { if (res.code == 200) { diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue index 3f3d609c..4b28b2bc 100644 --- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue +++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue @@ -1305,16 +1305,19 @@ loadPersonList(sn) { this.$message.error('请选择整改时间') return; } - if (this.replyData.violatorId == "" && type == 1 && statusType == 2) { + if (this.replyData.violatorId == "" && type == 1 && statusType == 2) { this.$message.error("请选择违章人员"); return; } const result = { ...this.replyData, - violatorId: this.replyData.violatorId.join(","), + // violatorId: this.replyData.violatorId.join(","), qualityId: valId, createUser: this.userIdInfo, } + if(type == 1 && statusType == 2) { + result.violatorId = this.replyData.violatorId.join(","); + } console.log('整改提交的表单数据:::', this.replyData); addQualityRectifyRecordApi(result).then(res => { if (res.code == 200) { diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 16f8a458..741bea5f 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -2755,10 +2755,13 @@ export default { } const result = { ...this.replyData, - violatorId: this.replyData.violatorId.join(","), + // violatorId: this.replyData.violatorId.join(","), qualityId: valId, createUser: this.userIdInfo, } + if(type == 1 && statusType == 2) { + result.violatorId = this.replyData.violatorId.join(","); + } console.log("整改提交的表单数据:::", result); addSafeQualityRectifyRecordApi(result).then((res) => { if (res.code == 200) { diff --git a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue index 84bf30c8..71892109 100644 --- a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue +++ b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue @@ -1305,17 +1305,21 @@ loadPersonList(sn) { this.$message.error('请选择整改时间') return; } -if (this.replyData.violatorId == "" && type == 1 && statusType == 2) { + if (this.replyData.violatorId == "" && type == 1 && statusType == 2) { this.$message.error("请选择违章人员"); return; } const result = { ...this.replyData, - violatorId: this.replyData.violatorId.join(","), + // violatorId: this.replyData.violatorId.join(","), qualityId: valId, createUser: this.userIdInfo, } + if(type == 1 && statusType == 2) { + result.violatorId = this.replyData.violatorId.join(","); + } + console.log('整改提交的表单数据:::', this.replyData); addSafeQualityRectifyRecordApi(result).then(res => {