From 4508f5eb86b063a0f3ec01e6ad68c6ce8ccd1392 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 14:34:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 8847b03..fad06a0 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -2,7 +2,7 @@
   <basic-container class="code-total" style=" height: 100%">
     <!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
     <basic-container class="code-rule-container">
-      <div style="height: 40vh;overflow: auto;">
+      <div style="height: 55vh;overflow: auto;">
         <p
           style="
           margin-top: -5px;
@@ -220,7 +220,7 @@
 
     <!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
     <basic-container class="code-basicsec-container">
-      <div style="height: 38.5vh;overflow: auto">
+      <div style="height: 23.5vh;overflow: auto">
         <p
           style="margin-top: -5px;
           margin-bottom: 4px;
@@ -644,7 +644,7 @@
                 v-model="form.prefixCode"
                 :readonly="basicSecOnlyRead"
               ></el-input> -->
-              <el-select v-model="form.prefixCode" :disabled="basicSecOnlyRead">
+              <el-select v-model="form.prefixCode" :disabled="basicSecOnlyRead" clearable>
                 <el-option
                   v-for="(option, index) in preFixOrSuffixChars"
                   :key="index"
@@ -661,7 +661,7 @@
                 v-model="form.suffixCode"
                 :readonly="basicSecOnlyRead">
               </el-input> -->
-              <el-select v-model="form.suffixCode" :disabled="basicSecOnlyRead">
+              <el-select v-model="form.suffixCode" :disabled="basicSecOnlyRead" clearable>
                 <el-option
                   v-for="(option, index) in preFixOrSuffixChars"
                   :key="index"
@@ -852,6 +852,7 @@
                   :disabled="basicSecOnlyRead"
                   filterable
                   placeholder="璇烽�夋嫨"
+                  clearable
                 >
                   <el-option
                     v-for="item in enumParam.codeFillSeparator"
@@ -1157,6 +1158,7 @@
                   :disabled="basicSecOnlyRead"
                   filterable
                   placeholder="璇烽�夋嫨"
+                  clearable
                 >
                   <el-option
                     v-for="item in enumParam.codeFillSeparator"
@@ -1304,7 +1306,6 @@
       </refer-config-dialog>
     </el-dialog>
 
-    <!--鑷畾涔夋祦姘村弬鐓х粍浠�-->
 
   </basic-container>
 </template>
@@ -1406,7 +1407,7 @@
         showField: 'customCodeSerialClassText',
         field: 'customCodeSerialClass',
         fieldMap: {
-          serialType: "serialType"
+          serialType: "serialType",
         },
         placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
         options: {
@@ -1763,7 +1764,7 @@
         this.form[data.field] = data.value || "";
         this.form[data.showField] = data.text || "";
         this.form.serialType = data.rawData[0].serialType || "";
-
+        this.form.customCodeSerialType = data.rawData[0].serialType || "";
       }
     },
     /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
@@ -2108,7 +2109,7 @@
         if (!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)) {
           return;
         }
-        if(!await this.regexCharacter(this.codeFixdForm.id)){
+        if(!await this.regexCharacter(this.codeClassifyForm.id)){
           return;
         }
         this.codeClassifyForm.oid =
@@ -2139,7 +2140,7 @@
         );
       }
     },
-    /** 
+    /**
      * 鍙敤瀛楃闆嗙爜鍊兼鍒欐牎楠�
      * @return true:婊¤冻闄愬埗锛宖alse锛氫笉婊¤冻闄愬埗
      */
@@ -2835,7 +2836,6 @@
     },
     /** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
     openBasicDialog(condition, row) {
-      //console.log(row);
       if (condition == "add") {
         this.basicSecDialogTitle = "娣诲姞鐮佹淇℃伅";
         this.showbtn = true;

--
Gitblit v1.9.3