From 2180a4ff39322176884c6ad6e10b947b8e87b22b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:14:33 +0800
Subject: [PATCH] art: 设备维护，不再更新 是否生产线，是否主设备，需要在生产线那边维护此属性

---
 src/views/eam/DailyInspectionOrderList.vue            |    9 ++++++++-
 src/views/eam/modules/equipmentNew/EquipmentModal.vue |   34 +++++++++++++++++-----------------
 src/views/eam/EquipmentOfLine.vue                     |    4 ++--
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index 4a5247f..2c9f042 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -516,7 +516,14 @@
         edit: "/eam/inspectionOrder/editStatus",
         orderGet: "/eam/inspectionOrder/orderGet",
       },
-
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 },
+      },
     }
   },
 
diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
index 481cbf7..3b2d7ff 100644
--- a/src/views/eam/EquipmentOfLine.vue
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -12,12 +12,12 @@
         <a-row :gutter="24">
           <a-col :span="6">
             <a-form-item
-              label="鍒嗙被"
+              label="璁惧鎵�灞炲垎绫�"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
               <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
+                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\' and del_flag=0'"
                 placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
                 v-model="queryParam.equipmentCategoryId"
               />
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 02ef678..76a4858 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -129,8 +129,21 @@
               />
             </a-form-model-item>
           </a-col>
+          <a-col :span='6'>
+            <a-form-model-item
+              label='璁惧鍥剧墖'
+              :labelCol='labelCol'
+              :wrapperCol='wrapperCol'
+              prop='equipmentPhoto'
+            >
+              <j-image-upload
+                :isMultiple='false'
+                v-model='model.equipmentPhoto'
+              ></j-image-upload>
+            </a-form-model-item>
+          </a-col>
         </a-row>
-        <a-row>
+<!--        <a-row>
           <a-col :span='6'>
             <a-form-model-item
               label='鏄惁鐢熶骇绾�'
@@ -138,7 +151,7 @@
               :wrapperCol='wrapperCol'
               prop='isLine'
             >
-              <!--                type='radio'-->
+              &lt;!&ndash;                type='radio'&ndash;&gt;
               <j-dict-select-tag
                 allow-clear
                 type='radio'
@@ -160,7 +173,7 @@
               :wrapperCol='wrapperCol'
               prop='isLineEquip'
             >
-              <!--              type='radio'-->
+              &lt;!&ndash;              type='radio'&ndash;&gt;
               <j-dict-select-tag
                 allow-clear
                 type='radio'
@@ -172,20 +185,7 @@
             </a-form-model-item>
           </a-col>
 
-          <a-col :span='6'>
-            <a-form-model-item
-              label='璁惧鍥剧墖'
-              :labelCol='labelCol'
-              :wrapperCol='wrapperCol'
-              prop='equipmentPhoto'
-            >
-              <j-image-upload
-                :isMultiple='false'
-                v-model='model.equipmentPhoto'
-              ></j-image-upload>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
+        </a-row>-->
         <a-row>
           <!-- 涓績 -->
           <a-col :span='6'>

--
Gitblit v1.9.3