From 82be002b1b902be87cd8f730ba0aab190daefeb1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 04 八月 2023 10:16:17 +0800
Subject: [PATCH] 提交代码

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 088e5fb..24c2921 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -340,7 +340,7 @@
       <!-- 鐮佹鐮佸�肩鐞嗗璇濇 -->
       <el-dialog title="鐮佹鐮佸�肩鐞�"
         :visible.sync="isShowBasicSecCodeValueMgr"
-        :width="isShowFixedForm ? '68vw':'50vw'"
+        :width="isShowFixedForm ? '69vw':'50vw'"
         append-to-body
         style="height: 116vh; margin-top: -10vh;"
         @close="clearFixedOrClassifyForm('close')"
@@ -349,8 +349,7 @@
         <el-row v-show="!isShowFixedForm">
           <el-col :span="11">
             <basic-container>
-              <div class="box classify_value_box" style="height:65vh; margin-bottom:-40px">
-                <el-scrollbar style="border-bottom-right-radius:8px ">
+              <div class="box classify_value_box" style="height:60vh; margin-bottom:-40px">
                   <basic-container>
                     <div class="abox" style="height:54vh">
                       <avue-tree
@@ -360,7 +359,6 @@
                         style="overflow-y: auto; height: 54vh"/>
                     </div>
                   </basic-container>
-                </el-scrollbar>
               </div>
               <div style="margin-top:20px; display: flex; align-items:center; justify-content:center;">
                 <el-button size="mini" type="primary" icon="el-icon-arrow-up" class="button" @click="codeClassifyValueOpetion('up')">涓婄Щ</el-button>
@@ -370,7 +368,7 @@
           </el-col>
           <el-col :span="13">
             <basic-container>
-              <div class="box" style="height:65vh; margin-bottom:-40px">
+              <div class="box" style="height:60vh; margin-bottom:-40px">
                 <el-form>
                   <el-form-item label="鐮佸��:" :label-width="50" required>
                     <el-input style="width: 18vw" v-model="codeClassifyForm.id"></el-input>
@@ -422,8 +420,8 @@
                     <el-form-item label="鐮佸��:" label-width="54px" required>
                       <el-input style="width: 19.5vw" v-model="codeFixdForm.id"></el-input>
                     </el-form-item >
-                    <el-form-item label="鎻忚堪:">
-                      <el-input type="textarea" style="width: 20vw;" v-model="codeFixdForm.description"></el-input>
+                    <el-form-item label="鎻忚堪:" label-width="54px">
+                      <el-input type="textarea" style="width: 19.5vw;" v-model="codeFixdForm.description"></el-input>
                     </el-form-item>
                   </el-form>
                 </div>
@@ -837,6 +835,7 @@
   import fixedValueOption from "@/const/code/fixedValueMgrDialog";
   import {mapGetters} from "vuex";
   import {getByRoleUserList} from "@/api/system/user";
+  import func from "@/util/func";
 
   export default {
       data() {
@@ -2618,7 +2617,7 @@
         /** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
         changeSectypeFormItems(row){
           //console.log(row);
-          if(this.enumParam.secTypeList.length==0){
+          if(func.isEmpty(this.enumParam.secTypeList) || this.enumParam.secTypeList.length==0){
             this.loadCodeSecType();
           }
           if(row != null){
@@ -2754,14 +2753,14 @@
         },
         /** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
         loadCodeSecType(){
-          this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
+          this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType") | [];
           this.loadCodeSecLength();
         },
         loadCodeSecLength(){
-          this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength");
+          this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength") | [];
         },
         loadCodeFillType(){
-          this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
+          this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") | [];
         },
         loadCodeFillSeparator(){
           let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
@@ -2773,13 +2772,13 @@
           }
         },
         loadCodeLevelType(){
-          this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
+          this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") | [];
         },
         loadCodeCutType(){
-          this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType");
+          this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType") | [];
         },
         loadCodeGetValueType(){
-          this.enumParam.codeGetValueType =  this.getLocalStorageEnum("codeGetValueType");
+          this.enumParam.codeGetValueType =  this.getLocalStorageEnum("codeGetValueType") | [];
         },
 
       }
@@ -2788,7 +2787,9 @@
 </script>
 
 <style>
-
+[class^="icon-"]{
+  font-size: 12px !important;
+}
   .code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
     margin-bottom: -15px;
   }

--
Gitblit v1.9.3