From e8af9e2a6d0b509a807a6bb22a6efbfb3678be6d Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 17:27:38 +0800
Subject: [PATCH] 设备维修修改
---
src/views/eam/EquipmentListOfAll.vue | 210 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 136 insertions(+), 74 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 490cde8..68edb9d 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,26 +31,30 @@
></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"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
- dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
+ :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
</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"
@@ -764,6 +796,18 @@
>
<daily3-maintenance-order-list-component :mainId="selectedMainId"></daily3-maintenance-order-list-component>
</a-tab-pane>
+ <a-tab-pane
+ tab="缁翠慨宸ュ崟"
+ key="13"
+ >
+ <repair-order-list-component :mainId="selectedMainId"></repair-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="鎶�鏈姸鎬侀壌瀹�"
+ key="14"
+ >
+ <equipment-calibration-order-component :mainId="selectedMainId"></equipment-calibration-order-component>
+ </a-tab-pane>
</a-tabs>
<equipment-modal
ref="modalForm"
@@ -823,6 +867,8 @@
import DailyInspectionOrderListComponent from './modules/equipmentNew/DailyInspectionOrderListComponent.vue'
import DailyMaintenanceOrderListComponent from './modules/equipmentNew/DailyMaintenanceOrderListComponent.vue'
import Daily3MaintenanceOrderListComponent from './modules/equipmentNew/Daily3MaintenanceOrderListComponent.vue'
+import RepairOrderListComponent from './modules/equipmentNew/RepairOrderListComponent.vue'
+import EquipmentCalibrationOrderComponent from './modules/equipmentNew/EquipmentCalibrationOrderComponent.vue'
export default {
name: "EquipmentList",
@@ -852,11 +898,19 @@
DailyInspectionOrderListComponent,
DailyMaintenanceOrderListComponent,
Daily3MaintenanceOrderListComponent,
+ RepairOrderListComponent,
+ EquipmentCalibrationOrderComponent,
+ },
+ props: {
+ caytegoryParam: {
+ type: String,
+ default: 'all',
+ required: true,
+ },
},
data() {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
- caytegoryParam: 'all',
// 琛ㄥご
columns: [
{
@@ -937,7 +991,7 @@
{
title: '鍐峰嵈绯荤粺',
align: "center",
- dataIndex: 'coolingSystem',
+ dataIndex: 'coolingSystem_dictText',
},
{
title: '鐏伀鍣�',
@@ -952,7 +1006,7 @@
{
title: '鎿嶄綔绯荤粺',
align: "center",
- dataIndex: 'operatingSystem',
+ dataIndex: 'operatingSystem_dictText',
},
{
title: '绯荤粺',
@@ -988,7 +1042,7 @@
{
title: '閲嶉噺璁￠噺鍗曚綅',
align: "center",
- dataIndex: 'equipmentUda4_dictText',
+ dataIndex: 'equipmentUda4',
},
{
title: '鍔熻兘浣嶇疆',
@@ -998,7 +1052,7 @@
{
title: '瀹夎浣嶇疆',
align: "center",
- dataIndex: 'equipmentUda2',
+ dataIndex: 'location',
},
{
title: '鍑哄巶鏃ユ湡',
@@ -1023,7 +1077,7 @@
{
title: '鍑哄巶缂栧彿',
align: "center",
- dataIndex: 'factoryNo',
+ dataIndex: 'factoryNumber',
},
{
title: '璧勪骇鍒堕�犲晢',
@@ -1116,7 +1170,7 @@
dataIndex: 'lineId_dictText',
},
{
- title: '涓昏澶�?',
+ title: '涓昏澶�',
align: "center",
dataIndex: 'isMeta_dictText',
},
@@ -1181,7 +1235,7 @@
delete: "/eam/equipment/delete",
deleteBatch: "/eam/equipment/deleteBatch",
active: "/eam/equipment/active",
- exportXlsUrl: '/eam/equipment/exportXls',
+ exportXlsUrl: '/eam/equipment/exportXlsNew',
importExcelUrl: "/eam/equipment/importExcel",
loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
uploadList: '/sys/upload/list',
@@ -1275,7 +1329,10 @@
this.ipagination.current = 1;
}
this.onClearSelected()
- var params = this.getQueryParams();//鏌ヨ鏉′欢
+ if (this.caytegoryParam !== 'all') {
+ this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+ }
+ let params = this.getQueryParams();//鏌ヨ鏉′欢
this.loading = true;
getAction(this.url.list, params).then((res) => {
if (res.success) {
@@ -1418,6 +1475,11 @@
}
})
}
+ else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+ }
+ } else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
}
})
},
--
Gitblit v1.9.3