From e081f232138b318338ffca07e7c9fcd941ac20b4 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期五, 12 四月 2024 09:54:17 +0800 Subject: [PATCH] 1、设备综合效率分析以及设备加工工件报表页面表格高度设置为页面进入时即可拖动水平滚动条的高度 2、首页 (1)OEE标题增加月份展示,利用率等效率标题增加日期展示 (2)公司及车间级看板单击OEE车间图表跳转至设备综合效率分析页面并根据唯一编号筛选页面对应数据 (3)工段级看板单击设备效率统计仪表盘图标跳转至统计分析页面并根据唯一编号筛选页面对应数据 (4)调整折线图数据展示维度,通过当前工段下各个设备前7天的利用率、开动率和开机率轮播展示 --- src/views/spare/SparePartScrapRequirementList.vue | 65 ++++++++++++++------------------ 1 files changed, 29 insertions(+), 36 deletions(-) diff --git a/src/views/spare/SparePartScrapRequirementList.vue b/src/views/spare/SparePartScrapRequirementList.vue index ae4a42e..e526f82 100644 --- a/src/views/spare/SparePartScrapRequirementList.vue +++ b/src/views/spare/SparePartScrapRequirementList.vue @@ -32,27 +32,14 @@ <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <div class='table-operator'> - <a-button @click='handleAdd' type='primary' icon='plus'>鏂板</a-button> - - - <a-popconfirm - :title='`纭畾瑕佹彁浜ゅ悧?`' - @confirm='handleSubmit'> - <a-button type='primary' icon='check' - v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus ==='0' || selectionRows[0].auditStatus==='3')"> - 鎻愪氦 - </a-button> - </a-popconfirm> - - - <a-popconfirm - :title='`纭畾瑕佹挙鍥炲悧?`' - @confirm='handleRevocation'> - <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='1'" - type='primary' icon='rollback'>鎾ゅ洖 - </a-button> - </a-popconfirm> - + <a-button @click='handleAdd' type='primary' icon='plus' v-has="'sparePartScrapRequirement:add'">鏂板</a-button> + <a-button @click='handleSubmit' type='primary' icon='check' + v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus ==='0' || selectionRows[0].auditStatus==='3')" v-has="'sparePartScrapRequirement:submitAndCancel'"> + 鎻愪氦 + </a-button> + <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='1'" + @click='handleRevocation' type='primary' icon='rollback'>鎾ゅ洖 + </a-button> </div> <!-- table鍖哄煙-begin --> <div> @@ -85,22 +72,28 @@ slot='action' slot-scope='text, record' > - <a v-if="record.auditStatus === '0'" @click='handleEdit(record)'>缂栬緫</a> + <a v-if="record.auditStatus === '0' || record.auditStatus === '3'" @click='handleEdit(record)' v-has="'sparePartScrapRequirement:edit'">缂栬緫</a> <a v-if="record.auditStatus === '1'" @click='handleApprove(record)'>瀹℃壒</a> - - <a-divider v-if="record.auditStatus === '0'" type='vertical' /> - <a-dropdown v-if="record.auditStatus === '0'"> - <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a> - <a-menu slot='overlay'> - <a-menu-item> - <a-popconfirm title='纭畾鍒犻櫎鍚�?' - @confirm='() => handleDelete(record.id)'> - <a>鍒犻櫎</a> - </a-popconfirm> - </a-menu-item> - - </a-menu> - </a-dropdown> + <a-divider + v-if="record.auditStatus == '0' || record.auditStatus == '3' || record.auditStatus == '1'" + type='vertical' + /> + <a-dropdown> + <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a> + <a-menu slot='overlay'> + <a-menu-item> + <a @click='handleDetail(record)'>璇︽儏</a> + </a-menu-item> + <a-menu-item v-if="record.auditStatus == '0'||record.auditStatus == '3'" v-has="'sparePartScrapRequirement:delete'"> + <a-popconfirm + title='纭畾鍒犻櫎鍚�?' + @confirm='() => handleDelete(record.id)' + > + <a>鍒犻櫎</a> + </a-popconfirm> + </a-menu-item> + </a-menu> + </a-dropdown> </span> -- Gitblit v1.9.3