From ed015489a1dfcfcc12a5e588a76ff5f273ba0da2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 04 六月 2025 14:18:19 +0800
Subject: [PATCH] 台账导入修改
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 2
src/views/eam/EquipmentListOfAll.vue | 174 ++++++++++++++++++++++++++++++++++-----------------------
2 files changed, 104 insertions(+), 72 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index de4d6d5..08b8985 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -13,10 +13,12 @@
:gutter="24"
style="margin-bottom: 1%;"
>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="缁熶竴缂栫爜缇�"
:labelCol="labelCol"
@@ -29,10 +31,12 @@
></a-textarea>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
@@ -45,10 +49,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -60,10 +66,12 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -75,10 +83,12 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -91,10 +101,12 @@
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="宸ュ尯"
:labelCol="labelCol"
@@ -124,10 +136,12 @@
/>
</a-form-item>
</a-col> -->
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="缁存姢閮ㄩ棬"
:labelCol="labelCol"
@@ -148,10 +162,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
@@ -172,10 +188,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="鏄惁鐢熶骇绾胯澶�"
:labelCol="labelCol"
@@ -190,10 +208,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="ABC鏍囪瘑"
:labelCol="labelCol"
@@ -208,10 +228,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="鎶�鏈姸鎬�"
:labelCol="labelCol"
@@ -226,10 +248,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="璁惧鐘舵��"
:labelCol="labelCol"
@@ -244,10 +268,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="鍏抽敭璁惧鏍囪瘑"
:labelCol="labelCol"
@@ -262,10 +288,12 @@
/>
</a-form-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-model-item
label="璐ㄤ繚寮�濮嬫棩鏈�"
:labelCol="labelCol"
@@ -279,10 +307,12 @@
></j-date>
</a-form-model-item>
</a-col>
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-model-item
label="璐ㄤ繚缁撴潫鏃ユ湡"
:labelCol="labelCol"
@@ -297,10 +327,12 @@
</a-form-model-item>
</a-col>
<!-- 鎸夌淮淇彮缁勬绱� -->
- <a-col :xl='6'
- :lg='7'
- :md='8'
- :sm='24'>
+ <a-col
+ :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'
+ >
<a-form-item
label="缁翠慨鐝粍"
:labelCol="labelCol"
@@ -959,7 +991,7 @@
{
title: '鍐峰嵈绯荤粺',
align: "center",
- dataIndex: 'coolingSystem',
+ dataIndex: 'coolingSystem_dictText',
},
{
title: '鐏伀鍣�',
@@ -974,7 +1006,7 @@
{
title: '鎿嶄綔绯荤粺',
align: "center",
- dataIndex: 'operatingSystem',
+ dataIndex: 'operatingSystem_dictText',
},
{
title: '绯荤粺',
@@ -1010,7 +1042,7 @@
{
title: '閲嶉噺璁￠噺鍗曚綅',
align: "center",
- dataIndex: 'equipmentUda4_dictText',
+ dataIndex: 'equipmentUda4',
},
{
title: '鍔熻兘浣嶇疆',
@@ -1020,7 +1052,7 @@
{
title: '瀹夎浣嶇疆',
align: "center",
- dataIndex: 'equipmentUda2',
+ dataIndex: 'location',
},
{
title: '鍑哄巶鏃ユ湡',
@@ -1045,7 +1077,7 @@
{
title: '鍑哄巶缂栧彿',
align: "center",
- dataIndex: 'factoryNo',
+ dataIndex: 'factoryNumber',
},
{
title: '璧勪骇鍒堕�犲晢',
@@ -1138,7 +1170,7 @@
dataIndex: 'lineId_dictText',
},
{
- title: '涓昏澶�?',
+ title: '涓昏澶�',
align: "center",
dataIndex: 'isMeta_dictText',
},
@@ -1297,7 +1329,7 @@
this.ipagination.current = 1;
}
this.onClearSelected()
- if(this.caytegoryParam !== 'all') {
+ if (this.caytegoryParam !== 'all') {
this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
}
let params = this.getQueryParams();//鏌ヨ鏉′欢
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 76a4858..0227cb4 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -143,7 +143,7 @@
</a-form-model-item>
</a-col>
</a-row>
-<!-- <a-row>
+ <!-- <a-row>
<a-col :span='6'>
<a-form-model-item
label='鏄惁鐢熶骇绾�'
--
Gitblit v1.9.3