From 547aab154e85a9a89f1e320f92bd43854d10faeb Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期四, 14 十二月 2023 14:12:45 +0800 Subject: [PATCH] 1、调整车间看板页面详情弹窗描述列表内容字段 2、报警分析页面在原有表格中为每个报警号增加子表格,内容为出现此报警号的设备ID以及报警时间等 3、报警分析页面表格请求数据设置加载中动画 4、调整设备参数阈值管理页面添加或编辑阈值上下限输入框为数字输入框,避免上下限数字比较大小时出现问题 --- 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