From 52190152691bc217844d4f87b700274c297b104e Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 09:55:53 +0800
Subject: [PATCH] 设备管理修改

---
 src/views/eam/EquipmentCalibrationOrder.vue |   64 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index bdec41f..5b7d464 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -15,10 +15,10 @@
             :sm='8'
           >
             <a-form-item label='宸ュ崟缂栫爜'>
-              <a-input
+              <j-input
                 placeholder='璇疯緭鍏ュ伐鍗曠紪鐮�'
                 v-model='queryParam.num'
-              ></a-input>
+              ></j-input>
             </a-form-item>
           </a-col>
           <!-- <a-col
@@ -113,13 +113,23 @@
             type='vertical'
           />
           <a
-            v-show="record.status === '2'"
+            v-show="record.status === '2' && record.equipmentImportance != 'D'"
             @click='handleTechnologyStatus(record)'
             v-has="'calibrationOrder:audit'"
           >缁撴灉瀹℃牳</a>
 
           <a-divider
-            v-show="record.status === '2'"
+            v-show="record.status === '2' && record.equipmentImportance != 'D'"
+            type='vertical'
+          />
+          <a
+            v-show="record.status === '2' && record.equipmentImportance == 'D'"
+            @click='handleTechnologyStatusAuthenticate(record)'
+            v-has="'calibrationOrder:authenticate'"
+          >D绫绘妧鏈姸鎬侀壌瀹�</a>
+
+          <a-divider
+            v-show="record.status === '2' && record.equipmentImportance == 'D'"
             type='vertical'
           />
           <a @click='handleDetail(record)'>璇︽儏</a>
@@ -263,6 +273,11 @@
       ref="EquipmentTechnologyStatusModal"
       @ok="modalFormOk"
     ></equipment-technology-status-modal>
+
+    <technology-status-authenticate-modal
+      ref="TechnologyStatusAuthenticateModal"
+      @ok="modalFormOk"
+    ></technology-status-authenticate-modal>
   </a-card>
 </template>
 
@@ -280,6 +295,8 @@
 import EquipmentCalibrationOrderReportModal
   from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
 import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
+import TechnologyStatusAuthenticateModal from './modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal'
+import { interceptorFunc } from 'vxe-table'
 
 export default {
   name: 'EquipmentCalibrationOrder',
@@ -291,15 +308,17 @@
     EquipmentCalibrationOrderReportList,
     EquipmentCalibrationOrderReportModal,
     FinalModal,
-    EquipmentTechnologyStatusModal
+    EquipmentTechnologyStatusModal,
+    TechnologyStatusAuthenticateModal
   },
   data() {
     return {
       description: '鎶�鏈姸鎬侀壌瀹氱鐞�',
+      disableMixinCreated: true,
       ipagination: {
         current: 1,
-        pageSize: 5,
-        pageSizeOptions: ['5', '10', '50'],
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
         showTotal: (total, range) => {
           return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
         },
@@ -374,11 +393,11 @@
         //   align: 'center',
         //   dataIndex: 'createBy'
         // },
-        // {
-        //   title: '鍒涘缓鏃ユ湡',
-        //   align: 'center',
-        //   dataIndex: 'createTime'
-        // },
+        {
+          title: '鍒涘缓鏃ユ湡',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
         // {
         //   title: '妫�瀹氫汉',
         //   align: 'center',
@@ -422,6 +441,17 @@
       return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
     }
   },
+  created() {
+    //浠庤矾鐢变腑鑾峰彇鏌ヨ鏉′欢
+    if (this.$route.query) {
+      this.queryParam.equipmentId = this.$route.query.equipmentId;
+      //鏌ヨ鏉′欢鎸夋椂闂村�掑簭
+      this.queryParam.sort = 'createTime';
+      this.queryParam.order = 'desc';
+    }
+    this.loadData()
+    this.initDictConfig();
+  },
 
   methods: {
 
@@ -439,6 +469,13 @@
       this.$refs.EquipmentTechnologyStatusModal.edit(record);
       this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳";
       this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+    },
+
+    handleTechnologyStatusAuthenticate: function (record) {
+      this.$refs.TechnologyStatusAuthenticateModal.edit(record);
+      this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�";
+      this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;
+
     },
 
     handleOrderExe(record) {
@@ -502,7 +539,8 @@
     },
     handleFinal(record) {
       this.$refs.finalModal.edit(record)
-    }
+    },
+    
   }
 }
 </script>

--
Gitblit v1.9.3