From b9aa93af26450229b9a67ee78fc012107301e7a3 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期五, 29 八月 2025 15:46:57 +0800
Subject: [PATCH] 设备台账模块修改
---
src/views/eam/equipment/EamEquipmentList.vue | 165 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 132 insertions(+), 33 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index ec10e87..9524814 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -96,7 +96,83 @@
</a-tree-select>
</a-form-item>
</a-col>
-
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鏈哄簥鍘傚">
+ <a-input
+ placeholder="璇疯緭鍏ユ満搴婂巶瀹�"
+ v-model="queryParam.manufacturingEnterprise"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鍘熷��(鍏�)">
+ <a-input
+ placeholder="璇疯緭鍏ュ師鍊�(鍏�)"
+ v-model="queryParam.originalValue"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鎬ц兘鎸囨爣">
+ <a-input
+ placeholder="璇疯緭鍏ユ�ц兘鎸囨爣"
+ v-model="queryParam.performanceIndicators"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鍑哄巶鏃ユ湡">
+ <a-range-picker v-model="leaveFactoryDate" value-format="YYYY-MM-DD HH:mm:ss"
+ @change="leaveFactoryRangeChange"
+ style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="鎶曠敤鏃ユ湡">
+ <a-range-picker v-model="acceptanceCheckDate" value-format="YYYY-MM-DD"
+ @change="acceptanceCheckRangeChange"
+ style="width: 100%"/>
+ </a-form-item>
+ </a-col>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="璁惧鐢ㄩ��">
+ <j-dict-select-tag
+ dict-code="equipment_use"
+ placeholder="璇烽�夋嫨璁惧鐢ㄩ��"
+ v-model="queryParam.equipmentUse"
+ ></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
</template>
<a-col
:xl="6"
@@ -451,16 +527,33 @@
fixed: 'left'
},
{
- title: '绠＄悊鍒嗙被',
+ title: '璁惧鍨嬪彿',
align: 'center',
- width: 120,
- dataIndex: 'equipmentImportance_dictText',
+ width: 200,
+ dataIndex: 'equipmentModel'
},
{
- title: '鎶�鏈姸鎬�',
+ title: '鍑哄巶鏃ユ湡',
align: 'center',
width: 100,
- dataIndex: 'technologyStatus_dictText'
+ dataIndex: 'leaveFactoryDate'
+ },
+ {
+ title: '鎶曠敤鏃ユ湡',
+ align: 'center',
+ width: 100,
+ dataIndex: 'acceptanceCheckDate'
+ },
+ {
+ title: '鍘熷��(鍏�)',
+ align: 'center',
+ dataIndex: 'originalValue'
+ },
+ {
+ title: '浣跨敤杞﹂棿',
+ align: 'center',
+ width: 100,
+ dataIndex: 'orgId_dictText'
},
{
title: '璧勪骇浣跨敤鐘舵��',
@@ -481,13 +574,31 @@
dataIndex: 'maintenanceStatus_dictText'
},
{
- title: '浣跨敤杞﹂棿',
+ title: '璁惧鐢ㄩ��',
align: 'center',
width: 100,
- dataIndex: 'orgId_dictText'
+ dataIndex: 'equipmentUse_dictText'
},
{
- title: '璁惧绠＄悊鍛�',
+ title: '鎿嶄綔宸�',
+ align: 'center',
+ width: 100,
+ dataIndex: 'operator'
+ },
+ {
+ title: '绠＄悊鍒嗙被',
+ align: 'center',
+ width: 120,
+ dataIndex: 'equipmentImportance_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: 'center',
+ width: 100,
+ dataIndex: 'technologyStatus_dictText'
+ },
+ {
+ title: '璁惧璐ｄ换浜�',
align: 'center',
width: 100,
dataIndex: 'equipmentManager_dictText'
@@ -501,12 +612,6 @@
title: '璁惧绉嶇被',
align: 'center',
dataIndex: 'equipmentType_dictText'
- },
- {
- title: '璁惧鍨嬪彿',
- align: 'center',
- width: 200,
- dataIndex: 'equipmentModel'
},
{
title: '璁惧瑙勬牸',
@@ -562,18 +667,6 @@
dataIndex: 'supplier'
},
{
- title: '鍑哄巶鏃ユ湡',
- align: 'center',
- width: 100,
- dataIndex: 'leaveFactoryDate'
- },
- {
- title: '鎶曠敤鏃ユ湡',
- align: 'center',
- width: 100,
- dataIndex: 'acceptanceCheckDate'
- },
- {
title: '鏈夋棤宸ヨ壓鍙傛暟',
align: 'center',
width: 120,
@@ -591,11 +684,6 @@
title: '澶栧舰灏哄',
align: 'center',
dataIndex: 'overallDimensions'
- },
- {
- title: '鍘熷��(鍏�)',
- align: 'center',
- dataIndex: 'originalValue'
},
{
title: '璧勯噾鏉ユ簮',
@@ -671,6 +759,8 @@
isOpenProcess: false,
isOpenPrecision: false,
treeDataAlias: [],
+ leaveFactoryDate: [],
+ acceptanceCheckDate: [],
}
},
computed: {
@@ -683,6 +773,14 @@
this.loadAppHomeUrlConfigValue()
},
methods: {
+ leaveFactoryRangeChange(valueArray) {
+ this.queryParam.leaveFactoryStartTime = valueArray[0]
+ this.queryParam.leaveFactoryEndTime = valueArray[1]
+ },
+ acceptanceCheckRangeChange(valueArray) {
+ this.queryParam.acceptanceCheckStartTime = valueArray[0]
+ this.queryParam.acceptanceCheckEndTime = valueArray[1]
+ },
loadAllProductionTree() {
//鍔犺浇杞﹂棿閫夋嫨鏍�
getAction(this.url.loadProductionOptions).then(res => {
@@ -831,8 +929,9 @@
}
return newObj;
},
-
searchReset() {
+ this.leaveFactoryDate = []
+ this.acceptanceCheckDate = []
this.queryParam = {}
this.onClearSelected()
this.loadTabPaneTableData('-1')
--
Gitblit v1.9.3