From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentListOfAll.vue | 480 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 332 insertions(+), 148 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index c69168c..de4d6d5 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -18,7 +18,7 @@
:md='8'
:sm='24'>
<a-form-item
- label="缁熶竴缂栧彿缇�"
+ label="缁熶竴缂栫爜缇�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
@@ -39,7 +39,7 @@
: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"
/>
@@ -372,6 +372,13 @@
v-has="'equipmentAccount:add&delete&import&Edit'"
>璐ㄤ繚鏈熷彉鏇�</a-button>
<a-button
+ :disabled="selectedRowKeys.length==0"
+ @click="batchDel"
+ type="danger"
+ icon="delete"
+ v-has="'equipmentAccount:add&delete&import&Edit'"
+ >鎵归噺鍒犻櫎</a-button>
+ <a-button
@click="handleUpdateKeyEquipment"
type="primary"
icon="calendar"
@@ -558,6 +565,51 @@
:length="8"
/>
</span>
+ <span
+ slot="yseNoInspectionStandard"
+ slot-scope="text"
+ >
+ <a-icon
+ type="check"
+ style="color: chartreuse;"
+ v-if="text==='0'"
+ />
+ <a-icon
+ type="close"
+ v-else
+ style="color:red;"
+ />
+ </span>
+ <span
+ slot="yseNoMaintenance2Standard"
+ slot-scope="text"
+ >
+ <a-icon
+ type="check"
+ style="color: chartreuse;"
+ v-if="text==='0'"
+ />
+ <a-icon
+ type="close"
+ v-else
+ style="color:red;"
+ />
+ </span>
+ <span
+ slot="yseNoMaintenance3Standard"
+ slot-scope="text"
+ >
+ <a-icon
+ type="check"
+ style="color: chartreuse;"
+ v-if="text==='0'"
+ />
+ <a-icon
+ type="close"
+ v-else
+ style="color:red;"
+ />
+ </span>
<template
slot="num"
@@ -632,8 +684,15 @@
<a-tabs defaultActiveKey="1">
<a-tab-pane
- tab="宸ヨ壓鍙傛暟"
+ tab="璁惧鏂囨。"
key="1"
+ >
+ <EquipmentDocumentList :mainId="selectedMainId" />
+ </a-tab-pane>
+ <a-tab-pane
+ tab="宸ヨ壓鍙傛暟"
+ key="2"
+ v-if="isOpenProcess"
>
<EquipmentProcessParametersList
:mainId="selectedMainId"
@@ -642,8 +701,8 @@
</a-tab-pane>
<a-tab-pane
tab="璁惧绮惧害"
- key="2"
- forceRender
+ key="3"
+ v-if="isOpenPrecision"
>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
@@ -651,53 +710,71 @@
/>
</a-tab-pane>
<a-tab-pane
- tab="璁惧鏂囨。"
- key="3"
- forceRender
- >
- <EquipmentDocumentList :mainId="selectedMainId" />
- </a-tab-pane>
- <a-tab-pane
tab="澶囦欢"
key="4"
- forceRender
>
<EquipmentSpareParts :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
tab="ABC鏍囪瘑鍙樻洿璁板綍"
key="5"
- forceRender
>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
tab="璐ㄤ繚鏈熷彉鏇�"
key="6"
- forceRender
>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
<a-tab-pane
- tab="鏃ヤ繚鏍囧噯"
+ tab="鐐规鏍囧噯"
key="7"
- forceRender
>
<daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
</a-tab-pane>
+
<a-tab-pane
tab="浜屼繚鏍囧噯"
key="8"
- forceRender
>
<second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
</a-tab-pane>
<a-tab-pane
tab="涓変繚鏍囧噯"
key="9"
- forceRender
>
<third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="鐐规宸ュ崟"
+ key="10"
+ >
+ <daily-inspection-order-list-component :mainId="selectedMainId"></daily-inspection-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="浜屼繚宸ュ崟"
+ key="11"
+ >
+ <daily-maintenance-order-list-component :mainId="selectedMainId"></daily-maintenance-order-list-component>
+ </a-tab-pane>
+ <a-tab-pane
+ tab="涓変繚宸ュ崟"
+ key="12"
+ >
+ <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
@@ -734,7 +811,7 @@
import { mixinDevice } from '@/utils/mixin'
import JEllipsis from '@/components/jeecg/JEllipsis'
import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction, downFile } from '@/api/manage'
+import { getAction, downFile, deleteAction } from '@/api/manage'
import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
@@ -755,6 +832,11 @@
import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
import KeyEquipmentUpdateModel from './modules/equipmentNew/edit/KeyEquipmentUpdateModel.vue'
+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",
@@ -781,11 +863,22 @@
ThirdMaintenanceList,
KeyEquipmentUpdateModel,
JEllipsis,
+ DailyInspectionOrderListComponent,
+ DailyMaintenanceOrderListComponent,
+ Daily3MaintenanceOrderListComponent,
+ RepairOrderListComponent,
+ EquipmentCalibrationOrderComponent,
+ },
+ props: {
+ caytegoryParam: {
+ type: String,
+ default: 'all',
+ required: true,
+ },
},
data() {
return {
description: '璁惧鍙拌处绠＄悊椤甸潰',
- caytegoryParam: 'all',
// 琛ㄥご
columns: [
{
@@ -797,16 +890,61 @@
return parseInt(index) + 1
},
width: 50,
+ fixed: 'left',
},
{
- title: '璁惧绫诲瀷',
+ title: '缁熶竴缂栫爜',
+ align: "center",
+ dataIndex: 'num',
+ scopedSlots: { customRender: 'num' },
+ fixed: 'left',
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: "center",
+ dataIndex: 'name',
+ scopedSlots: { customRender: 'name' },
+ fixed: 'left',
+ },
+ {
+ title: '浣跨敤閮ㄩ棬',
+ align: "center",
+ dataIndex: 'useId_dictText',
+ },
+ {
+ title: '涓績',
+ align: "center",
+ dataIndex: 'workCenterId_dictText',
+ },
+ {
+ title: '宸ュ尯',
+ align: "center",
+ dataIndex: 'factoryModelId_dictText',
+ },
+ {
+ title: '宸ユ',
+ align: "center",
+ dataIndex: 'areaId_dictText',
+ },
+ {
+ title: '缁存姢閮ㄩ棬',
+ align: "center",
+ dataIndex: 'manageId_dictText',
+ },
+ {
+ title: '缁翠慨鐝粍',
+ align: "center",
+ dataIndex: 'teamId_dictText',
+ },
+ {
+ title: '璁惧鎵�灞炲垎绫�',
align: "center",
dataIndex: 'equipmentCategoryId_dictText',
},
{
- title: '鏄惁鐢熶骇绾胯澶�',
+ title: 'ABC鏍囪瘑',
align: "center",
- dataIndex: 'isLineEquip_dictText',
+ dataIndex: 'equipmentImportanceId',
},
{
title: '鍏抽敭璁惧鏍囪瘑',
@@ -814,16 +952,110 @@
dataIndex: 'specificEquipment_dictText',
},
{
- title: '缁熶竴缂栫爜',
+ title: '瀹夊叏閰嶇疆',
align: "center",
- dataIndex: 'num',
- scopedSlots: { customRender: 'num' },
+ dataIndex: 'securityConfiguration',
},
{
- title: '璁惧鍚嶇О',
+ title: '鍐峰嵈绯荤粺',
align: "center",
- dataIndex: 'name',
- scopedSlots: { customRender: 'name' },
+ dataIndex: 'coolingSystem',
+ },
+ {
+ title: '鐏伀鍣�',
+ align: "center",
+ dataIndex: 'fireExtinguisher',
+ },
+ {
+ title: '鐏伀鍣ㄦ湁鏁堟湡',
+ align: "center",
+ dataIndex: 'fireExtinguisherValidityPeriod',
+ },
+ {
+ title: '鎿嶄綔绯荤粺',
+ align: "center",
+ dataIndex: 'operatingSystem',
+ },
+ {
+ title: '绯荤粺',
+ align: "center",
+ dataIndex: 'system',
+ },
+ {
+ title: '璁惧绔彛',
+ align: "center",
+ dataIndex: 'port',
+ },
+ {
+ title: '鍧愭爣鏁伴噺',
+ align: "center",
+ dataIndex: 'coordinateNum',
+ },
+ {
+ title: '璁惧鐘舵��',
+ align: "center",
+ dataIndex: 'equipmentStatus_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ scopedSlots: { customRender: 'technologyStatus' },
+ },
+ {
+ title: '閲嶉噺',
+ align: "center",
+ dataIndex: 'equipmentUda3',
+ },
+ {
+ title: '閲嶉噺璁￠噺鍗曚綅',
+ align: "center",
+ dataIndex: 'equipmentUda4_dictText',
+ },
+ {
+ title: '鍔熻兘浣嶇疆',
+ align: "center",
+ dataIndex: 'equipmentUda5',
+ },
+ {
+ title: '瀹夎浣嶇疆',
+ align: "center",
+ dataIndex: 'equipmentUda2',
+ },
+ {
+ title: '鍑哄巶鏃ユ湡',
+ align: "center",
+ dataIndex: 'leaveFactoryDate',
+ },
+ {
+ title: '绔嬮」鍗″彿',
+ align: "center",
+ dataIndex: 'projectApprovalNo',
+ },
+ {
+ title: '璧勯噾鏉ユ簮',
+ align: "center",
+ dataIndex: 'fundSource',
+ },
+ {
+ title: '楠屾敹鏃ユ湡',
+ align: "center",
+ dataIndex: 'acceptanceCheckDate',
+ },
+ {
+ title: '鍑哄巶缂栧彿',
+ align: "center",
+ dataIndex: 'factoryNo',
+ },
+ {
+ title: '璧勪骇鍒堕�犲晢',
+ align: "center",
+ dataIndex: 'constructorId_dictText',
+ },
+ {
+ title: '璧勪骇鐨勬潵婧愬浗瀹�',
+ align: "center",
+ dataIndex: 'sourceCountry',
},
{
title: '鍨嬪彿',
@@ -831,7 +1063,7 @@
dataIndex: 'model',
},
{
- title: '瑙勬牸',
+ title: '璁惧瑙勬牸',
align: "center",
dataIndex: 'specification',
},
@@ -841,31 +1073,49 @@
dataIndex: 'gpo',
},
{
- title: '浣跨敤閮ㄩ棬',
+ title: '鍒涘缓浜�',
align: "center",
- dataIndex: 'useId_dictText',
+ dataIndex: 'createBy'
},
- // {
- // title: '缁存姢閮ㄩ棬',
- // align: "center",
- // dataIndex: 'manageId_dictText',
- // },
- // {
- // title: '缁翠慨鐝粍',
- // align: "center",
- // dataIndex: 'teamId_dictText',
- // },
{
- title: 'ABC鏍囪瘑',
+ title: '鍒涘缓鏃堕棿',
align: "center",
- dataIndex: 'equipmentImportanceId',
+ dataIndex: 'createTime',
},
-
{
- title: '鎶�鏈姸鎬�',
+ title: '鏇存柊浜�',
align: "center",
- dataIndex: 'technologyStatus_dictText',
- scopedSlots: { customRender: 'technologyStatus' },
+ dataIndex: 'updateBy'
+ },
+ {
+ title: '鏇存柊鏃堕棿',
+ align: "center",
+ dataIndex: 'updateTime',
+ },
+ {
+ title: '璐ㄤ繚寮�濮嬫棩鏈�',
+ align: "center",
+ dataIndex: 'warrantyStart'
+ },
+ {
+ title: '璐ㄤ繚缁撴潫鏃ユ湡',
+ align: "center",
+ dataIndex: 'warrantyEnd',
+ },
+ {
+ title: '璧勪骇鐘舵��',
+ align: "center",
+ dataIndex: 'propertyStatus_dictText',
+ },
+ {
+ title: '涓変繚鏃ユ湡',
+ align: "center",
+ dataIndex: 'thirdMaintenanceTime',
+ },
+ {
+ title: '鎶�鏈壌瀹氭棩鏈�',
+ align: "center",
+ dataIndex: 'technologyStatusQualificationTime',
},
{
title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
@@ -878,6 +1128,11 @@
dataIndex: 'nextTechnologyStatusQualificationTime',
},
{
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
+ },
+ {
title: '鐢熶骇绾跨紪鍙�',
align: "center",
dataIndex: 'lineId_dictText',
@@ -887,103 +1142,6 @@
align: "center",
dataIndex: 'isMeta_dictText',
},
- // {
- // title: '瀹夊叏閰嶇疆',
- // align: "center",
- // dataIndex: 'securityConfiguration',
- // },
- // {
- // title: '鍐峰嵈绯荤粺',
- // align: "center",
- // dataIndex: 'coolingSystem',
- // },
- // {
- // title: '鐏伀鍣�',
- // align: "center",
- // dataIndex: 'fireExtinguisher',
- // },
-
-
- // {
- // title: '鎿嶄綔绯荤粺',
- // align: "center",
- // dataIndex: 'operatingSystem',
- // },
- // {
- // title: '绯荤粺',
- // align: "center",
- // dataIndex: 'system',
- // },
- // {
- // title: '璁惧绔彛',
- // align: "center",
- // dataIndex: 'port',
- // },
- // {
- // title: '鍧愭爣鏁伴噺',
- // align: "center",
- // dataIndex: 'coordinateNum',
- // },
- // {
- // title: '璁惧鐘舵��',
- // align: "center",
- // dataIndex: 'equipmentStatus_dictText',
- // },
- // {
- // title: '閲嶉噺',
- // align: "center",
- // dataIndex: 'equipmentUda3',
- // },
- // {
- // title: '閲嶉噺璁￠噺鍗曚綅',
- // align: "center",
- // dataIndex: 'equipmentUda4_dictText',
- // },
- // {
- // title: '鍔熻兘浣嶇疆',
- // align: "center",
- // dataIndex: 'equipmentUda5',
- // },
- // {
- // title: '瀹夎浣嶇疆',
- // align: "center",
- // dataIndex: 'equipmentUda2',
- // },
- // {
- // title: '鍑哄巶鏃ユ湡',
- // align: "center",
- // dataIndex: 'leaveFactoryDate',
- // },
- // {
- // title: '绔嬮」鍗″彿',
- // align: "center",
- // dataIndex: 'projectApprovalNo',
- // },
- // {
- // title: '璧勯噾鏉ユ簮',
- // align: "center",
- // dataIndex: 'fundSource',
- // },
- // {
- // title: '楠屾敹鏃ユ湡',
- // align: "center",
- // dataIndex: 'acceptanceCheckDate',
- // },
- // {
- // title: '鍑哄巶缂栧彿',
- // align: "center",
- // dataIndex: 'factoryNo',
- // },
- // {
- // title: '璧勪骇鍒堕�犲晢',
- // align: "center",
- // dataIndex: 'constructorId_dictText',
- // },
- // {
- // title: '璧勪骇鐨勬潵婧愬浗瀹�',
- // align: "center",
- // dataIndex: 'sourceCountry',
- // },
{
title: '宸ヨ壓鍙傛暟绠＄悊',
align: "center",
@@ -1005,6 +1163,24 @@
title: '绮惧害鍙傛暟妯℃澘',
align: "center",
dataIndex: 'precisionParametersTemplateId_dictText',
+ },
+ {
+ title: '鏈夋棤鐐规鏍囧噯',
+ align: "center",
+ dataIndex: 'yseNoInspectionStandard',
+ scopedSlots: { customRender: 'yseNoInspectionStandard' }
+ },
+ {
+ title: '鏈夋棤浜屼繚鏍囧噯',
+ align: "center",
+ dataIndex: 'yseNoMaintenance2Standard',
+ scopedSlots: { customRender: 'yseNoMaintenance2Standard' }
+ },
+ {
+ title: '鏈夋棤涓変繚鏍囧噯',
+ align: "center",
+ dataIndex: 'yseNoMaintenance3Standard',
+ scopedSlots: { customRender: 'yseNoMaintenance3Standard' }
},
// {
// title: '澶囨敞',
@@ -1099,7 +1275,7 @@
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- if (selectedRowKeys.length == 1) {
+ if (selectedRowKeys.length >= 1) {
this.selectedMainId = selectedRowKeys[0]
this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
this.isOpenProcess = selectionRows[0].processParameters == 1;
@@ -1121,7 +1297,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) {
@@ -1264,6 +1443,11 @@
}
})
}
+ else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+ }
+ } else {
+ this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
}
})
},
--
Gitblit v1.9.3