From 1e653db94c24389cc7615fd4a7ef1d63b00af534 Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期五, 13 六月 2025 11:39:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/eam/repair/EamReportRepairList.vue | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/views/eam/repair/EamReportRepairList.vue b/src/views/eam/repair/EamReportRepairList.vue index 54655ba..0984200 100644 --- a/src/views/eam/repair/EamReportRepairList.vue +++ b/src/views/eam/repair/EamReportRepairList.vue @@ -58,7 +58,7 @@ <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <div class="table-operator" v-if="isDisplayOperation"> - <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button> + <a-button @click="handleAdd" type="primary" icon="plus" v-if="isShowAuth('eam:reportRepair:add')">鏂板</a-button> <!--<a-button type="primary" icon="download" @click="handleExportXls('鏁呴殰鎶ヤ慨')">瀵煎嚭</a-button>--> <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"--> <!--@change="handleImportExcel">--> @@ -66,7 +66,7 @@ <!--</a-upload>--> <a-dropdown v-if="selectedRowKeys.length > 0"> <a-menu slot="overlay"> - <a-menu-item key="1" @click="batchDel"> + <a-menu-item key="1" @click="batchDel" v-if="isShowAuth('eam:reportRepair:abolish')"> <a-icon type="delete"/> 浣滃簾 </a-menu-item> @@ -103,15 +103,15 @@ </template> <span slot="action" slot-scope="text, record" v-if="record.reportStatus=='WAIT_REPAIR'"> - <a @click="handleEdit(record)">缂栬緫</a> + <a @click="handleEdit(record)" v-if="isShowAuth('eam:reportRepair:edit')">缂栬緫</a> - <a-divider type="vertical"/> + <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:edit')"/> - <a @click="handleAssign(record)">鎸囨淳</a> + <a @click="handleAssign(record)" v-if="isShowAuth('eam:reportRepair:assign')">鎸囨淳</a> - <a-divider type="vertical"/> + <a-divider type="vertical" v-if="isShowAuth('eam:reportRepair:assign')"/> - <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)"> + <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleDelete(record.id)" v-if="isShowAuth('eam:reportRepair:abolish')"> <a>浣滃簾</a> </a-popconfirm> </span> @@ -178,7 +178,13 @@ { title: '璁惧缂栧彿', align: 'center', - dataIndex: 'equipmentId_dictText', + dataIndex: 'equipmentCode', + width: 200 + }, + { + title: '璁惧鍚嶇О', + align: 'center', + dataIndex: 'equipmentName', width: 200 }, { -- Gitblit v1.9.3