From 3dd1c81c84d78a30fff6468ccb05f979f2d50966 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 22 十一月 2023 17:48:45 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430

---
 src/views/eam/EquipmentListOfFilesCarousel.vue |   38 +++++++++++++++++++++++++++++---------
 1 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index cc047d7..050faad 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -11,7 +11,7 @@
             :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"
               />
@@ -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="缁存姢閮ㄩ棬"
@@ -436,7 +436,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 +449,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>
@@ -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 {
@@ -569,6 +576,16 @@
           title: '鍏抽敭璁惧鏍囪瘑',
           align: "center",
           dataIndex: 'specificEquipment_dictText',
+        },
+        {
+          title: '鎶�鏈姸鎬�',
+          align: "center",
+          dataIndex: 'technologyStatus_dictText',
+        },
+        {
+          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
+          align: "center",
+          dataIndex: 'technologyStatusVerificationType_dictText',
         },
         // {
         //   title: '宸ュ尯',
@@ -742,6 +759,7 @@
         equipmentProcessParametersMainId: '',
         equipmentDocumentMainId: '',
         equipmentPrecisionParametersMainId: '',
+        precisionParametersTemplateId:'',
         isOpenPrecision:true,
         isOpenProcess:true,
         treeData: [],
@@ -790,10 +808,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