From 7f1f76b33241833f7de33d689be6c5e674f098b0 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 19 Jul 2024 15:32:37 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E6=A0=87=E5=87=86=E4=B8=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92]=20=E8=B7=B3=E8=BD=AC=E6=A0=87=E5=87=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StandardMasterPlanList.vue                | 22 +++++++++++++++++--
 .../modules/StandardMasterPlanModal.vue       | 16 ++++++++------
 .../system/groupManage/GroupManageList.vue    |  5 +++--
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
index 01f978f..ecc7419 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/StandardMasterPlanList.vue
@@ -50,6 +50,14 @@
       @change="handleTableChange"
       @operationClick="operationClick"
     >
+      <!--跳转详情-->
+      <template v-slot:toDetail="{text, record}">
+        <a-tooltip overlay-class-name="tooltip-style">
+          <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+          <div class="table-text can-click-table-text" v-if="text || text === 0" @click="toStandardDetail(record)">{{ text }}</div>
+          <div v-else class="table-text">{{ global.emptyLine }}</div>
+        </a-tooltip>
+      </template>
     </j-table>
     <!-- 新增编辑弹框 -->
     <standard-master-plan-modal ref="modalForm" @ok="modalFormOk"/>
@@ -84,14 +92,14 @@ export default {
           align: 'center',
           dataIndex: 'standardNumber',
           width: 200,
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'toDetail' }
         },
         { // 标准名称
           title: this.$t('standardRegulationLibrary.standardMasterPlan.standardName'),
           align: 'center',
           dataIndex: 'standardName',
           width: 200,
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'toDetail' }
         },
         { // 标准状态
           title: this.$t('standardRegulationLibrary.standardMasterPlan.standardStatus'),
@@ -135,6 +143,16 @@ export default {
     }
   },
   methods: {
+    // 跳转详情
+    toStandardDetail (record) {
+      const { standardId } = record
+      this.$openPageNewSheet({
+        path: '/standardRegulationLibrary/foreignStandardDetailPage',
+        query: {
+          id: standardId
+        }
+      })
+    },
     handleShow (record) {
       this.$refs.modalForm.view(record)
       this.$refs.modalForm.title = this.$t('view')
diff --git a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
index d03547b..afee8dc 100644
--- a/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
+++ b/src/views/standardRegulationLibrary/standardMasterPlan/modules/StandardMasterPlanModal.vue
@@ -215,7 +215,7 @@
                 <a-col :span="12">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
                     <template v-if="data[2] && Array.isArray(data[2].processAllList)">
-                      <a v-for="item in data[2].processAllList" :key="item.id" @click="toProcessDetail(item)">{{item.prcNum}}</a>
+                      <a style="display: block" v-for="item in data[2].processAllList" :key="item.id" @click="toProcessDetail(item)">{{item.prcNum}}</a>
                     </template>
                     <a-input v-else :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
@@ -278,8 +278,10 @@
                 <!-- 交付物 -->
                 <a-col :span="12">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
-                    <a v-if="data[3].deliverableFileId" @click="previewStandardResolutionSheet(data[3].deliverableFileId)">解读表</a>
-                    <a-input v-else :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
+                    <a v-if="data[3].deliverableFileId" @click="previewStandardResolutionSheet(data[3].deliverableFileId)">
+                      {{ $t('standardRegulationLibrary.standardMasterPlan.deliverables') }}
+                    </a>
+                    <a-input v-else :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.interpretationTable')"
                              :maxLength="50" disabled
                              v-decorator="['data[3].deliverableFileId']" />
                   </a-form-item>
@@ -400,7 +402,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 交付物 -->
-                <a-col :span="12" v-show="isAdd">
+                <a-col :span="12" v-show="!isShow">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
                     <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
@@ -409,7 +411,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 查看市场清单 -->
-                <a-col :span="12" :offset="12" v-show="!isAdd">
+                <a-col :span="12" :offset="12" v-show="isShow">
                   <a-form-item :wrapper-col="{span:22}">
                     <div style="text-align: right">
                       <a-button type="primary" @click="handleViewMarketList"
@@ -474,7 +476,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 交付物 -->
-                <a-col :span="12" v-show="isAdd">
+                <a-col :span="12" v-show="!isShow">
                   <a-form-item :label="$t('standardRegulationLibrary.standardMasterPlan.deliverables')">
                     <a-input :placeholder="$t('pleaseEnter')+$t('standardRegulationLibrary.standardMasterPlan.deliverables')"
                              :maxLength="50" disabled
@@ -483,7 +485,7 @@
                   </a-form-item>
                 </a-col>
                 <!-- 查看排查结果 -->
-                <a-col :span="12" :offset="12" v-show="!isAdd">
+                <a-col :span="12" :offset="12" v-show="isShow">
                   <a-form-item :wrapper-col="{span:22}">
                     <div style="text-align: right">
                       <a-button type="primary" @click="handleViewTroubleshootingResults"
diff --git a/src/views/system/groupManage/GroupManageList.vue b/src/views/system/groupManage/GroupManageList.vue
index 8ed4339..8fe7495 100644
--- a/src/views/system/groupManage/GroupManageList.vue
+++ b/src/views/system/groupManage/GroupManageList.vue
@@ -57,7 +57,7 @@
 
         <template v-slot:action="{text, record}">
           <a @click="handleEdit(record)" v-has="'sys:groupManage:edit'">{{ $t('edit') }}</a>
-          <a-divider type="vertical" v-if="ju" />
+          <a-divider type="vertical" v-if="isHasPermission('sys:groupManage:edit') && isHasPermission('sys:groupManage:delete')" />
           <a @click="handleDelete(record.id)" class="table-ope-btn" v-has="'sys:groupManage:delete'">{{ $t('delete') }}</a>
         </template>
 
@@ -72,6 +72,7 @@
 import JTable from '@/components/jero/JTable'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import GroupManageModal from '@views/system/groupManage/modules/GroupManageModal'
+import { isHasPermission } from '@/utils/hasPermission'
 
 export default {
   name: 'GroupManageList',
@@ -128,7 +129,7 @@ export default {
     }
   },
   methods: {
-
+    isHasPermission
   }
 }
 </script>