From a751e547d67c4f8e2c6fddf958c1559f792515bd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 27 六月 2025 16:11:50 +0800
Subject: [PATCH] 添加工作流

---
 src/views/eam/modules/equipmentNew/EquipmentModal.vue |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 3976c6a..0227cb4 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'
               />
@@ -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'>
@@ -395,7 +395,7 @@
         <a-row>
           <a-col :span='6'>
             <a-form-model-item
-              label='鎿嶄綔绯荤粺'
+              label='鏄惁鏈夋搷浣滅郴缁�'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='operatingSystem'
@@ -415,7 +415,7 @@
             v-if="model.operatingSystem=='yes'"
           >
             <a-form-model-item
-              label='绯荤粺'
+              label='绯荤粺淇℃伅'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='system'
@@ -488,19 +488,21 @@
                 style='width: 100%;'
                 v-model='model.acceptanceCheckDate'
                 @change='dateChange'
+                valueFormat="YYYY-MM-DD"
+                format="YYYY-MM-DD"
               />
             </a-form-model-item>
           </a-col>
           <a-col :span='6'>
             <a-form-model-item
-              label='鎶�鏈姸鎬佹瀹氬懆鏈�'
+              label='鎶�鏈姸鎬侀壌瀹氬懆鏈�'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='checkPeriod'
             >
               <j-dict-select-tag
                 allow-clear
-                placeholder='璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈� '
+                placeholder='璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� '
                 :triggerChange='true'
                 dictCode='check_period'
                 v-model='model.checkPeriod'
@@ -1128,7 +1130,7 @@
           { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' }
         ],
         workCenterId: [
-          { required: false, message: '璇烽�夋嫨涓績!' }
+          { required: true, message: '璇烽�夋嫨涓績!' }
         ],
         factoryModelId: [
           { required: false, message: '璇烽�夋嫨宸ュ尯!' }
@@ -1209,12 +1211,13 @@
             if (res.success) {
               that.$message.success(res.message)
               that.$emit('ok')
+              that.close()
             } else {
-              that.$message.warning(res.message)
+              that.$message.error(res.message)
             }
           }).finally(() => {
             that.confirmLoading = false
-            that.close()
+            // that.close()
           })
         } else {
           return false

--
Gitblit v1.9.3