From b8bd8633be5656baf9de2533bef42668ec118ce8 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 9 Aug 2024 19:30:07 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=B5=81=E7=A8=8B]=20=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=8A=82=E7=82=B9=E8=AF=A6=E6=83=85=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=9D=9E=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InspectionPlanTable.vue           | 23 ++++++++++++-------
 .../modules/InspectionProcessTable.vue        |  4 ++--
 .../modules/ExtensionRequestTable.vue         |  2 +-
 .../modules/BaseInfoTable.vue                 |  4 ++--
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index 17eb4488..9ae0714e 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -41,16 +41,23 @@
 
         <!--  操作  -->
         <template slot="action" slot-scope="{text, record, index}">
-          <!--  编辑 and 删除:节点1 或 节点3 或 节点2且当前登录人是创建人  -->
-          <template v-if="isInitiateOrLiaisonCollect || (currentNode === EsInspectionPlan.fillInComments.value && currentUserName === record.createBy)">
-            <a :disabled="disabled" @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
-            <a-divider type="vertical" />
-            <a :disabled="disabled" @click="handleDelete(index)" >{{ $t('delete') }}</a>
+          <!-- 正常流程按钮判断 -->
+          <template v-if="!disabled">
+            <!--  编辑 and 删除:节点1 或 节点3 或 节点2且当前登录人是创建人  -->
+            <template v-if="isInitiateOrLiaisonCollect || (currentNode === EsInspectionPlan.fillInComments.value && currentUserName === record.createBy)">
+              <a :disabled="disabled" @click="handleEdit(record, index)" >{{ $t('edit') }}</a>
+              <a-divider type="vertical" />
+              <a :disabled="disabled" @click="handleDelete(index)" >{{ $t('delete') }}</a>
+            </template>
+            <!--  意见 or 填写意见：节点2非自己创建的就是意见和填写意见  -->
+            <template v-else-if="currentNode === EsInspectionPlan.fillInComments.value">
+              <a v-if="isShowOpinion(record)" @click="handleWriteOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.opinion') }}</a>
+              <a :disabled="disabled" v-else @click="handleWriteOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.writeOpinion') }}</a>
+            </template>
           </template>
-          <!--  (被禁用只能查看意见)意见 or 填写意见：节点2非自己创建的就是意见和填写意见  -->
-          <template v-else-if="currentNode === EsInspectionPlan.fillInComments.value">
+          <!--  (查看流程节点的时候)节点2非自己创建的就是意见和填写意见  -->
+          <template v-if="disabled && (currentNode === EsInspectionPlan.fillInComments.value)">
             <a v-if="isShowOpinion(record)" @click="handleWriteOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.opinion') }}</a>
-            <a :disabled="disabled" v-else @click="handleWriteOpinion(record, index)" >{{ $t('workCenter.esInspectionPlan.writeOpinion') }}</a>
           </template>
         </template>
 
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index f921b010..3aa58958 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -68,8 +68,8 @@
           <!-- 节点1显示稽查内容和删除、节点2显示稽查内容（只读） -->
           <template v-if="isInitiate || isDirectorLeaderApprovalOne">
             <a @click="handleInspectionContent(record, index)" >{{ $t('workCenter.esInspectionProcess.inspectionContent') + `(${record.standardInspectContentCount || 0}${$t('strip')})` }}</a>
-            <a-divider v-if="isInitiate" type="vertical" />
-            <a v-if="isInitiate" @click="handleDelete(index)" :disabled="disabled">{{ $t('delete') }}</a>
+            <a-divider v-if="isInitiate && !disabled" type="vertical" />
+            <a v-if="isInitiate && !disabled" @click="handleDelete(index)">{{ $t('delete') }}</a>
           </template>
           <!-- 后续节点都显示稽查报告和整改计划 -->
           <template v-else>
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
index 98ea0b75..8ae4273b 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
@@ -47,7 +47,7 @@
         </template>
 
         <!--  操作  -->
-        <template slot="action" slot-scope="{text, record, index}">
+        <template slot="action" slot-scope="{text, record, index}" v-if="!disabled">
           <!-- 节点1，显示申请延期和删除，后续不显示操作列 -->
           <a @click="handleRequestExtension(record, index)" :disabled="disabled">{{ $t('workCenter.incExtensionRequest.requestExtension') }}</a>
           <a-divider type="vertical" />
diff --git a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
index c97a901b..f342b2ca 100644
--- a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
+++ b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
@@ -27,8 +27,8 @@
         </template>
 
         <!--  操作  -->
-        <template slot="action" slot-scope="{text, record, index}">
-          <a @click="handleDelete(index)" :disabled="disabledAll">{{ $t('delete') }}</a>
+        <template slot="action" slot-scope="{text, record, index}" v-if="!disabledAll">
+          <a @click="handleDelete(index)">{{ $t('delete') }}</a>
         </template>
 
       </j-table>