From 8611a1ba1696e76cced04ff5d658ba138a05dafd Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期六, 19 八月 2023 14:37:32 +0800
Subject: [PATCH] 设备管理前端代码提交 截止 20230819 13：55 分
---
src/views/spare/SparePartScrapList.vue | 78 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/src/views/spare/SparePartScrapList.vue b/src/views/spare/SparePartScrapList.vue
index 50a7033..4caa00e 100644
--- a/src/views/spare/SparePartScrapList.vue
+++ b/src/views/spare/SparePartScrapList.vue
@@ -39,23 +39,14 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class='table-operator'>
<a-button @click='handleAdd' type='primary' icon='plus'>鏂板</a-button>
+ <a-button @click='handleSubmit' type='primary' icon='check'
+ v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')">
+ 鎻愪氦
+ </a-button>
+ <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='pendingApproval'"
+ @click='handleRevocation' type='primary' icon='rollback'>鎾ゅ洖
+ </a-button>
-
- <a-popconfirm
- :title='`纭畾瑕佹彁浜ゅ悧?`'
- @confirm='handleSubmit'>
- <a-button type='primary' icon='check'
- v-if="selectedRowKeys.length > 0 && (selectionRows[0].auditStatus==='notSubmitted' || selectionRows[0].auditStatus==='Rejected')">
- 鎻愪氦
- </a-button>
- </a-popconfirm>
-
-
- <a-popconfirm :title='`纭畾鎾ゅ洖鍚楋紵`' @confirm='handleRevocation'>
- <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].auditStatus==='pendingApproval'"
- type='primary' icon='rollback'>鎾ゅ洖
- </a-button>
- </a-popconfirm>
</div>
<!-- table鍖哄煙-begin -->
@@ -102,28 +93,53 @@
</a-button>
</template>
+ <!-- <span
+ slot='action'
+ slot-scope='text, record'
+ >
+ <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'" @click='handleEdit(record)'>缂栬緫</a>
+ <a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
+ <a-divider v-if="record.auditStatus === 'notSubmitted'|| record.auditStatus === 'Rejected'" type='vertical' />
+ <a-dropdown v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'">
+ <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>
+ </span>-->
+
<span
slot='action'
slot-scope='text, record'
>
- <a v-if="record.auditStatus === 'notSubmitted'" @click='handleEdit(record)'>缂栬緫</a>
+ <a v-if="record.auditStatus === 'notSubmitted' || record.auditStatus === 'Rejected'"
+ @click='handleEdit(record)'>缂栬緫</a>
<a v-if="record.auditStatus === 'pendingApproval'" @click='handleApprove(record)'>瀹℃壒</a>
- <a-divider v-if="record.auditStatus === 'notSubmitted'" type='vertical' />
- <a-dropdown v-if="record.auditStatus === 'notSubmitted'">
- <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
- <a-menu slot='overlay'>
- <a-menu-item>
+ <a-divider
+ v-if="record.auditStatus == 'notSubmitted' || record.auditStatus == 'Rejected' || record.auditStatus == 'pendingApproval'"
+ 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>
- <a-popconfirm title='纭畾鍒犻櫎鍚�?'
- @confirm='() => handleDelete(record.id)'>
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
-
- </a-menu>
- </a-dropdown>
+ <a-menu-item v-if="record.auditStatus == 'notSubmitted'||record.auditStatus == 'Rejected'">
+ <a-popconfirm
+ title='纭畾鍒犻櫎鍚�?'
+ @confirm='() => handleDelete(record.id)'
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
</span>
</a-table>
</div>
--
Gitblit v1.9.3