From 5528062c8e7c9d7d01d52a8d174c495e631fd995 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 21 Dec 2023 16:02:17 +0800
Subject: [PATCH] =?UTF-8?q?fix=2079363=E3=80=8179372?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/workCenter/en.js                             | 3 ++-
 src/common/lang/workCenter/zh.js                             | 3 ++-
 .../EnterpriseStandardInspectionProcess.vue                  | 5 +++++
 .../modules/InspectionProcessRectificationPlanModal.vue      | 3 +++
 .../modules/InspectionProcessReportModal.vue                 | 2 +-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 6b848abb..7000a13d 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -268,7 +268,8 @@ module.exports = {
     planDoneDate: '计划完成日期',
     rectificationPlanDoneDate: '整改计划完成日期',
     rectificationRealityDoneDate: '整改实际完成日期',
-    rectificationStatus: '整改状态'
+    rectificationStatus: '整改状态',
+    pleaseFillInspectionContent: '请填写稽查内容'
   },
   // 稽查延期申请流程
   incExtensionRequest: {
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index bf62a917..7c7e3a30 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -295,7 +295,8 @@ module.exports = {
     planDoneDate: '计划完成日期',
     rectificationPlanDoneDate: '整改计划完成日期',
     rectificationRealityDoneDate: '整改实际完成日期',
-    rectificationStatus: '整改状态'
+    rectificationStatus: '整改状态',
+    pleaseFillInspectionContent: '请填写稽查内容'
   },
   // 稽查延期申请流程
   incExtensionRequest: {
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index ee1b80fa..37d32fcf 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -285,6 +285,11 @@ export default {
         this.$message.warning(this.$t('addAtLeastOneRowOfData'))
         throw new Error('base')
       }
+      // fix 79372 稽查内容条数不能为空或0
+      if (this.$refs.inspectionProcessTable.dataSource.some(item => (!item.standardInspectContentCount || item.standardInspectContentCount === '0'))) {
+        this.$message.warning(this.$t('workCenter.esInspectionProcess.pleaseFillInspectionContent'))
+        throw new Error('base')
+      }
       const params = {}
       // 收集所有表单信息
       let formDataList = []
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
index 9c32527b..70084c0c 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
@@ -172,6 +172,9 @@ export default {
       // 是否需要整改（布尔值或null）
       isNeedRectification: null,
       rules: {
+        inspectContentId: [
+          { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.esInspectionProcess.sectionClause'), trigger: 'change' }
+        ],
         // 是否需要整改
         isRectify: [
           { required: true, message: this.$t('pleaseSelect') + this.$t('workCenter.esInspectionProcess.isNeedRectification'), trigger: 'change' }
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
index de345f94..52f19637 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReportModal.vue
@@ -104,7 +104,7 @@ export default {
           { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.esInspectionProcess.sectionClause'), trigger: 'change' }
         ],
         // 执行情况
-        implementation: [
+        executionStatus: [
           { required: true, message: this.$t('pleaseEnter') + this.$t('workCenter.esInspectionProcess.implementation'), trigger: 'blur' }
         ],
         // 评分