From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收
---
src/views/eam/EquipmentListOfFilesCarousel.vue | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index cc047d7..eeacfcf 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -4,21 +4,21 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
- dict="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'filesCarousel'"
+ dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1='filesCarousel'"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -32,7 +32,7 @@
</a-form-item>
</a-col>
<a-col
- :span="5"
+ :span="6"
>
<a-form-item
:labelCol="labelCol"
@@ -45,7 +45,7 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="5">
+ <a-col :span="6">
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -57,40 +57,24 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="4">
- <span
- style="float: left;overflow: hidden;"
- class="table-page-search-submitButtons"
- >
- <a
- @click="handleToggleSearch"
- style="margin-left: 8px"
- >
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
- </a>
- </span>
- </a-col>
-
</a-row>
- <template v-if="toggleSearchStatus">
<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 +88,7 @@
v-model="queryParam.factoryModelId"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="6">
<a-form-item
label="缁存姢閮ㄩ棬"
@@ -220,7 +204,6 @@
</a-form-model-item>
</a-col>
</a-row>
- </template>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -436,7 +419,7 @@
<a-tab-pane tab="璁惧绮惧害" key="2" forceRender>
<EquipmentPrecisionParametersList
:isOpen="isOpenPrecision"
- :mainId="selectedMainId" />
+ :mainId="precisionParametersTemplateId" />
</a-tab-pane>
<a-tab-pane tab="璁惧鏂囨。" key="3" forceRender>
<EquipmentDocumentList :mainId="selectedMainId" />
@@ -449,6 +432,9 @@
</a-tab-pane>
<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>
@@ -476,10 +462,12 @@
import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
- import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel.vue'
+ import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
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 +485,9 @@
ABCUpdateEditModel,
WarrantyUpdateModel,
EquipmentSpareParts,
- EquipmentSparePartsModal
+ EquipmentSparePartsModal,
+ StandardOfInspection,
+ StandardOfMaintenance,
},
data () {
return {
@@ -569,6 +559,16 @@
title: '鍏抽敭璁惧鏍囪瘑',
align: "center",
dataIndex: 'specificEquipment_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬�',
+ align: "center",
+ dataIndex: 'technologyStatus_dictText',
+ },
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+ align: "center",
+ dataIndex: 'technologyStatusVerificationType_dictText',
},
// {
// title: '宸ュ尯',
@@ -742,6 +742,7 @@
equipmentProcessParametersMainId: '',
equipmentDocumentMainId: '',
equipmentPrecisionParametersMainId: '',
+ precisionParametersTemplateId:'',
isOpenPrecision:true,
isOpenProcess:true,
treeData: [],
@@ -790,10 +791,12 @@
onSelectChange(selectedRowKeys, selectionRows) {
if(selectedRowKeys.length==1){
this.selectedMainId=selectedRowKeys[0]
+ this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
this.isOpenProcess = selectionRows[0].processParameters==1;
this.isOpenPrecision = selectionRows[0].precisionParameters==1;
}else{
this.selectedMainId=''
+ this.precisionParametersTemplateId = ''
}
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
--
Gitblit v1.9.3