From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期三, 29 十一月 2023 16:36:39 +0800 Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱 --- src/views/spare/SparePartOutboundList.vue | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/spare/SparePartOutboundList.vue b/src/views/spare/SparePartOutboundList.vue index dada322..cea17dc 100644 --- a/src/views/spare/SparePartOutboundList.vue +++ b/src/views/spare/SparePartOutboundList.vue @@ -65,10 +65,11 @@ <div class='table-operator'> <a-button @click='handleAdd' + v-has="'sparePartOutbound:add'" type='primary' icon='plus' >鏂板</a-button> - <a-button @click='handleSubmit' type='primary' icon='check' + <a-button @click='handleSubmit' type='primary' icon='check' v-has="'sparePartOutbound:submitAndCancel'" v-if="selectedRowKeys.length > 0 && (selectionRows[0].status ==='0' || selectionRows[0].status==='3')"> 鎻愪氦 </a-button> @@ -125,7 +126,7 @@ slot='action' slot-scope='text, record' > - <a v-if="record.status === '0' || record.status === '3'" @click='handleEdit(record)'>缂栬緫</a> + <a v-if="record.status === '0' || record.status === '3'" @click='handleEdit(record)' v-has="'sparePartOutbound:edit'">缂栬緫</a> <a v-if="record.status === '1'" @click='handleApprove(record)'>瀹℃壒</a> <a-divider v-if="record.status == '0' || record.status == '3' || record.status == '1'" @@ -137,7 +138,7 @@ <a-menu-item> <a @click='handleDetail(record)'>璇︽儏</a> </a-menu-item> - <a-menu-item v-if="record.status == '0'||record.status == '3'"> + <a-menu-item v-if="record.status == '0'||record.status == '3'" v-has="'sparePartOutbound:delete'"> <a-popconfirm title='纭畾鍒犻櫎鍚�?' @confirm='() => handleDelete(record.id)' -- Gitblit v1.9.3