From a284da4c7af8db0004b9779753f7d1effaf6254e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 09 九月 2025 18:00:48 +0800
Subject: [PATCH] 设备调拨功能调整
---
src/views/eam/dispose/EamEquipmentTransferList.vue | 110 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 89 insertions(+), 21 deletions(-)
diff --git a/src/views/eam/dispose/EamEquipmentTransferList.vue b/src/views/eam/dispose/EamEquipmentTransferList.vue
index c49a02a..59deab4 100644
--- a/src/views/eam/dispose/EamEquipmentTransferList.vue
+++ b/src/views/eam/dispose/EamEquipmentTransferList.vue
@@ -6,31 +6,36 @@
<a-form layout='inline' @keyup.enter.native='searchQuery'>
<a-row :gutter='24'>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label='璁惧缂栧彿'>
<lx-search-equipment-select v-model='queryParam.equipmentId'
placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'></lx-search-equipment-select>
</a-form-item>
</a-col>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<a-form-item label='鍗曟嵁鍙�'>
<a-input v-model='queryParam.code' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
</a-form-item>
</a-col>
- <template v-if='toggleSearchStatus'>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
- <a-form-item label='璋冨嚭閮ㄩ棬'>
- <a-input v-model='queryParam.oldDepartId' placeholder='璇疯緭鍏ヨ皟鍑洪儴闂�'></a-input>
- </a-form-item>
- </a-col>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
- <a-form-item label='璋冨叆閮ㄩ棬'>
- <a-input v-model='queryParam.newDepartId' placeholder='璇疯緭鍏ヨ皟鍏ラ儴闂�'></a-input>
- </a-form-item>
- </a-col>
- </template>
- <a-col :lg='7' :md='8' :sm='24' :xl='6'>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鍙樺姩鐘舵��">
+ <j-dict-select-tag placeholder="璇烽�夋嫨鍙樺姩鐘舵��" dictCode="equipment_transfer_status" v-model="queryParam.transferStatus"
+ allow-clear/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label='璋冨嚭閮ㄩ棬'>
+ <a-input v-model='queryParam.oldDepartId' placeholder='璇疯緭鍏ヨ皟鍑洪儴闂�'></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-form-item label='璋冨叆閮ㄩ棬'>
+ <a-input v-model='queryParam.newDepartId' placeholder='璇疯緭鍏ヨ皟鍏ラ儴闂�'></a-input>
+ </a-form-item>
+ </a-col>
+
+ <a-col :xl="4" :lg="7" :md="8" :sm="24">
<span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'>
<a-button icon='search' type='primary' @click='searchQuery'>鏌ヨ</a-button>
<a-button icon='reload' style='margin-left: 8px' type='primary' @click='searchReset'>閲嶇疆</a-button>
@@ -153,18 +158,21 @@
title: '鍗曟嵁鍙�',
align: 'center',
fixed: 'left',
+ width: 100,
dataIndex: 'code'
},
{
title: '璁惧缂栧彿',
align: 'center',
fixed: 'left',
+ width: 100,
dataIndex: 'equipmentCode'
},
{
title: '璁惧鍚嶇О',
align: 'center',
fixed: 'left',
+ width: 100,
dataIndex: 'equipmentName'
},
{
@@ -198,19 +206,79 @@
dataIndex: 'transferTime'
},
{
- title: '瀹℃牳浜�',
+ title: '浣跨敤鍗曚綅棰嗗',
align: 'center',
- dataIndex: 'approvalUser_dictText'
+ dataIndex: 'useLeader_dictText'
},
{
- title: '瀹℃牳鎰忚',
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳绫诲瀷',
align: 'center',
- dataIndex: 'approvalComment'
+ dataIndex: 'useLeaderApprovalDealType_dictText'
},
{
- title: '瀹℃牳鏃堕棿',
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳鎰忚',
align: 'center',
- dataIndex: 'approvalTime'
+ dataIndex: 'useLeaderApprovalComment'
+ },
+ {
+ title: '浣跨敤鍗曚綅棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'useLeaderApprovalTime'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗',
+ align: 'center',
+ dataIndex: 'transferLeader_dictText'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳绫诲瀷',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalDealType_dictText'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalComment'
+ },
+ {
+ title: '璋冨叆鍗曚綅棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'transferLeaderApprovalTime'
+ },
+ {
+ title: '鏈哄姩鍔炵‘璁や汉',
+ align: 'center',
+ dataIndex: 'externalConfirm_dictText'
+ },
+ {
+ title: '鏈哄姩鍔炵‘璁ゆ椂闂�',
+ align: 'center',
+ dataIndex: 'externalConfirmTime'
+ },
+ {
+ title: '鏄惁闇�瑕佸叕鍙搁瀵煎鎵�',
+ align: 'center',
+ dataIndex: 'companyLeaderCheck_dictText'
+ },
+ {
+ title: '鍏徃棰嗗',
+ align: 'center',
+ dataIndex: 'companyLeader_dictText'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳绫诲瀷',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalDealType_dictText'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalComment'
+ },
+ {
+ title: '鍏徃棰嗗瀹℃牳鏃堕棿',
+ align: 'center',
+ dataIndex: 'companyLeaderApprovalTime'
},
{
title: '澶囨敞',
--
Gitblit v1.9.3