From fdb46d8de2a54777b71a75403ddf2320731f8007 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期五, 28 七月 2023 16:02:25 +0800
Subject: [PATCH] 调整样式

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index b7734a3..0aa01d7 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -227,7 +227,7 @@
           <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
         </div>
       </el-dialog>
-      
+
       <!-- 缂栫爜瑙勫垯,杞Щ鎵�鏈夎�呭璇濇 -->
       <el-dialog
         :visible.sync="escapeOwnerVisible"
@@ -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>
@@ -767,7 +765,6 @@
         <formula-editor
           ref="formulaEditor"
           @updateFormulaContent="updateFormulaContent"
-          :componentRuleText="form.getValueClass"
           :visible.sync="formulaEditorParams.formulaEditorSettingBox"
           :thisSceneTableData="formulaEditorParams.thisSceneTableData"
           :systemVariableTableData="formulaEditorParams.systemVariableTableData">
@@ -876,7 +873,7 @@
           ruleAdminUserList: [], //瑙勫垯绠$悊鍛樺垪琛�
           ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠$悊鍛樼殑ID
           releadDisabled: false, // 閬垮厤瑙勫垯鍙戝竷閲嶅鎻愪氦
-          
+
           /*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
           codeRangeSettingBox: false,
           useRangeData: [],
@@ -1245,7 +1242,7 @@
           parentClsParam.classifyDialogLoading = true;
           let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
           let conditionMaps = {};
-          
+
           conditionMaps['conditionMap[pkCodeRule]'] = oid;
           conditionMaps['conditionMap[oid_notequal]'] = this.form.oid;
           refDataGridClassifySec(
@@ -1505,7 +1502,7 @@
           }else{
             if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
               return;
-            } 
+            }
             //鍒嗙被鐮佹鐮佸�煎垹闄�
             this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
               confirmButtonText: "纭畾",
@@ -1567,7 +1564,7 @@
         codeClassifyValueOpetion(condition){
           if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
             return;
-          } 
+          }
           //姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
           let currentTreeList = this.getCodeClassifyValueTreeData();
           let saveData = [];
@@ -2572,6 +2569,7 @@
             this.loadlistClassifyLinkAttr();
           }else if(condition === 'value'){
             //鎵撳紑鍏紡缂栬緫妗嗭紝绗簩灞傚祵濂楀璇濇
+            //this.$refs.formulaEditor.isShowformulaEdit = true;
             this.formulaEditorParams.formulaEditorSettingBox = true;
           }else if(condition === 'parentClassifySecOid'){
             this.parentClsfyParams.isShowParentClassifySettingBox = true;
@@ -2768,7 +2766,7 @@
           if(enumCach == null) {
             getDictionary("codeFillSeparator").then(res=>{
               this.enumParam.codeFillSeparator = res.data.data;
-              localStorage.setItem("codeFillSeparator",JSON.stringify(res.data.data));
+              localStorage.setItem('codeFillSeparator',JSON.stringify(res.data.data));
             })
           }
         },
@@ -2781,14 +2779,16 @@
         loadCodeGetValueType(){
           this.enumParam.codeGetValueType =  this.getLocalStorageEnum("codeGetValueType");
         },
-        
+
       }
   };
 
 </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