From aa951f729586880e66335b2c8086077f0b55b305 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 13 五月 2025 15:45:38 +0800
Subject: [PATCH] art: 设备管理-设备台账-新增、列表修改
---
src/views/eam/equipment/modules/EamEquipmentModal.vue | 150 +++++++++++++----------------
src/views/eam/equipment/EamEquipmentList.vue | 116 ++++++++++-------------
2 files changed, 119 insertions(+), 147 deletions(-)
diff --git a/src/views/eam/equipment/EamEquipmentList.vue b/src/views/eam/equipment/EamEquipmentList.vue
index 025459f..8c6b24c 100644
--- a/src/views/eam/equipment/EamEquipmentList.vue
+++ b/src/views/eam/equipment/EamEquipmentList.vue
@@ -121,20 +121,11 @@
@change="handleTableChange"
:customRow="customTableRow"
>
- <span slot="equipmentImportance" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
- </span>
- <span slot="mdcFlag" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
- </span>
<span slot="processParametersFlag" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
</span>
<span slot="precisionParametersFlag" slot-scope="text">
<lx-switch v-model="text" disabled checked-children="鏈�" un-checked-children="鏃�"/>
- </span>
- <span slot="specialEquipment" slot-scope="text">
- <lx-switch v-model="text" disabled checked-children="鏄�" un-checked-children="鍚�"/>
</span>
<span slot="action" slot-scope="text, record">
<a @click.stop="handleEdit(record)">缂栬緫</a>
@@ -263,23 +254,16 @@
fixed: 'left'
},
{
- title: '鍏抽敭璁惧鏍囪瘑',
+ title: '绠＄悊鍒嗙被',
align: 'center',
width: 120,
- dataIndex: 'equipmentImportance',
- scopedSlots: { customRender: 'equipmentImportance' }
+ dataIndex: 'equipmentImportance_dictText',
},
{
title: '璧勪骇鐘舵��',
align: 'center',
width: 100,
dataIndex: 'assetStatus_dictText'
- },
- {
- title: '鎶�鏈姸鎬�',
- align: 'center',
- width: 100,
- dataIndex: 'technologyStatus_dictText'
},
{
title: '缁翠慨鐘舵��',
@@ -294,12 +278,6 @@
dataIndex: 'maintenanceStatus_dictText'
},
{
- title: '鎿嶄綔绯荤粺',
- align: 'center',
- width: 100,
- dataIndex: 'operationSystem'
- },
- {
title: '浣跨敤杞﹂棿',
align: 'center',
width: 100,
@@ -312,9 +290,14 @@
dataIndex: 'equipmentManager_dictText'
},
{
- title: '璁惧鍒嗙被',
+ title: '璁惧绫诲埆',
align: 'center',
dataIndex: 'equipmentCategory_dictText'
+ },
+ {
+ title: '璁惧绉嶇被',
+ align: 'center',
+ dataIndex: 'equipmentType_dictText'
},
{
title: '璁惧鍨嬪彿',
@@ -329,27 +312,34 @@
dataIndex: 'equipmentSpecification'
},
{
- title: '涓昏酱杩炴帴灏哄',
+ title: '鍖哄彿',
align: 'center',
- width: 120,
- dataIndex: 'spindleConnectDimension'
+ width: 100,
+ dataIndex: 'areaCode'
},
{
- title: '鎬诲姛鐜�',
+ title: '鐢垫満鍙版暟',
+ align: 'center',
+ width: 100,
+ dataIndex: 'motorsNumber'
+ },
+ {
+ title: '鎬诲姛鐜�(KW)',
align: 'center',
width: 100,
dataIndex: 'equipmentPower'
+ },
+ {
+ title: '閲嶉噺(鍚�)',
+ align: 'center',
+ width: 100,
+ dataIndex: 'equipmentWeight'
},
{
title: '瀹夎浣嶇疆',
align: 'center',
width: 100,
dataIndex: 'installationPosition'
- },
- {
- title: '绔嬮」鍗″彿',
- align: 'center',
- dataIndex: 'cardNumber'
},
{
title: '鍑哄巶缂栧彿',
@@ -369,35 +359,22 @@
dataIndex: 'originCountry'
},
{
+ title: '璁惧渚涘簲鍟�',
+ align: 'center',
+ width: 100,
+ dataIndex: 'supplier'
+ },
+ {
title: '鍑哄巶鏃ユ湡',
align: 'center',
width: 100,
dataIndex: 'leaveFactoryDate'
},
{
- title: '楠屾敹鏃ユ湡',
+ title: '鎶曠敤鏃ユ湡',
align: 'center',
width: 100,
dataIndex: 'acceptanceCheckDate'
- },
- {
- title: '璐ㄤ繚寮�濮嬫棩鏈�',
- align: 'center',
- width: 120,
- dataIndex: 'warrantyStartDate'
- },
- {
- title: '璐ㄤ繚缁撴潫鏃ユ湡',
- align: 'center',
- width: 120,
- dataIndex: 'warrantyEndDate'
- },
- {
- title: '鏄惁瀹炴柦MDC',
- align: 'center',
- width: 120,
- dataIndex: 'mdcFlag',
- scopedSlots: { customRender: 'mdcFlag' }
},
{
title: '鏈夋棤宸ヨ壓鍙傛暟',
@@ -414,26 +391,35 @@
scopedSlots: { customRender: 'precisionParametersFlag' }
},
{
- title: '鏄惁涓虹壒绉嶈澶�',
+ title: '澶栧舰灏哄',
align: 'center',
- width: 120,
- dataIndex: 'specialEquipment',
- scopedSlots: { customRender: 'specialEquipment' }
+ dataIndex: 'overallDimensions'
},
{
- title: '閲嶉噺',
+ title: '鍘熷��(鍏�)',
align: 'center',
- dataIndex: 'equipmentWeight'
+ dataIndex: 'originalValue'
},
{
- title: '璁惧绔彛',
+ title: '璧勯噾鏉ユ簮',
align: 'center',
- dataIndex: 'equipmentPort'
+ dataIndex: 'fundingSource'
},
{
- title: '鍧愭爣鏁伴噺',
+ title: '鍔熻兘鐢ㄩ��',
align: 'center',
- dataIndex: 'coordinateNum'
+ dataIndex: 'functionUse'
+ },
+ {
+ title: '鎬ц兘鎸囨爣',
+ align: 'center',
+ dataIndex: 'performanceIndicators'
+ },
+ {
+ title: '鍏ュ笎鏃堕棿',
+ align: 'center',
+ width: 100,
+ dataIndex: 'bookingTime'
},
{
title: '鍒涘缓浜�',
@@ -478,7 +464,7 @@
exportXlsUrl: 'eam/equipment/exportXls',
importExcelUrl: 'eam/equipment/importExcel',
loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions',
- templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.0.xlsx'
+ templateXlsDownloadUrl: '瀵煎叆妯℃澘/璁惧鍙拌处瀵煎叆妯℃澘_v1.1.xlsx'
},
treeData: [],
printedRows: [],
diff --git a/src/views/eam/equipment/modules/EamEquipmentModal.vue b/src/views/eam/equipment/modules/EamEquipmentModal.vue
index 63a550d..d46c38b 100644
--- a/src/views/eam/equipment/modules/EamEquipmentModal.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -12,7 +12,7 @@
cancelText="鍏抽棴">
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 璁惧鍩虹淇℃伅
+ <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 鍩虹淇℃伅
</a-divider>
<a-row :gutter="24">
@@ -44,38 +44,34 @@
</a-col>
<a-col :span="8">
<a-form-model-item prop="equipmentCategory"
- label="璁惧鍒嗙被">
- <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧鍒嗙被"
+ label="璁惧绫诲埆">
+ <j-dict-select-tag dict-code="equipment_category" placeholder="璇烽�夋嫨璁惧绫诲埆"
v-model="model.equipmentCategory" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="operationSystem"
- label="鎿嶄綔绯荤粺">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ搷浣滅郴缁�'" v-model="model.operationSystem" :disabled="disableSubmit" />
+ <a-form-model-item prop="equipmentType"
+ label="璁惧绉嶇被">
+ <j-tree-dict placeholder="璇烽�夋嫨璁惧绉嶇被" v-model="model.equipmentType" parent-code="equipment_category" field="code" :async="false" :disabled="disableSubmit"></j-tree-dict>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="8">
<a-form-model-item prop="equipmentImportance"
- label="鍏抽敭璁惧鏍囪瘑">
- <lx-switch
- checked-children='鏄�'
- un-checked-children='鍚�'
- v-model="model.equipmentImportance"
- :disabled="disableSubmit"
- />
+ label="绠＄悊鍒嗙被">
+ <j-dict-select-tag dict-code="equipment_abc_flag" placeholder="璇烽�夋嫨绠＄悊鍒嗙被"
+ v-model="model.equipmentImportance" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="equipmentPower" label="鎬诲姛鐜�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ�诲姛鐜�'" v-model="model.equipmentPower" :disabled="disableSubmit"/>
+ <a-form-model-item prop="originalValue" label="鍘熷��(鍏�)">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ師鍊�'" v-model="model.originalValue" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="cardNumber" label="绔嬮」鍗″彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ョ珛椤瑰崱鍙�'" v-model="model.cardNumber" :disabled="disableSubmit"/>
+ <a-form-model-item prop="fundingSource" label="璧勯噾鏉ユ簮">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ祫閲戞潵婧�'" v-model="model.fundingSource" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -84,21 +80,44 @@
<j-image-upload text="璁惧鍥剧墖" bizPath="eam_equipment_image" v-model="model.equipmentImage"></j-image-upload>
</a-col>
</a-row>
-
<a-row :gutter="24">
<a-col :span="6">
- <a-form-model-item prop="equipmentWeight" label="閲嶉噺">
+ <a-form-model-item prop="motorsNumber"
+ label="鐢垫満鍙版暟">
+ <a-input-number :placeholder="disableSubmit?'':'璇疯緭鍏ョ數鏈哄彴鏁�'" v-model="model.motorsNumber" :disabled="disableSubmit" style="width: 100%" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="equipmentPower" label="鎬诲姛鐜�(KW)">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ�诲姛鐜�'" v-model="model.equipmentPower" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="equipmentWeight" label="閲嶉噺(鍚�)">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ラ噸閲�'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="equipmentPort" label="璁惧绔彛">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩鍙�'" v-model="model.equipmentPort" :disabled="disableSubmit"/>
+ <a-form-model-item prop="overallDimensions" label="澶栧舰灏哄">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ褰㈠昂瀵�'" v-model="model.overallDimensions" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="6">
+ <a-form-model-item prop="areaCode" label="鍖哄彿">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ尯鍙�'" v-model="model.areaCode" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="coordinateNum" label="鍧愭爣鏁伴噺">
- <a-input-number :placeholder="disableSubmit?'':'璇疯緭鍏ュ潗鏍囨暟閲�'" v-model="model.coordinateNum" style="width: 100%" :disabled="disableSubmit"/>
+ <a-form-model-item prop="functionUse" label="鍔熻兘鐢ㄩ��">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ姛鑳界敤閫�'" v-model="model.functionUse" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="performanceIndicators" label="鎬ц兘鎸囨爣">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ�ц兘鎸囨爣'" v-model="model.performanceIndicators" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -119,41 +138,41 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
+ <a-form-model-item prop="originCountry" label="鏉ユ簮鍥藉">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ潵婧愬浗瀹�'" v-model="model.originCountry" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="supplier" label="璁惧渚涘簲鍟�">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囦緵搴斿晢'" v-model="model.supplier" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="manufacturingEnterprise" label="鏈哄簥鍘傚">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ満搴婂巶瀹�'" v-model="model.manufacturingEnterprise" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item prop="leaveFactoryDate" label="鍑哄巶鏃ユ湡">
<a-date-picker placeholder="璇烽�夋嫨鍑哄巶鏃ユ湡" v-model="model.leaveFactoryDate" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="acceptanceCheckDate" label="楠屾敹鏃ユ湡">
- <a-date-picker placeholder="璇烽�夋嫨楠屾敹鏃ユ湡" v-model="model.acceptanceCheckDate" :disabled="disableSubmit"/>
+ <a-form-model-item prop="acceptanceCheckDate" label="鎶曠敤鏃ユ湡">
+ <a-date-picker placeholder="璇烽�夋嫨鎶曠敤鏃ユ湡" v-model="model.acceptanceCheckDate" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item prop="bookingTime" label="鍏ヨ处鏃堕棿">
+ <a-date-picker placeholder="璇烽�夋嫨鍏ヨ处鏃堕棿" v-model="model.bookingTime" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item prop="installationPosition" label="瀹夎浣嶇疆">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ畨瑁呬綅缃�'" v-model="model.installationPosition" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="6">
- <a-form-model-item prop="spindleConnectDimension" label="涓昏酱杩炴帴灏哄">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ富杞磋繛鎺ュ昂瀵�'" v-model="model.spindleConnectDimension" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="specialEquipment" label="鏄惁鐗圭璁惧">
- <lx-switch checked-children='鏄�' un-checked-children='鍚�' v-model="model.specialEquipment" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="manufacturingEnterprise" label="鍒堕�犲巶瀹�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ埗閫犲巶瀹�'" v-model="model.manufacturingEnterprise" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="originCountry" label="鏉ユ簮鍥藉">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ潵婧愬浗瀹�'" v-model="model.originCountry" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
</a-row>
@@ -182,35 +201,6 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item prop="technologyStatus" label="鎶�鏈姸鎬�">
- <j-dict-select-tag dict-code="technology_status" placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
- v-model="model.technologyStatus" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="mdcFlag" label="鏄惁瀹炴柦MDC">
- <lx-switch checked-children='鏄�' un-checked-children='鍚�' v-model="model.mdcFlag" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6" v-if="model.mdcFlag === '1'">
- <a-form-model-item prop="deviceType" label="MDC璁惧绫诲瀷">
- <j-search-select-tag placeholder="璇烽�夋嫨璁惧绫诲瀷" v-model="model.deviceType" dict="mdc_equipment_type,equipment_type_name, equipment_type_name, equipment_type_states='Y'" :disabled="disableSubmit" />
- </a-form-model-item>
- </a-col>
- </a-row>
-
- <a-row :gutter="24">
- <a-col :span="6">
- <a-form-model-item prop="warrantyStartDate" label="璐ㄤ繚寮�濮嬫棩鏈�">
- <a-date-picker :placeholder="disableSubmit?'':'璇烽�夋嫨寮�濮嬫棩鏈�'" v-model="model.warrantyStartDate" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
- <a-form-model-item prop="warrantyEndDate" label="璐ㄤ繚缁撴潫鏃ユ湡">
- <a-date-picker :placeholder="disableSubmit?'':'璇烽�夋嫨缁撴潫鏃ユ湡'" v-model="model.warrantyEndDate" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="6">
<a-form-model-item prop="processParametersFlag" label="鏈夋棤宸ヨ壓鍙傛暟">
<lx-switch checked-children='鏈�' un-checked-children='鏃�' v-model="model.processParametersFlag" :disabled="disableSubmit"/>
</a-form-model-item>
@@ -221,7 +211,6 @@
</a-form-model-item>
</a-col>
</a-row>
-
<a-row :gutter="24">
<a-col :span="24">
<a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
@@ -278,16 +267,13 @@
{ required: true, message: '璇疯緭鍏ヨ澶囧悕绉�' }
],
equipmentCategory: [
- { required: true, message: '璇烽�夋嫨璁惧鍒嗙被' }
+ { required: true, message: '璇烽�夋嫨璁惧绫诲埆' }
],
leaveFactoryDate: [
{ required: true, message: '璇烽�夋嫨鍑哄巶鏃ユ湡' }
],
acceptanceCheckDate: [
{ required: false, message: '璇烽�夋嫨楠屾敹鏃ユ湡' }
- ],
- technologyStatus: [
- { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬�' }
],
orgId: [
{ required: true, message: '璇烽�夋嫨浣跨敤杞﹂棿' }
--
Gitblit v1.9.3