From 84d7f85ac83043679e6074ca4ba308cfcc9a0740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Mon, 27 May 2024 19:41:45 +0800 Subject: [PATCH] 1 --- src/store/index.js | 3 ++- src/views/projectFront/projectSummary/cooperationUnit.vue | 4 ++-- src/views/projectFront/projectSummary/cooperatorDatails.vue | 2 +- src/views/projectFront/quality/inspectionLedger.vue | 4 ++-- .../projectFront/quality/recordsModule/inspectionRecord.vue | 4 ++-- src/views/projectFront/safeSame/inspectionLedger.vue | 4 ++-- .../projectFront/safeSame/recordsModule/inspectionRecord.vue | 5 +++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 959b3c00..f39bb20a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -54,7 +54,8 @@ export default new Vuex.Store({ // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index b05281aa..e45c9bfc 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -98,7 +98,7 @@ > - + diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue index f63841ad..dd67f220 100644 --- a/src/views/projectFront/projectSummary/cooperatorDatails.vue +++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue @@ -562,7 +562,7 @@ export default { }, ]; this.infoEnterpriseId = res.result.id; - this.getDataDateils(); + // this.getDataDateils(); console.log(this.enterpriseInfo,666777888) } }); diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index 7e89d6e9..d866957d 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -2055,7 +2055,7 @@
* * {{ detailData.status == 2 ? "整改照片：" @@ -2580,7 +2580,7 @@ export default { if ( this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || - this.fileListRectification.length == 0 + (this.fileListRectification.length == 0 && this.replyData.type == 1) ) { this.$message.error("请将回复内容输入完整"); return; diff --git a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue index 5dc1420e..9b501d9c 100644 --- a/src/views/projectFront/quality/recordsModule/inspectionRecord.vue +++ b/src/views/projectFront/quality/recordsModule/inspectionRecord.vue @@ -878,7 +878,7 @@
* * {{ detailData.status == 2 ? '整改照片：' @@ -1243,7 +1243,7 @@ export default { } else { this.replyData.fileUrl = "" } - if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { + if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) { this.$message.error('请将回复内容输入完整') return; } diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 9d2a9fbb..280ca870 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -2036,7 +2036,7 @@
* * {{ detailData.status == 2 ? '整改照片：' @@ -2538,7 +2538,7 @@ export default { } else { this.replyData.fileUrl = ""; } - if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { + if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) { this.$message.error('请将回复内容输入完整') return; } diff --git a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue index c6e97923..db2e4d93 100644 --- a/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue +++ b/src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue @@ -878,7 +878,7 @@
* * {{ detailData.status == 2 ? '整改照片：' @@ -1243,7 +1243,7 @@ export default { } else { this.replyData.fileUrl = "" } - if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) { + if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || (this.fileListRectification.length == 0 && this.replyData.type == 1)) { this.$message.error('请将回复内容输入完整') return; } @@ -1259,6 +1259,7 @@ export default { this.replyData.qualityId = valId this.replyData.createUser = this.userIdInfo console.log('整改提交的表单数据：：：', this.replyData); + addSafeQualityRectifyRecordApi(this.replyData).then(res => { if (res.code == 200) { this.$message.success('提交成功')