From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/equipment/EamEquipmentLedger.vue | 67 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 4564585..f1a896f 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -65,16 +65,20 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')">瀵煎嚭</a-button>
- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+ <a-button v-has="'eam:equipment:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button v-has="'eam:equipment:export'" type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')">瀵煎嚭
+ </a-button>
+ <a-upload v-has="'eam:equipment:import'" name="file" :showUploadList="false" :multiple="false"
+ :headers="tokenHeader" :action="importExcelUrl"
@change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload>
- <a-button type="primary" icon="download" @click="handleTemplateXlsDownload">瀵煎叆妯℃澘涓嬭浇</a-button>
+ <a-button v-has="'eam:equipment:download'" type="primary" icon="download" @click="handleTemplateXlsDownload">
+ 瀵煎叆妯℃澘涓嬭浇
+ </a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="2" @click="batchDel">
+ <a-menu-item v-has="'eam:equipment:batchdel'" key="2" @click="batchDel">
<a-icon type="delete"/>
鍒犻櫎
</a-menu-item>
@@ -102,7 +106,7 @@
<!--浣跨敤閮ㄩ棬-->
<template slot="factoryOrgCode" slot-scope="text,record">
- {{[record.gsfactoryOrgCode_dictText,record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
+ {{[record.zxfactoryOrgCode_dictText,record.gqfactoryOrgCode_dictText,record.factoryOrgCode_dictText].filter(item=>item).join('/')}}
</template>
<!--瀹夎浣嶇疆-->
@@ -115,8 +119,13 @@
<a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
- <!--鎿嶄綔绯荤粺-->
+ <!--鐏伀鍣�-->
<template slot="fireExtinguisher" slot-scope="text">
+ <a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
+ </template>
+
+ <!--鐪熺┖鐑鐞嗙倝-->
+ <template slot="trueHeatTreatment" slot-scope="text">
<a-switch checked-children="鏄�" un-checked-children="鍚�" :checked="Boolean(+text)" disabled/>
</template>
@@ -126,26 +135,21 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click.stop="handleEdit(record)">缂栬緫</a>
+ <a v-has="'eam:equipment:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical"/>
+ <a-divider v-has="'eam:equipment:edit'" type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a href="javascript:;" @click="handleOpenResumeDrawer(record)">灞ュ巻</a>
- </a-menu-item>
- <a-menu-item>
- <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
- <a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a v-has="'eam:equipment:resume'" href="javascript:;" @click="handleOpenResumeDrawer(record)">灞ュ巻</a>
+
+ <a-divider v-has="'eam:equipment:resume'" type="vertical"/>
+
+ <a-popconfirm v-has="'eam:equipment:del'" title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+
+ <a-divider v-has="'eam:equipment:del'" type="vertical"/>
+
+ <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
</span>
</a-table>
@@ -170,7 +174,7 @@
mixins: [JeecgListMixin],
components: {
ResumeDrawer,
- EamEquipmentModal,
+ EamEquipmentModal
},
data() {
return {
@@ -215,7 +219,6 @@
},
{
title: '浣跨敤閮ㄩ棬',
- align: 'center',
dataIndex: 'factoryOrgCode',
scopedSlots: { customRender: 'factoryOrgCode' }
},
@@ -282,6 +285,12 @@
dataIndex: 'system'
},
{
+ title: '鐪熺┖鐑鐞嗙倝',
+ align: 'center',
+ dataIndex: 'trueHeatTreatment',
+ scopedSlots: { customRender: 'trueHeatTreatment' }
+ },
+ {
title: '璁惧绔彛',
align: 'center',
dataIndex: 'equipmentPort'
@@ -341,7 +350,7 @@
title: '璧勪骇鍒堕�犲晢',
align: 'center',
dataIndex: 'manufacturingEnterprise',
- scopedSlots: { customRender: 'manufacturingEnterprise' },
+ scopedSlots: { customRender: 'manufacturingEnterprise' }
},
{
title: '璧勪骇鏉ユ簮鍥藉',
@@ -407,7 +416,7 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- width: 150,
+ width: 200,
scopedSlots: { customRender: 'action' },
fixed: 'right'
}
--
Gitblit v1.9.3