From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue
index 8fc2c25..fa9fee4 100644
--- a/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue
+++ b/src/views/eam/modules/operationCertificateApply/OperationCertificateApplyForm.vue
@@ -88,7 +88,6 @@
   },
   data() {
     return {
-      isAchievement:false,
       labelCol: {
         xs: { span: 24 },
         sm: { span: 5 }
@@ -123,7 +122,8 @@
           {
             title: '鐢ㄦ埛',
             key: 'userId',
-            type: JVXETypes.userSelect,
+            type: JVXETypes.selectSearch,
+            dictCode: 'sys_user,realname,id ',
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: '',
@@ -142,7 +142,7 @@
           {
             title: '璁惧缁熶竴缂栫爜',
             key: 'equipmentIds',
-            type: JVXETypes.selectSearch,
+            type: JVXETypes.selectMultiple,
             dictCode: 'mom_eam_equipment,num,id ',
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
@@ -181,7 +181,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: '',
-            disabled:false
+            disabled:'achievementDisabled'
           },
           {
             title: '瀹炴搷鎴愮哗',
@@ -190,7 +190,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: '',
-            disabled:false
+            disabled:'achievementDisabled'
           },
           {
             title: '鑰冭瘯缁撹',
@@ -200,7 +200,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: '',
-            disabled:false
+            disabled:'achievementDisabled'
           },
           // {
           //   title: '鐘舵��',
@@ -231,10 +231,18 @@
       default: false,
       required: false
     },
+    achievement: {
+      type: Boolean,
+      default: false,
+      required: false
+    },
   },
   computed: {
     formDisabled() {
       return this.disabled
+    },
+    achievementDisabled() {
+      return this.achievement
     }
   },
   created() {
@@ -300,13 +308,15 @@
       console.log("formData===>",formData);
       httpAction(url, formData, method).then((res) => {
         if (res.success) {
-          httpAction(this.url.addOperationCertificate, formData.operationCertificateApplyDetailList, 'post').then((res) => {
-            if (res.success) {
-              this.$message.success(res.message)
-            }else {
-              this.$message.warning(res.message)
-            }
-          })
+          if(this.achievementDisabled){
+            httpAction(this.url.addOperationCertificate, formData.operationCertificateApplyDetailList, 'post').then((res) => {
+              if (res.success) {
+                this.$message.success(res.message)
+              }else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
           this.$message.success(res.message)
           this.$emit('ok')
           this.close()

--
Gitblit v1.9.3