From 2be0ef348c881796d66e112463f62be5ef374527 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 14 十一月 2023 11:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/code/code.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 0048ae0..05af43c 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -587,7 +587,7 @@
     >
       <!--  绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
       <div class="add-basicsec-total">
-        <el-form :model="form" class="add-basicsec-form">
+        <el-form :model="form" class="add-basicsec-form" :rules="rules" >
           <span class="left">
             <el-form-item
               :label-width="leftFormLabelWidth"
@@ -669,12 +669,12 @@
                 :disabled="basicSecOnlyRead"
                 style="margin-right: 20px"
               ></el-switch>
-              <el-input-number
+              <!-- <el-input-number
                 v-show="form.serialDependFlag"
                 v-model="form.serialDependOrder"
                 :readonly="basicSecOnlyRead"
                 controls-position="right"
-              ></el-input-number>
+              ></el-input-number> -->
             </el-form-item>
 
             <el-form-item :label-width="leftFormLabelWidth" label="鏄惁涓虹┖:">
@@ -886,7 +886,7 @@
                         :referConfig="this.referConfig || {}"
                         :display="true"
                         :value="form.customCodeSerialClass"
-                        :text="form.customCodeSerialClass"
+                        :text="form.customCodeSerialClassText"
                         @setReferValue="setReferValue"
                       ></vciWebRefer>
 <!--                                    <el-input-->
@@ -1027,9 +1027,9 @@
             <!-- 鏃ユ湡鐮佹 -->
             <div v-show="form.secType === 'codedatesec' ? true : false">
               <el-form-item
+                prop="Dateformat"
                 :label-width="rightFormLabelWidth"
                 label="鏃ユ湡鏍煎紡:"
-                required
               >
                 <el-input
                   ref="codeDateFormatStr"
@@ -1350,9 +1350,24 @@
   components: { vciWebRefer },
   data() {
     return {
+      rules: {
+        Dateformat: [
+          {
+            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'];
+              if (!Formats.includes(this.form.codeDateFormatStr)) {
+                return callback(new Error('璇疯緭鍏ユ纭棩鏈熸牸寮忥紝渚嬪yyyy-MM-dd锛堝苟鍖哄垎澶у皬鍐欙級锛�'));
+              }
+              callback();
+            }
+          }
+        ]
+      },
       referConfig:{
         title: '鑷畾涔夋祦姘村弬鐓�',
-        showField: 'customCodeSerialClass',
+        showField: 'customCodeSerialClassText',
         field: 'customCodeSerialClass',
         fieldMap:  {},
         placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
@@ -1375,10 +1390,10 @@
               {title: '绫诲叏璺緞', field: 'classFullName', width: 300},
               {title: '鎻忚堪', field: 'description'}
             ],
-            // queryColumns: [
-            //   {field: 'id', title: '绠楁硶缂栧彿'},
-            //   {field: 'name', title: '绠楁硶鍚嶇О'}
-            // ]
+            queryColumns: [
+              // {field: 'id', title: '绠楁硶缂栧彿'},
+              // {field: 'name', title: '绠楁硶鍚嶇О'}
+            ]
           }
         }
       },
@@ -1605,7 +1620,7 @@
         secType: "codefixedsec", //鐮佹绫诲瀷
         description: "", //鎻忚堪
         serialDependFlag: false, //鏄惁娴佹按渚濊禆
-        serialDependOrder: "", //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: "", //娴佹按渚濊禆椤哄簭
         nullableFlag: false, //鏄惁涓虹┖
         prefixCode: "", //鍓嶇紑
         suffixCode: "", //鍚庣紑
@@ -3282,7 +3297,7 @@
         secType: row != null ? row.secType : this.form.secType, //鐮佹绫诲瀷
         description: row != null ? row.description : this.form.description, //鎻忚堪
         serialDependFlag: this.isNullJsonBoolean(row, this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆
-        serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
         nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //鏄惁涓虹┖
         displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'),
         componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //鏄惁鍙備笌缂栫爜

--
Gitblit v1.9.3