From a9f005e2af294c47d7cd1e4b6ed401bf65f5b080 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:44:09 +0800
Subject: [PATCH] art: 所有设备 台账 二保工单 根据设备id查询二保工单,并过滤掉已完成和已取消的二保工单

---
 src/views/eam/modules/equipmentNew/EquipmentModal.vue |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index a64d587..c932f92 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -33,7 +33,7 @@
                 placeholder='璇烽�夋嫨璁惧鎵�灞炲垎绫�'
                 :disabled='formDisabled'
                 :triggerChange='true'
-                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
+                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                 v-model='model.equipmentCategoryId'
                 @change='categoryChange'
               />
@@ -150,7 +150,10 @@
               />
             </a-form-model-item>
           </a-col>
-          <a-col :span='6'  v-show='isLineEquipShow'>
+          <a-col
+            :span='6'
+            v-show='isLineEquipShow'
+          >
             <a-form-model-item
               label='鏄惁鐢熶骇绾夸富璁惧'
               :labelCol='labelCol'
@@ -518,6 +521,56 @@
                 placeholder='璇烽�夋嫨鏃ユ湡'
                 class='query-group-cust'
                 v-model='model.nextTechnologyStatusQualificationTime'
+              ></j-date>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :span='6'>
+            <a-form-model-item
+              label='浜屼繚鏃ユ湡'
+              :labelCol='labelCol'
+              :wrapperCol='wrapperCol'
+              prop='secondMaintenanceTime'
+            >
+              <j-date
+                :disabled='true'
+                style='width: 100%;'
+                placeholder='璇烽�夋嫨浜屼繚鏃ユ湡'
+                class='query-group-cust'
+                v-model='model.secondMaintenanceTime'
+              ></j-date>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6'>
+            <a-form-model-item
+              label='涓変繚鏃ユ湡'
+              :labelCol='labelCol'
+              :wrapperCol='wrapperCol'
+              prop='thirdMaintenanceTime'
+            >
+              <j-date
+                :disabled='true'
+                style='width: 100%;'
+                placeholder='璇烽�夋嫨涓変繚鏃ユ湡'
+                class='query-group-cust'
+                v-model='model.thirdMaintenanceTime'
+              ></j-date>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span='6'>
+            <a-form-model-item
+              label='涓嬫涓変繚鏃ユ湡'
+              :labelCol='labelCol'
+              :wrapperCol='wrapperCol'
+              prop='nextThirdMaintenanceTime'
+            >
+              <j-date
+                :disabled='true'
+                style='width: 100%;'
+                placeholder='璇烽�夋嫨涓嬫涓変繚鏃ユ湡'
+                class='query-group-cust'
+                v-model='model.nextThirdMaintenanceTime'
               ></j-date>
             </a-form-model-item>
           </a-col>
@@ -1028,7 +1081,7 @@
         num: [
           { required: true, message: '璇疯緭鍏ヨ澶囩紪鍙�!' },
           // { min: 2, max: 30, message: '闀垮害鍦� 2 鍒� 30 涓瓧绗�', trigger: 'blur' },
-          { validator: this.validateNum }
+          // { validator: this.validateNum }
         ],
         name: [
           { required: true, message: '璇疯緭鍏ヨ澶囧悕绉�!' }

--
Gitblit v1.9.3