From 8938cab912208ed533a8b377f88ab9a4543fd1f0 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Mon, 15 Jul 2024 09:56:48 +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=E4=B8=BB=E8=A7=A3=E8=AF=BB=E4=BA=BA?=
 =?UTF-8?q?=E5=88=86=E5=8F=91=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InterpretationClauseTable.vue              |  4 ++--
 .../InterpretationMainInterpreterDistribute.vue        | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
index 2406fbb..d653443 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue
@@ -459,8 +459,8 @@ export default {
       if (showExtendNodeId.includes(this.currentNodeId)) {
         columns.push(...this.columnsExtend)
       }
-      // 需要操作的节点就加上操作列
-      if (!noActionCoumnsNodes.includes(this.currentNodeId)) {
+      // 非禁用时，需要操作的节点就加上操作列
+      if (!this.disabled && !noActionCoumnsNodes.includes(this.currentNodeId)) {
         columns.push(this.actionColumn)
       }
       return columns
diff --git a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
index 8291740..856ec4d 100644
--- a/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
+++ b/src/views/workCenter/standardInterpretationProcess/modules/InterpretationMainInterpreterDistribute.vue
@@ -28,7 +28,7 @@
               <j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('workCenter.standardInterpretationProcess.interpretingTasksIsDistribute')"
                                  dict-code="is_distribute"
                                  :disabled="disabled || isNextStep"
-                                 v-decorator="[ 'isDistribute', validatorRules.isDistribute ]" />
+                                 v-decorator="[ 'distribute', validatorRules.isDistribute ]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -304,15 +304,15 @@ export default {
       // 默认是少的条款表格
       this.clauseDataSource = data.data.processStandardInterpretClauseList
       // 是否下发
-      if (info.isDistribute === IsDistribute.DISTRIBUTE.value) {
+      if (info.distribute === IsDistribute.DISTRIBUTE.value) {
         this.isDistribute = true
         this.clauseDataSource = data.data.processStandardInterpretClauseList
-      } else if (info.isDistribute === IsDistribute.NOT_DISTRIBUTE.value) {
+      } else if (info.distribute === IsDistribute.NOT_DISTRIBUTE.value) {
         this.isDistribute = false
         this.clauseDataSource = data.data.processStandardInterpretClauseSublistList
       }
       // 是否下发有值就自动带入下一步，并回显数据
-      if (info.isDistribute) {
+      if (info.distribute) {
         this.form.setFieldsValue(this.formInline)
         this.isNextStep = true
         this.$nextTick(() => {
@@ -324,7 +324,7 @@ export default {
     handleNextStep () {
       this.form.validateFields((err, values) => {
         if (!err) {
-          this.isDistribute = values.isDistribute === IsDistribute.DISTRIBUTE.value
+          this.isDistribute = values.distribute === IsDistribute.DISTRIBUTE.value
           this.isNextStep = true
           this.$nextTick(() => {
             this.$refs.interpretationClauseTable.setData(this.clauseDataSource)