From bc26fc90143306e858e8547cbe45da17eedd5931 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 05 三月 2025 09:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/spare/SparePartReceiveList.vue | 72 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/src/views/spare/SparePartReceiveList.vue b/src/views/spare/SparePartReceiveList.vue
index 5af30da..efbc3ee 100644
--- a/src/views/spare/SparePartReceiveList.vue
+++ b/src/views/spare/SparePartReceiveList.vue
@@ -31,25 +31,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].status ==='0' || selectionRows[0].status==='3')">
- 鎻愪氦
- </a-button>
- </a-popconfirm>
-
- <a-popconfirm
- :title='`纭畾瑕佹挙鍥炲悧?`'
- @confirm='handleRevocation'>
- <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].status==='1'"
- type='primary' icon='rollback'>鎾ゅ洖
- </a-button>
- </a-popconfirm>
-
+ <a-button @click='handleAdd' type='primary' icon='plus' v-has="'sparePartReceive:add'">鏂板</a-button>
+ <a-button @click='handleSubmit' type='primary' icon='check' v-has="'sparePartReceive:submitAndCancel'"
+ v-if="selectedRowKeys.length > 0 && (selectionRows[0].status ==='0' || selectionRows[0].status==='3')">
+ 鎻愪氦
+ </a-button>
+ <a-button v-if="selectedRowKeys.length > 0 && selectionRows[0].status==='1'"
+ @click='handleRevocation' type='primary' icon='rollback'>鎾ゅ洖
+ </a-button>
</div>
<!-- table鍖哄煙-begin -->
@@ -96,16 +85,16 @@
</a-button>
</template>
- <span
+<!-- <span
slot='action'
slot-scope='text, record'
>
- <a v-if="record.status === '0'" @click='handleEdit(record)'>缂栬緫</a>
+ <a v-if="record.status === '0' || record.status === '3'" @click='handleEdit(record)'>缂栬緫</a>
<a v-if="record.status === '1'" @click='handleApprove(record)'>瀹℃壒</a>
- <a-divider v-if="record.status === '0'" type='vertical' />
- <a-dropdown v-if="record.status === '0'">
- <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>
+ <a-divider v-if="record.status === '0' || record.status === '3'" type='vertical' />
+ <a-dropdown v-if="record.status === '0' || record.status === '3'">
+ <a class='ant-dropdown-link'>鏇村 <a-icon type='down'/></a>
<a-menu slot='overlay'>
<a-menu-item>
<a-popconfirm title='纭畾鍒犻櫎鍚�?'
@@ -116,13 +105,44 @@
</a-menu>
</a-dropdown>
+ </span>-->
+ <span
+ slot='action'
+ slot-scope='text, record'
+ >
+ <a v-if="record.status === '0' || record.status === '3'" @click='handleEdit(record)' v-has="'sparePartReceive: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'"
+ 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.status == '0'||record.status == '3'" v-has="'sparePartReceive:delete'">
+ <a-popconfirm
+ title='纭畾鍒犻櫎鍚�?'
+ @confirm='() => handleDelete(record.id)'
+ >
+ <a>鍒犻櫎</a>
+ </a-popconfirm>
+ </a-menu-item>
+ </a-menu>
+ </a-dropdown>
</span>
-
</a-table>
</div>
<a-tabs defaultActiveKey='1'>
<a-tab-pane tab='棰嗙敤鐢宠鏄庣粏鍗�' key='1'>
- <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
+ <div
+ class='table-operator'
+ style='margin:-20px'>
+ <spare-part-receive-deatil-list :mainId='sparesScrapDetailMainId' />
+ </div>
+
</a-tab-pane>
</a-tabs>
<spare-part-receive-modal ref='modalForm' @ok='modalFormOk' />
--
Gitblit v1.9.3