From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index 383ad22..050faad 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -77,20 +77,20 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-item
- label="浜х嚎"
+ label="宸ュ尯"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
allow-clear
- placeholder="璇烽�夋嫨浜х嚎"
+ placeholder="璇烽�夋嫨宸ュ尯"
:triggerChange="true"
- dictCode="mom_base_work_center,name,id,del_flag!='1'"
- v-model="queryParam.workCenterId"
+ dictCode="mom_base_area,name,id,del_flag!='1'"
+ v-model="queryParam.factoryModelId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <!-- <a-col :span="6">
<a-form-item
label="杞﹂棿"
:labelCol="labelCol"
@@ -104,7 +104,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -450,6 +450,9 @@
<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>
</a-tabs>
<equipment-modal ref="modalForm" @ok="modalFormOk" :caytegoryParam="caytegoryParam"></equipment-modal>
<process-edit-model ref ="processEditModel"></process-edit-model>
@@ -480,6 +483,8 @@
import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts.vue'
import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
+ import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
+ import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
export default {
name: "EquipmentList",
mixins:[JeecgListMixin,mixinDevice],
@@ -497,7 +502,9 @@
ABCUpdateEditModel,
WarrantyUpdateModel,
EquipmentSpareParts,
- EquipmentSparePartsModal
+ EquipmentSparePartsModal,
+ StandardOfInspection,
+ StandardOfMaintenance,
},
data () {
return {
@@ -570,6 +577,16 @@
align: "center",
dataIndex: 'specificEquipment_dictText',
},
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
+ },
// {
// title: '宸ュ尯',
// align: "center",
--
Gitblit v1.9.3