From 399e6c1b3925f4241e6b1cef6ffe055b84fb53f6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 13 十二月 2023 17:45:58 +0800
Subject: [PATCH] 修改
---
src/views/eam/EquipmentListOfTester.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 28d63ed..8b39870 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -121,6 +121,21 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="6">
+ <a-form-item
+ label="鏄惁鐢熶骇绾胯澶�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨"
+ :triggerChange="true"
+ dictCode="is_product"
+ v-model="queryParam.isLineEquip"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="6">
@@ -430,11 +445,17 @@
<a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender>
<equipment-update-ABC-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender>
+ <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender>
<equipment-update-warranty-list :mainId="selectedMainId" />
</a-tab-pane>
- <a-tab-pane tab="淇濆吇鐐规鏍囧噯" key="7" forceRender>
- <standard-of-maintenance :mainId="selectedMainId"/>
+ <a-tab-pane 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-tabs>
<equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
@@ -464,10 +485,13 @@
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
- import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
+ import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
+ import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
+ import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
+ import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -488,6 +512,9 @@
EquipmentSparePartsModal,
StandardOfInspection,
StandardOfMaintenance,
+ DailyMaintenanceList,
+ SecondMaintenanceList,
+ ThirdMaintenanceList,
},
data () {
return {
@@ -509,6 +536,11 @@
title: '璁惧绫诲瀷',
align: "center",
dataIndex: 'equipmentCategoryId_dictText',
+ },
+ {
+ title: '鏄惁鐢熶骇绾胯澶�',
+ align: "center",
+ dataIndex: 'isLineEquip_dictText',
},
{
title: '缁熶竴缂栫爜',
@@ -570,6 +602,16 @@
align: "center",
dataIndex: 'technologyStatusVerificationType_dictText',
},
+ {
+ title: '鐢熶骇绾跨紪鍙�',
+ align: "center",
+ dataIndex: 'lineId_dictText',
+ },
+ {
+ title: '涓昏澶�?',
+ align: "center",
+ dataIndex: 'isMeta_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
--
Gitblit v1.9.3