From 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 19 九月 2023 17:39:28 +0800
Subject: [PATCH] 项目优化

---
 src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
index f5d2f56..48c1e83 100644
--- a/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/HolidayManagement/HolidayManagementModalEdit.vue
@@ -21,8 +21,9 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :disabled="disableSubmit" placeholder="璇疯緭鍏ョ被鍨�"
-                       v-decorator="['vacationType', validatorRules.vacationType]"/>
+              <j-dict-select-tag :readOnly="disableSubmit" placeholder="璇烽�夋嫨绫诲瀷"
+                                 :triggerChange="true" dictCode="vacation_type	"
+                                 v-decorator="['vacationType', validatorRules.vacationType]" allow-clear/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
@@ -35,7 +36,7 @@
         </a-row>
         <a-row :gutter="24">
           <a-form-item label="澶囨敞" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
-            <a-textarea  :disabled="disableSubmit"  v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�"  ></a-textarea>
+            <a-textarea :maxLength="20" :disabled="disableSubmit"  v-decorator="['notes', validatorRules.notes]" placeholder="璇疯緭鍏ュ娉�"  ></a-textarea>
           </a-form-item>
         </a-row>
       </a-form>
@@ -122,6 +123,22 @@
               {
                 required:true,
                 message: ""
+              },
+            ],
+          },
+          vacationDate:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨浼戝亣鏃堕棿"
+              },
+            ],
+          },
+          vacationType:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鍋囨湡绫诲瀷"
               },
             ],
           },
@@ -254,11 +271,19 @@
             }
             obj.then((res) => {
               if (res.success) {
-                that.$message.success("淇敼鎴愬姛")
+                // that.$message.success("淇敼鎴愬姛")
+                that.$notification.success({
+                  message:'娑堟伅',
+                  description:"淇敼鎴愬姛"
+                });
                 // that.$message.success(res.message)
                 that.$emit('ok', res.result)
               } else {
-                that.$message.warning(res.message)
+                // that.$message.warning(res.message)
+                that.$notification.warning({
+                  message:'娑堟伅',
+                  description:res.message
+                });
               }
             }).finally(() => {
               that.confirmLoading = false

--
Gitblit v1.9.3