From c4379ec6f6b634db8ce1c90d53902d224b44a604 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 12 十二月 2023 14:40:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/code/code.vue |   64 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 03b6b62..7a37895 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -911,6 +911,7 @@
                   v-model="form.codeLevelType"
                   :disabled="basicSecOnlyRead"
                   placeholder="璇烽�夋嫨"
+                  @change="changeLevelType"
                 >
                   <el-option
                     v-for="item in enumParam.codeLevelType"
@@ -929,6 +930,7 @@
                   ref="codeLevelValue"
                   v-model.number="form.codeLevelValue"
                   :readonly="basicSecOnlyRead"
+                  :disabled="form.codeLevelType != 'code_level_special'"
                 ></el-input>
               </el-form-item>
               <el-form-item
@@ -1357,7 +1359,28 @@
             required: true,
             trigger: 'blur',
             validator: (rule, value, callback) => {
-              const Formats = ['yy', 'yyyy', 'yyyy-MM', 'yy-MM', 'yyyy-MM-dd', 'yy-MM-dd', 'yyyy-MM-dd HH:mm:ss', 'yy-MM-dd HH:mm:ss', 'HH:mm:ss'];
+              const Formats = [
+                'yy',
+                'yyyy',
+                'yy-MM',
+                'yyMM',
+                'yyyy-MM',
+                'yyyyMM',
+                'yy-MM-dd',
+                'yyMMdd',
+                'yyyy-MM-dd',
+                'yyyyMMdd',
+                'yyyy-MM-dd HH:mm:ss',
+                'yy-MM-dd HH:mm:ss',
+                'HH:mm:ss',
+                'yyyyMMdd HH:mm:ss',
+                'yyMMdd HH:mm:ss',
+                'yyyy-MM-dd HHmmss',
+                'yy-MM-dd HHmmss',
+                'yyyyMMdd HHmmss',
+                'yyMMdd HHmmss',
+                'HHmmss'
+              ];
               if (!Formats.includes(this.form.codeDateFormatStr)) {
                 return callback(new Error('璇疯緭鍏ユ纭棩鏈熸牸寮忥紝渚嬪yyyy-MM-dd锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
               }
@@ -2313,6 +2336,7 @@
     },
     /** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
     async saveCodeFixedOrClassifyValueOption(condition, editOrderNumdata) {
+
       //淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
       if (condition == "fixedValue") {
         let data = {
@@ -2448,6 +2472,8 @@
           },
           {
             data: [],
+
+
             title: "鎻忚堪",
             fieldType: "text",
             queryField: "description",
@@ -2508,8 +2534,8 @@
     /** 鍙戝竷缂栫爜瑙勫垯 */
     async enableOrDeactivatse(oid, update) {
       if (update === "release") {
-        this.releadDisabled = true;
         // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
+        this.releadDisabled = true;
         await checkLikeCodeRule(oid)
           .then((res) => {
             //console.log(res)
@@ -2808,7 +2834,7 @@
               type: "success",
               message: "鎿嶄綔鎴愬姛!",
             });
-            console.log(this.form)
+            // console.log(this.form)
             // 鍏抽棴瀵硅瘽妗�
             this.addBasicCodeSettingBox = false;
             // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
@@ -3014,6 +3040,32 @@
           this.$refs.codeDateFormatStr.$el.querySelector("input").focus();
           return false;
         }
+        const Formats = [
+          'yy',
+          'yyyy',
+          'yy-MM',
+          'yyMM',
+          'yyyy-MM',
+          'yyyyMM',
+          'yy-MM-dd',
+          'yyMMdd',
+          'yyyy-MM-dd',
+          'yyyyMMdd',
+          'yyyy-MM-dd HH:mm:ss',
+          'yy-MM-dd HH:mm:ss',
+          'HH:mm:ss',
+          'yyyyMMdd HH:mm:ss',
+          'yyMMdd HH:mm:ss',
+          'yyyy-MM-dd HHmmss',
+          'yy-MM-dd HHmmss',
+          'yyyyMMdd HHmmss',
+          'yyMMdd HHmmss',
+          'HHmmss'
+        ];
+        if (!Formats.includes(this.form.codeDateFormatStr)) {
+          this.$message.warning('璇锋鏌ユ棩鏈熸牸寮忥紒');
+          return;
+        }
       } else if (this.form.secType === "codeclassifysec") {
         //鍒嗙被鐮佹
         if (form.codeSecLengthType == "") {
@@ -3059,6 +3111,12 @@
       }
       return true;
     },
+    /** 灞傜骇鐮佹閫夋嫨涓烘渶灏忓眰绾ф椂娓呯┖灞傜骇鐨勫�� */
+    changeLevelType(){
+      if(this.form.codeLevelType === 'code_level_min'){
+        this.form.codeLevelValue = '';
+      }
+    },
     /** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
     tipsMessage(list) {
       if (list.length != 1) {

--
Gitblit v1.9.3