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/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
index a1f329b..b721303 100644
--- a/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
+++ b/src/views/mdc/base/modules/mdcProcessQuantity/mdcProcessQuantityModal.vue
@@ -102,7 +102,7 @@
             span: 24
           },
           sm: {
-            span: 6
+            span: 8
           }
         },
         wrapperCol: {
@@ -110,7 +110,7 @@
             span: 24
           },
           sm: {
-            span: 18
+            span: 16
           }
         },
         labelColLong: {
@@ -134,7 +134,7 @@
             span: 24
           },
           sm: {
-            span: 3
+            span: 4
           }
         },
         wrapperColLong1: {
@@ -142,14 +142,28 @@
             span: 24
           },
           sm: {
-            span: 21
+            span: 20
           }
         },
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules: {
+          duration:{
+            rules:[
+              {required:true,message:'璇烽�夋嫨鏍囧噯鍔犲伐鏃堕棿'}
+            ]
+          },
+          efficientDate:{
+            rules:[
+              {required:true,message:'璇烽�夋嫨鏃ユ湡'}
+            ]
+          },
+          processQuantity:{
+            rules:[
+              {required:true,message:'璇烽�夋嫨鍔犲伐鏁伴噺'}
+            ]
+          },
         },
-
         url: {
           add: '/mdc/mdcProcessQuantity/add',
           edit: '/mdc/mdcProcessQuantity/edit'
@@ -275,7 +289,7 @@
                 obj.then((res) => {
                   if (res.success) {
                     // that.$message.success("娣诲姞鎴愬姛")
-                    that.$notification.warning({
+                    that.$notification.success({
                       message:'娑堟伅',
                       description:"娣诲姞鎴愬姛"
                     });

--
Gitblit v1.9.3