From 57e116b5565377b800bf33c3cac38e924e3c438b Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 12 Jul 2024 15:24:29 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B]=20=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/commonEnums.js                              |  2 ++
 .../StandardInterpretationProcess.vue                 | 11 +++++------
 .../modules/InterpretationClauseTable.vue             |  2 +-
 .../modules/InterpretationInitiate.vue                |  7 +------
 .../modules/InterpretationInterpreterFillInfo.vue     |  2 +-
 .../InterpretationMainInterpreterDistribute.vue       |  2 +-
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index 8a5dd82..4faa11e 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -251,7 +251,9 @@ export const AddType = {
   MANUAL_ADD: { text: '手动新增', value: '2' }
 }
 
+// 标准解读流程-是否分发
 export const IsDistribute = {
+  REJECT: { text: '驳回', value: 0 }, // 分发节点驳回时用
   DISTRIBUTE: { text: '是', value: '1' },
   NOT_DISTRIBUTE: { text: '否', value: '2' }
 }
diff --git a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
index f29a30b..7c5c29a 100644
--- a/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
+++ b/src/views/workCenter/standardInterpretationProcess/StandardInterpretationProcess.vue
@@ -123,7 +123,7 @@ import InternalDetailPage from '@comp/InternalDetailPage'
 import PersonnelInfo from '@comp/PersonnelInfo'
 import { WorkCenterMixin } from '@/mixins/WorkCenterMixin'
 import {
-  ApprovalOpinions,
+  ApprovalOpinions, IsDistribute,
   ProcessKey,
   ProcessType,
   StandardInterpretationNodes,
@@ -369,10 +369,7 @@ export default {
         projectId: this.projectId
       })
 
-      params.data = {
-        // 所有删除的id
-        processAllDelIds: compData.processAllDelIds
-      }
+      params.data = {}
       // 发起节点
       if (this.isInitiate) {
         // 选择的标准数据
@@ -428,6 +425,8 @@ export default {
         }
       })
 
+      // 所有删除的id
+      params.processAllDelIds = compData.processAllDelIds
       // 保存草稿信息
       params.infoJsonStr = JSON.stringify({
         // 人员信息(要重新获取，流程里的信息不能直接用，后端需要多选人员处理成数组了)
@@ -583,7 +582,7 @@ export default {
         res.map.pass = false
         // 解读人分发节点点击驳回特殊处理
         if (this.mainInterpreterDistributeNodes.includes(this.currentNodeId)) {
-          res.map.passFirst = 0
+          res.map.passFirst = IsDistribute.REJECT.value
         }
         // 审批意见
         res.processApprovalRecord.commitFlag = ApprovalOpinions.REJECT.value
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
index af215ef..1628630 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
@@ -734,7 +734,7 @@ export default {
         title: this.$t('confirmDeletion'),
         content: this.$t('areYouSure'),
         onOk: () => {
-          this.processAllDelIds.push(id)
+          that.processAllDelIds.push(id)
           that.dataSource = that.dataSource.filter(item => item[this.rowKey] !== id)
           // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
           if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue
index f2268db..508569a 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInitiate.vue
@@ -185,11 +185,6 @@ export default {
         this.$message.warn(this.$t('workCenter.standardInterpretationProcess.pleaseAddStandard'))
         return
       }
-      // 请选择分解单来源
-      if (!this.dataSource[0].decompositionSource) {
-        this.$message.warn(this.$t('pleaseSelect') + this.$t('workCenter.standardInterpretationProcess.decompositionOrderSource'))
-        return
-      }
       // 如果有条款的表格，就清空然后隐藏
       this.$refs.interpretationClauseTable && this.$refs.interpretationClauseTable.setData([])
       this.showClauseTable = true
@@ -214,11 +209,11 @@ export default {
     handleAddStandardCallback (list) {
       console.log(list)
       this.dataSource = list || []
-      this.dataSource[0].standardId = this.dataSource[0].id
       // 如果有条款的表格，就清空然后隐藏
       this.$refs.interpretationClauseTable && this.$refs.interpretationClauseTable.setData([])
       this.showClauseTable = false
       if (this.dataSource.length) {
+        this.dataSource[0].standardId = this.dataSource[0].id
         this.initInterpretGetFileByStandardId(this.dataSource[0].id)
       }
     },
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
index 78003e5..6cd110e 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationInterpreterFillInfo.vue
@@ -120,7 +120,7 @@ export default {
       const obj = {}
       if (isValidate) {
         if (!this.$refs.interpretationClauseTable.getData().length) {
-          this.$message.warn('addAtLeastOneRowOfData')
+          this.$message.warn(this.$t('addAtLeastOneRowOfData'))
           obj._flag = true
         }
         // 汇总节点，处理表单
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
index 9eab3d3..fac51a2 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
@@ -237,7 +237,7 @@ export default {
           obj.clauseData = this.$refs.interpretationClauseTable.getData()
           // 至少一条条款数据
           if (!obj.clauseData.length) {
-            this.$message.warn('addAtLeastOneRowOfData')
+            this.$message.warn(this.$t('addAtLeastOneRowOfData'))
             obj._flag = true
           } else if (this.isDistribute && !obj.clauseData.some(item => item.interpretPersonIds)) {
             // 有数据且选分发时候校验 至少一条数据选择解读人