From a5c3c49ef5c688e685f52b900aab67b112c01305 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 12 Dec 2023 09:17:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/lang/en-us.js                                 | 1 +
 src/common/lang/zh-cn.js                                 | 1 +
 .../EnterpriseStandardInspectionProcess.vue              | 9 +++++++++
 .../modules/InspectionProcessTable.vue                   | 2 +-
 .../InspectionExtensionRequestProcess.vue                | 9 +++++++++
 .../modules/ExtensionRequestTable.vue                    | 2 +-
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index b78493c7..0050ffbf 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -171,6 +171,7 @@ module.exports = {
   select: '选择',
   attach: '附件',
   checkedAll: '全选',
+  pleaseCompleteTableInfo: '请完善表格信息',
   // 树右键
   treeRight: {
     addFolder: 'Create New Folder',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index bb46b924..0cf50fd8 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -174,6 +174,7 @@ module.exports = {
   select: '选择',
   attach: '附件',
   checkedAll: '全选',
+  pleaseCompleteTableInfo: '请完善表格信息',
   // 树右键
   treeRight: {
     addFolder: '新增文件夹',
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
index bdf5e435..5ad21061 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/EnterpriseStandardInspectionProcess.vue
@@ -370,6 +370,15 @@ export default {
      */
     handleSubmit () {
       if (this.loading) return
+      // 节点3,判断表格中实际稽查完成日期和实际稽查人是否填写
+      if (
+        this.currentNode === EsInspectionProcess.inputInspectionReport.value &&
+        this.$refs.inspectionProcessTable.dataSource.some(item => (!item.completeDate || !item.actualInspectUser))
+      ) {
+        this.switchChange('base')
+        this.$message.warning(this.$t('pleaseCompleteTableInfo'))
+        return
+      }
       // 有taskId说明已经发起过，调审批接口，否则调发起接口
       if (this.$route.query.taskId) {
         this.handleAgree(true)
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index 6031200f..cb71cd6a 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -281,7 +281,7 @@ export default {
     changeRowData (record, field) {
       editInspectProcessTable({
         id: record.id,
-        [field]: record[field]
+        [field]: record[field] || ''
       }).then(res => {
         if (res.success) {
           this.$message.success(res.message)
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
index 24f90ce6..d92f8cb4 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/InspectionExtensionRequestProcess.vue
@@ -371,6 +371,15 @@ export default {
      */
     handleSubmit () {
       if (this.loading) return
+      // 节点1 判断表格稽查联络人是否填写
+      if (
+        this.currentNode === InspectionExtensionRequestProcess.initiate.value &&
+        this.$refs.extensionRequestTable.dataSource.some(item => !item.liaisons)
+      ) {
+        this.switchChange('base')
+        this.$message.warning(this.$t('pleaseCompleteTableInfo'))
+        return
+      }
       // 有taskId说明已经发起过，调审批接口，否则调发起接口
       if (this.$route.query.taskId) {
         this.handleAgree(true)
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
index c96118d6..19ca0116 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
@@ -240,7 +240,7 @@ export default {
     changeRowData (record, field) {
       editInspectExtensionTable({
         id: record.id,
-        [field]: record[field]
+        [field]: record[field] || ''
       }).then(res => {
         if (res.success) {
           this.$message.success(res.message)