From ebdee541df438f35ae291bf136c91afc2c1fffae Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 10 九月 2025 20:45:58 +0800
Subject: [PATCH] 设备归还功能调整
---
src/views/eam/dispose/EamEquipmentLeanOutList.vue | 94 ++++++++++++++++++++++-------------------------
1 files changed, 44 insertions(+), 50 deletions(-)
diff --git a/src/views/eam/dispose/EamEquipmentLeanOutList.vue b/src/views/eam/dispose/EamEquipmentLeanOutList.vue
index c338f64..fd28150 100644
--- a/src/views/eam/dispose/EamEquipmentLeanOutList.vue
+++ b/src/views/eam/dispose/EamEquipmentLeanOutList.vue
@@ -8,25 +8,15 @@
@keyup.enter.native="searchQuery"
>
<a-row :gutter="24">
- <a-col
- :xl="4"
- :lg="7"
- :md="8"
- :sm="24"
- >
- <a-form-item label="璁惧缂栧彿1">
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="璁惧缂栧彿">
<lx-search-equipment-select
placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
v-model="queryParam.equipmentId"
></lx-search-equipment-select>
</a-form-item>
</a-col>
- <a-col
- :xl="4"
- :lg="7"
- :md="8"
- :sm="24"
- >
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label="鍗曟嵁鍙�">
<a-input
placeholder="璇疯緭鍏ュ崟鎹彿"
@@ -34,12 +24,13 @@
></a-input>
</a-form-item>
</a-col>
- <a-col
- :xl="6"
- :lg="7"
- :md="8"
- :sm="24"
- >
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍊熺敤鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鍊熺敤鐘舵��" dictCode="equipment_lean_out_status" v-model="queryParam.leanStatus"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<span
style="float: left;overflow: hidden;"
class="table-page-search-submitButtons"
@@ -145,7 +136,14 @@
</a-menu>
</a-dropdown>
</template>
- <template v-else>
+ <template v-if="record.leanStatus === 'WAIT_RETURN'">
+ <a-popconfirm title='纭畾褰掕繕鍚�?' @confirm='() => equipmentReturn(record.id)'>
+ <a>褰掕繕</a>
+ </a-popconfirm>
+ <a-divider type='vertical' />
+ <a @click='handleDetail(record)'>璇︽儏</a>
+ </template>
+ <template v-if="record.leanStatus !== 'WAIT_RETURN' && record.leanStatus !== 'WAIT_SUBMIT'">
<a
href="javascript:;"
@click="handleDetail(record)"
@@ -243,36 +241,6 @@
dataIndex: 'leanEndTime'
},
{
- title: '瀹℃牳浜�',
- align: 'center',
- dataIndex: 'approvalUser_dictText'
- },
- {
- title: '瀹℃牳鎰忚',
- align: 'center',
- dataIndex: 'approvalComment'
- },
- {
- title: '瀹℃牳鏃堕棿',
- align: 'center',
- dataIndex: 'approvalTime'
- },
- {
- title: '褰掕繕纭浜�',
- align: 'center',
- dataIndex: 'confirmUser_dictText'
- },
- {
- title: '纭鎰忚',
- align: 'center',
- dataIndex: 'confirmComment'
- },
- {
- title: '纭鏃堕棿',
- align: 'center',
- dataIndex: 'confirmTime'
- },
- {
title: '澶囨敞',
align: 'center',
dataIndex: 'remark'
@@ -291,11 +259,37 @@
delete: '/eam/eamEquipmentLeanOut/delete',
deleteBatch: '/eam/eamEquipmentLeanOut/deleteBatch',
submit: '/eam/eamEquipmentLeanOut/submit',
+ equipmentReturn: '/eam/eamEquipmentLeanOut/equipmentReturn',
}
}
},
computed: {},
methods: {
+ equipmentReturn(id) {
+ if (!this.url.equipmentReturn) {
+ this.$message.error('璇疯缃畊rl.submit灞炴��!')
+ return
+ }
+ let that = this
+ getAction(that.url.equipmentReturn, { id: id }).then((res) => {
+ if (res.success) {
+ //閲嶆柊璁＄畻鍒嗛〉闂
+ that.reCalculatePage(1)
+ // that.$message.success(res.message);
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ // that.$message.warning(res.message);
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
handleSubmit(id) {
if (!this.url.submit) {
this.$message.error('璇疯缃畊rl.submit灞炴��!')
--
Gitblit v1.9.3