From 886748a39efb188d8008d41f2718eb78f3006ddd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/base/EamMaintenanceStandardList.vue |   36 ++++++++++++++++++++++--------------
 1 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/views/eam/base/EamMaintenanceStandardList.vue b/src/views/eam/base/EamMaintenanceStandardList.vue
index a845f64..be2b0cd 100644
--- a/src/views/eam/base/EamMaintenanceStandardList.vue
+++ b/src/views/eam/base/EamMaintenanceStandardList.vue
@@ -44,29 +44,29 @@
 
       <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
       <div class="table-operator">
-        <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+        <a-button v-has="'standard:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
         <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
                   :action="inspectionImportExcel"
                   @change="handleImportExcel">
-          <a-button type="primary" icon="import">鐐规鏍囧噯瀵煎叆</a-button>
+          <a-button v-has="'standard:pointInspection'" type="primary" icon="import">鐐规鏍囧噯瀵煎叆</a-button>
         </a-upload>
-        <a-button type="primary" icon="download" @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)">
+        <a-button v-has="'standard:pointInspectionDownload'" type="primary" icon="download" @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)">
           鐐规鏍囧噯妯℃澘涓嬭浇
         </a-button>
         <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
                   :action="secondMaintenanceImportExcel"
                   @change="handleImportExcel">
-          <a-button type="primary" icon="import">浜屼繚鏍囧噯瀵煎叆</a-button>
+          <a-button v-has="'standard:secondMaintenance'"  type="primary" icon="import">浜屼繚鏍囧噯瀵煎叆</a-button>
         </a-upload>
-        <a-button type="primary" icon="download"
+        <a-button v-has="'standard:secondMaintenanceDownload'"  type="primary" icon="download"
                   @click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)">浜屼繚鏍囧噯妯℃澘涓嬭浇
         </a-button>
         <a-upload name="file" :showUploadList="false" :multiple="true" :headers="tokenHeader"
                   :action="thirdMaintenanceImportExcel"
                   @change="handleImportExcel">
-          <a-button type="primary" icon="import">涓変繚鏍囧噯瀵煎叆</a-button>
+          <a-button v-has="'standard:ThirdMaintenance'" type="primary" icon="import">涓変繚鏍囧噯瀵煎叆</a-button>
         </a-upload>
-        <a-button type="primary" icon="download" @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)">
+        <a-button v-has="'standard:ThirdMaintenanceDownload'" type="primary" icon="download" @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)">
           涓変繚鏍囧噯妯℃澘涓嬭浇
         </a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -95,24 +95,32 @@
                :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" :customRow='clickThenSelect'
                @change="handleTableChange">
         <span slot="action" slot-scope="text, record">
-          <a v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">鍗囩増</a>
+          <a v-has="'standard:upgrade'" v-if="record.standardStatus === 'START'" @click.stop="handleUpgrade(record)">鍗囩増</a>
 
           <template v-if="record.standardStatus === 'WAIT_SUBMIT'">
-              <a @click.stop="handleEdit(record)">缂栬緫</a>
+              <a v-has="'standard:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
 
-              <a-divider type="vertical"/>
+              <a-divider v-has="'standard:edit'" type="vertical"/>
 
-              <a-popconfirm title="纭畾鍙戣捣娴佺▼鍚�?" @confirm="() => startProcess(record.id)">
-                  <a @click.stop="event=>event.stopPropagation()">鍙戣捣娴佺▼</a>
+              <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => startProcess(record.id)">
+                  <a v-has="'standard:saveFlow'" @click.stop="event=>event.stopPropagation()">鎻愪氦</a>
               </a-popconfirm>
 
 
-              <a-divider type="vertical"/>
+              <a-divider v-has="'standard:saveFlow'" type="vertical"/>
 
               <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
-                  <a @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
+                  <a  v-has="'standard:del'" @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
               </a-popconfirm>
           </template>
+
+          <template v-if="record.standardStatus != 'WAIT_SUBMIT'">
+            <a-divider v-has="'standard:delete'" type="vertical" v-if="record.standardStatus=='START'"/>
+
+          <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+            <a v-has="'standard:delete'" @click.stop="event=>event.stopPropagation()">鍒犻櫎</a>
+          </a-popconfirm>
+          </template>
         </span>
       </a-table>
 

--
Gitblit v1.9.3