From 5677cf19400eca6985fb9cd5d501b35691cdf193 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 10 三月 2024 20:18:04 +0800
Subject: [PATCH] 集成相关代码更改

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 3043cc7..a7032b9 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: 49vh;overflow: auto;">
         <p
           style="
           margin-top: -5px;
@@ -142,7 +142,6 @@
           </template>
         </avue-crud>
       </div>
-
     </basic-container>
 
     <!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
@@ -220,7 +219,7 @@
 
     <!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
     <basic-container class="code-basicsec-container">
-      <div style="height: 38.5vh;overflow: auto">
+      <div style="height: 29.3vh;overflow: auto">
         <p
           style="margin-top: -5px;
           margin-bottom: 4px;
@@ -897,11 +896,12 @@
               </el-form-item>
               <el-form-item
                 :label-width="rightFormLabelWidth"
-                label="鑷畾涔夌殑娴佹按绠楁硶:"
+                label="鑷畾涔夋祦姘寸畻娉�:"
               >
                   <template>
                       <vciWebRefer
                         ref="refer"
+                        :disabled="basicSecOnlyRead"
                         :display="true"
                         :referConfig="this.referConfig || {}"
                         :serialType="form.serialType"
@@ -910,8 +910,6 @@
                         @setReferValue="setReferValue"
                       ></vciWebRefer>
                   </template>
-
-
               </el-form-item>
             </div>
             <!-- 灞傜骇鐮佹 -->
@@ -1306,7 +1304,6 @@
       </refer-config-dialog>
     </el-dialog>
 
-    <!--鑷畾涔夋祦姘村弬鐓х粍浠�-->
 
   </basic-container>
 </template>
@@ -1408,7 +1405,7 @@
         showField: 'customCodeSerialClassText',
         field: 'customCodeSerialClass',
         fieldMap: {
-          serialType: "serialType"
+          serialType: "serialType",
         },
         placeholder: '璇烽�夋嫨鑷畾涔夋祦姘�',
         options: {
@@ -1762,10 +1759,12 @@
     //鑷畾涔夋祦姘村け鐒�
     setReferValue(data) {
       if (data.field) {
-        this.form[data.field] = data.value || "";
+        // this.form[data.field] = data.value || "";
+        this.form.customCodeSerialClass = data.rawData[0].id || "";
+        console.log(this.form.customCodeSerialClass);
         this.form[data.showField] = data.text || "";
         this.form.serialType = data.rawData[0].serialType || "";
-
+        this.form.customCodeSerialType = data.rawData[0].serialType || "";
       }
     },
     /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
@@ -2141,7 +2140,7 @@
         );
       }
     },
-    /** 
+    /**
      * 鍙敤瀛楃闆嗙爜鍊兼鍒欐牎楠�
      * @return true:婊¤冻闄愬埗锛宖alse锛氫笉婊¤冻闄愬埗
      */
@@ -2837,7 +2836,6 @@
     },
     /** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
     openBasicDialog(condition, row) {
-      //console.log(row);
       if (condition == "add") {
         this.basicSecDialogTitle = "娣诲姞鐮佹淇℃伅";
         this.showbtn = true;
@@ -3496,6 +3494,14 @@
             row != null && row.customCodeSerialClass != ""
               ? row.customCodeSerialClass
               : "", //鑷畾涔夋祦姘寸畻娉�
+          customCodeSerialClassText:
+            row != null && row.customCodeSerialClassText != ""
+              ? row.customCodeSerialClassText
+              : "", //鑷畾涔夋祦姘寸畻娉曟樉绀哄��
+              customCodeSerialType:
+            row != null && row.customCodeSerialType != ""
+              ? row.customCodeSerialType
+              : "", //鑷畾涔夋祦姘寸畻娉曠被鍨�
         });
         this.loadCodeFillType();
         this.loadCodeFillSeparator();

--
Gitblit v1.9.3