From 73dbe864eb18a1a4df4f41caed1dd128faf1b2ec Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 02 六月 2023 19:11:27 +0800
Subject: [PATCH] 引用码段关于业务类型接口的联调,重复使用的界面抽离成单独组件

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 7ca7a33..9d36936 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -54,45 +54,62 @@
             @click="enableOrDeactivatse(scope.row.oid,'enable')">鍚� 鐢�
           </el-button>
         </template>
-        <!-- 琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
+        <!-- 琛ㄦ牸涓婃柟鎸夐挳鍖哄煙 -->
         <template slot="menuLeft" slot-scope="scope">
           <el-button type="danger"
-                    size="small"
-                    icon="el-icon-delete"
-                    plain
-                    @click="handleDelete">鍒� 闄�
+            size="small"
+            icon="el-icon-delete"
+            plain
+            @click="handleDelete">
+            鍒� 闄�
           </el-button>
           <el-button size="small"
-                    icon="icon-kelong"
-                    plain
-                    @click="openCodeRuleDialog">鍏� 闅�
+            icon="icon-kelong"
+            plain
+            @click="openCodeRuleDialog">
+            鍏� 闅�
           </el-button>
           <el-button size="small"
-                    icon="icon-lianjiekelong"
-                    style="font-size: 12px;"
-                    plain
-                    @click="openOtherCodeRuleDialog">浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
+            icon="icon-lianjiekelong"
+            style="font-size: 12px;"
+            plain
+            @click="openOtherCodeRuleDialog">
+            浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
           </el-button>
           <el-button size="small"
-                    icon="el-icon-s-help"
-                    plain
-                    @click="handleRange">浣跨敤鑼冨洿
+            icon="el-icon-s-help"
+            plain
+            @click="handleRange">
+            浣跨敤鑼冨洿
           </el-button>
           <el-button size="small"
-                    icon="icon-qingkong"
-                    plain
-                    @click="clearAllCodeSec">娓呯┖鐮佸��
+              icon="icon-qingkong"
+              plain
+              @click="clearAllCodeSec">
+              娓呯┖鐮佸��
           </el-button>
+          <el-button size="small"
+            icon="el-icon-search"
+            plain
+            @click="openAdvancedQuery">
+            楂樼骇鏌ヨ
+        </el-button>
         </template>
       </avue-crud>
     </basic-container>
-
+    <!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
+    <advanced-query
+      ref="advancedQuery"
+      :options="advancedQueryParam.options"
+      :visible.sync="advancedQueryParam.advancedQuerySettingBox"
+      v-model="value">
+    </advanced-query>
     <!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
     <el-dialog title="缂栫爜瑙勫垯浣跨敤鑼冨洿"
       append-to-body
       :visible.sync="codeRangeSettingBox"
       width="800px"
-        style="height: 116vh; margin-top: -10vh;">
+      style="height: 116vh; margin-top: -10vh;">
       <avue-crud
         :option="dialogeOption" 
         :table-loading="dialogLoading"
@@ -401,7 +418,7 @@
             <el-form-item label="鐮佹绫诲瀷" :label-width="leftFormLabelWidth" required>
               <el-select v-model="form.secType" placeholder="璇烽�夋嫨" @change="changeSectypeFormItems(null)" :disabled="basicSecOnlyRead">
                 <el-option
-                  v-for="item in sectypeList"
+                  v-for="item in enumParam.secTypeList"
                   :key="item.itemValue"
                   :label="item.itemName"
                   :value="item.itemValue">
@@ -429,7 +446,7 @@
               <el-form-item label="鐮佹闀垮害绫诲瀷:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.codeSecLengthType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                  v-for="item in codeSecLengthType"
+                  v-for="item in enumParam.codeSecLengthType"
                   :key="item.itemValue"
                   :label="item.itemName"
                   :value="item.itemValue">
@@ -486,7 +503,7 @@
               <el-form-item label="缂栫爜琛ヤ綅鏂瑰紡:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.codeFillType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option label="宸﹁ˉ浣�" value="codeattrsec"
-                    v-for="item in codeFillType"
+                    v-for="item in enumParam.codeFillType"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -496,7 +513,7 @@
               <el-form-item label="琛ヤ綅鏃剁殑瀛楃:" :label-width="rightFormLabelWidth">
                 <el-select v-model="form.codeFillSeparatorSelect" @blur="inputSelectBlur" filterable placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeFillSeparator"
+                    v-for="item in enumParam.codeFillSeparator"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -521,7 +538,7 @@
               <el-form-item label="灞傜骇绫诲瀷:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.codeLevelType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeLevelType"
+                    v-for="item in enumParam.codeLevelType"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -534,7 +551,7 @@
               <el-form-item label="瀛楃鎴彇绫诲瀷:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.valueCutType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeCutType"
+                    v-for="item in enumParam.codeCutType"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -544,7 +561,7 @@
               <el-form-item label="鍙栧�肩被鍨�:" :label-width="rightFormLabelWidth">
                 <el-select v-model="form.codeGetValueType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeGetValueType"
+                    v-for="item in enumParam.codeGetValueType"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -560,7 +577,7 @@
                   placeholder="璇烽�夋嫨"
                   prefix-icon="el-icon-search"
                   readonly="true"
-                  v-model="form.referBtmId"
+                  v-model="form.referBtmName"
                   @focus="openAttrSelectOrGetValue('referBtmId')"
                   :disabled="basicSecOnlyRead">
                   <i slot="suffix" class="el-icon-circle-close" @click="clearAttrDataByIcon('referBtmId')" style="margin-right: 5px;cursor: pointer;"></i>
@@ -590,7 +607,7 @@
               <el-form-item label="鐮佹闀垮害绫诲瀷:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.codeSecLengthType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeSecLengthType"
+                    v-for="item in enumParam.codeSecLengthType"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -623,7 +640,7 @@
               <el-form-item label="缂栫爜琛ヤ綅鏂瑰紡:" :label-width="rightFormLabelWidth" required>
                 <el-select v-model="form.codeFillType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                      v-for="item in codeFillType"
+                      v-for="item in enumParam.codeFillType"
                       :key="item.itemValue"
                       :label="item.itemName"
                       :value="item.itemValue">
@@ -633,7 +650,7 @@
               <el-form-item label="琛ヤ綅鏃剁殑瀛楃:" :label-width="rightFormLabelWidth">
                 <el-select v-model="form.codeFillSeparatorSelect" filterable @blur="inputSelectBlur" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
                   <el-option
-                    v-for="item in codeFillSeparator"
+                    v-for="item in enumParam.codeFillSeparator"
                     :key="item.itemValue"
                     :label="item.itemName"
                     :value="item.itemValue">
@@ -676,10 +693,10 @@
               <basic-container>
                 <div class="bbox">
                 <avue-crud
-                  :data="selectattrData"
-                  :option="attrOption"
-                  :table-loading="selectAttrOptionLoading"
-                  ref="selectionAttrCrud"
+                  :data="selectAttrParams.selectAttrData"
+                  :option="selectAttrParams.attrOption"
+                  :table-loading="selectAttrParams.selectAttrOptionLoading"
+                  :ref="selectAttrParams.ref"
                   @search-change="selectAttrSearchChange"
                   @search-reset="searchAttrReset"
                   @row-click="selectionAttrRowClick"
@@ -697,25 +714,27 @@
       </el-dialog>
 
       <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗璇濇缁勪欢 -->
-      <formula-editor ref="formulaEditor" 
+      <formula-editor 
+        ref="formulaEditor" 
         @updateFormulaContent="updateFormulaContent" 
-        :thisSceneTableData="thisSceneTableData"
-        :systemVariableTableData="systemVariableTableData">
+        :thisSceneTableData="formulaEditorParams.thisSceneTableData"
+        :visible.sync="formulaEditorParams.formulaEditorSettingBox"
+        :systemVariableTableData="formulaEditorParams.systemVariableTableData">
       </formula-editor>
 
       <!-- 绗簩灞傚璇濇,涓恒�愮埗鍒嗙被鐮佹銆戦�夊彇鍊煎璇濇 -->
       <el-dialog title="涓恒�愮埗鍒嗙被鐮佹銆戦�夊彇鍊�"
         append-to-body
-        :visible.sync="isShowParentClassifyOption"
+        :visible.sync="parentClsfyParams.isShowParentClassifySettingBox"
         width="65%"
         style="height: 150vh; margin-top: -13vh;"
         destroy-on-close>
         <avue-crud
-          :page.sync="parentClassifyDataPage"
-          ref="crudParentClassify"
-          :option="parentClassifyParentOption" 
-          :table-loading="classifyDialogLoading"
-          :data="parentClassifyData"
+          :page.sync="parentClsfyParams.parentClassifyDataPage"
+          :ref="parentClsfyParams.ref"
+          :option="parentClsfyParams.parentClassifyParentOption" 
+          :table-loading="parentClsfyParams.classifyDialogLoading"
+          :data="parentClsfyParams.parentClassifyData"
           @refresh-change="refreshParentClassifyDataChange"
           @search-change="parentClassifySearchChange"
           @search-reset="parentClassifySearchReset"
@@ -727,35 +746,16 @@
         </avue-crud>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="saveSelectedParentClassify">淇� 瀛�</el-button>
-          <el-button @click="isShowParentClassifyOption = false">鍙� 娑�</el-button>
+          <el-button @click="parentClsfyParams.isShowParentClassifySettingBox = false">鍙� 娑�</el-button>
         </div>
       </el-dialog>
 
-      <!-- 绗簩灞傚璇濇,涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊煎脊瀵硅瘽妗� -->
-      <el-dialog title="涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊�"
-        append-to-body
-        :visible.sync="isShowSelectReferBtmOption"
-        width="65%"
-        style="height: 150vh; margin-top: -13vh;">
-        <avue-crud
-          :page.sync="referBtmDataPage"
-          ref="crudReferBtm"
-          :option="referBtmOption" 
-          :table-loading="referBtmDialogLoading"
-          :data="referBtmData"
-          @refresh-change="referBtmDataChange"
-          @search-change="referBtmSearchChange"
-          @search-reset="referBtmSearchReset"
-          @selection-change="referBtmSelectionChange"
-          @current-change="referBtmCurrentChange"
-          @size-change="referBtmSizeChange"
-          @row-click="referBtmRowClick">
-        </avue-crud>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="saveSelectedreferBtm">淇� 瀛�</el-button>
-          <el-button @click="isShowSelectReferBtmOption = false">鍙� 娑�</el-button>
-        </div>
-      </el-dialog>
+      <!-- 绗簩灞傚璇濇,涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊煎璇濇 -->
+      <refer-btm-type-crud-dialog
+        :visible.sync="referBtmDialogParams.selectReferBtmSettingBox"
+        :ref="referBtmDialogParams.ref"
+        @echoReferBtmType="echoReferBtmType">
+      </refer-btm-type-crud-dialog>
 
       <!-- 绗簩灞傚璇濇,鑷畾涔夊弬鐓ч厤缃瓼orm缁勪欢 -->
       <refer-config-form-dialog
@@ -793,7 +793,7 @@
   import optionBasic from "@/const/code/codebasic";
   import cloneOption from "@/const/code/cloneOption";
   import cloneBasicOption from "@/const/code/cloneBasicDialogOption";
-  import cloneCodeRuleOption from "@/const/code/cloneCodeRuleDialogOption.js";
+  import cloneCodeRuleOption from "@/const/code/cloneCodeRuleDialogOption";
   import optionRule from "@/const/code/mdmrule";
   import attrOption from "@/const/code/selectAttrOptionDialog";
   import treeOption from "@/const/code/classifyTreeOptionDialog";
@@ -803,9 +803,14 @@
   import fixedValueOption from "@/const/code/fixedValueMgrDialog";
   import {mapGetters} from "vuex";
   import func from "@/util/func";
+  import {MasterTable} from "@/api/GetItem";
+import referBtmTypeCrudDialog from '../../components/code-dialog-page/referBtmTypeCrudDialog.vue';
+
   export default {
+  components: { referBtmTypeCrudDialog },
       data() {
         return {
+          value:"1",
           ruleForm: {},
           query: {},
           loading: true,
@@ -916,103 +921,107 @@
           treeOption: treeOption,
           currentSelectTreeData: '', //褰撳墠閫変腑鐨勬爲鑺傜偣
           /* 涓哄睘鎬ч�夊�煎彸渚ц〃鏍肩浉鍏虫暟鎹� */
-          attrOption: attrOption,
-          selectattrData: [],
-          selectAttrOptionLoading: false,
-          selectionChangeAttrList: [],
-          // 灞炴�х爜娈碉紝鍏紡缂栬緫妗嗙粍浠剁殑鏈満鏅樉绀哄彉閲忋�佷笌绯荤粺鍙橀噺
-          thisSceneTableData: [
-            {
-                formula: "${}",
-                desc: "",
-            }
-          ],
-          systemVariableTableData: [
-            {
-                formula: "#CURRENTUSER.OID#",
-                desc: "褰撳墠鐢ㄦ埛鐨勪富閿�",
-            },
-            {
-                formula: "#CURRENTUSER.ID#",
-                desc: "褰撳墠鐢ㄦ埛鐨勮处鎴�",
-            },
-            {
-                formula: "#CURRENTTIME#",
-                desc: "褰撳墠鏃堕棿",
-            },
-            {
-                formula: "#CURRENTDATE#",
-                desc: "褰撳墠鏃ユ湡",
-            },
-            {
-                formula: "#CURRENTDATETIME#",
-                desc: "褰撳墠鏃ユ湡鏃堕棿",
-            },
-            {
-                formula: "#CURRENTUSER_NAME#",
-                desc: "褰撳墠鐢ㄦ埛鐨勫鍚�",
-            },
-            {
-                formula: "#CURRENTUSER.SECRETGRADE#",
-                desc: "褰撳墠鐢ㄦ埛瀵嗙骇",
-            },
-            {
-                formula: "#CURRENTUSER.IPSECRET#",
-                desc: "褰撳墠鐢ㄦ埛鐨処P瀵嗙骇",
-            },
-            {
-                formula: "#CURRENTUSER.BUSINESSUNIT#",
-                desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏�",
-            },
-            {
-                formula: "#CURRENTUSER.BUSINESSUNITNAME#",
-                desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏冨悕绉�",
-            },
-            {
-                formula: "#CURRENTUSER.GROUPOID#",
-                desc: "褰撳墠鐢ㄦ埛鐨勯儴闂ㄤ富閿�",
-            },
-            {
-                formula: "#CURRENTUSER.GROUPNAME#",
-                desc: "褰撳墠鐢ㄦ埛鎵�灞為儴闂ㄥ悕绉�",
-            },
-            {
-                formula: "#CURRENTUSER.EMAIL#",
-                desc: "褰撳墠鐢ㄦ埛閭欢鍦板潃",
-            },
-            {
-                formula: "#CURRENTUSER.ROLENAME#",
-                desc: "褰撳墠鐢ㄦ埛鎵�灞炶鑹插悕绉�",
-            },
-          ],
-
-          /* 鐖跺垎绫荤爜娈靛璇濇 */
-          isShowParentClassifyOption: false, //鐖跺垎绫荤爜娈靛璇濇鏄剧ず鎺у埗
-          classifyDialogLoading: true, //琛ㄦ牸鏁版嵁鍔犺浇鎻愮ず
-          parentClassifyParentOption: parentClassifyParentOption,  //琛ㄦ牸閰嶇疆
-          parentClassifyData: [], //琛ㄦ牸鏁版嵁
-          //鍒嗛〉鍙傛暟閰嶇疆
-          parentClassifyDataPage: {
-            pageSize: 10,
-            currentPage: 1,
-            total: 0
+          
+          selectAttrParams: {
+            ref: "selectionAttrCrud",
+            attrOption: attrOption,
+            selectAttrData: [],
+            selectAttrOptionLoading: false,
+            selectionChangeAttrList: [],
+            selectAttrQeury: {},
           },
-          parentClassifyQuery: {}, //鏌ヨ鏉′欢
-          parentClassifySelectionList: [], //褰撳墠閫変腑琛�
 
+          // 灞炴�х爜娈碉紝鍏紡缂栬緫妗嗙粍浠剁殑鏈満鏅樉绀哄彉閲忋�佷笌绯荤粺鍙橀噺
+          formulaEditorParams: {
+            thisSceneTableData: [
+              {
+                  formula: "${}",
+                  desc: "",
+              }
+            ],
+            systemVariableTableData: [
+              {
+                  formula: "#CURRENTUSER.OID#",
+                  desc: "褰撳墠鐢ㄦ埛鐨勪富閿�",
+              },
+              {
+                  formula: "#CURRENTUSER.ID#",
+                  desc: "褰撳墠鐢ㄦ埛鐨勮处鎴�",
+              },
+              {
+                  formula: "#CURRENTTIME#",
+                  desc: "褰撳墠鏃堕棿",
+              },
+              {
+                  formula: "#CURRENTDATE#",
+                  desc: "褰撳墠鏃ユ湡",
+              },
+              {
+                  formula: "#CURRENTDATETIME#",
+                  desc: "褰撳墠鏃ユ湡鏃堕棿",
+              },
+              {
+                  formula: "#CURRENTUSER_NAME#",
+                  desc: "褰撳墠鐢ㄦ埛鐨勫鍚�",
+              },
+              {
+                  formula: "#CURRENTUSER.SECRETGRADE#",
+                  desc: "褰撳墠鐢ㄦ埛瀵嗙骇",
+              },
+              {
+                  formula: "#CURRENTUSER.IPSECRET#",
+                  desc: "褰撳墠鐢ㄦ埛鐨処P瀵嗙骇",
+              },
+              {
+                  formula: "#CURRENTUSER.BUSINESSUNIT#",
+                  desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏�",
+              },
+              {
+                  formula: "#CURRENTUSER.BUSINESSUNITNAME#",
+                  desc: "褰撳墠鐢ㄦ埛鎵�灞炰笟鍔″崟鍏冨悕绉�",
+              },
+              {
+                  formula: "#CURRENTUSER.GROUPOID#",
+                  desc: "褰撳墠鐢ㄦ埛鐨勯儴闂ㄤ富閿�",
+              },
+              {
+                  formula: "#CURRENTUSER.GROUPNAME#",
+                  desc: "褰撳墠鐢ㄦ埛鎵�灞為儴闂ㄥ悕绉�",
+              },
+              {
+                  formula: "#CURRENTUSER.EMAIL#",
+                  desc: "褰撳墠鐢ㄦ埛閭欢鍦板潃",
+              },
+              {
+                  formula: "#CURRENTUSER.ROLENAME#",
+                  desc: "褰撳墠鐢ㄦ埛鎵�灞炶鑹插悕绉�",
+              },
+            ],
+            formulaEditorSettingBox: false,
+          },
+          
+          /* 鐖跺垎绫荤爜娈靛璇濇 */
+          parentClsfyParams: {
+            ref: 'crudParentClassify',
+            isShowParentClassifySettingBox: false, //鐖跺垎绫荤爜娈靛璇濇鏄剧ず鎺у埗
+            classifyDialogLoading: true, //琛ㄦ牸鏁版嵁鍔犺浇鎻愮ず
+            parentClassifyParentOption: parentClassifyParentOption,  //琛ㄦ牸閰嶇疆
+            parentClassifyData: [], //琛ㄦ牸鏁版嵁
+            //鍒嗛〉鍙傛暟閰嶇疆
+            parentClassifyDataPage: {
+              pageSize: 10,
+              currentPage: 1,
+              total: 0
+            },
+            parentClassifyQuery: {}, //鏌ヨ鏉′欢
+            parentClassifySelectionList: [], //褰撳墠閫変腑琛�
+          },
           
           /** 鍙傜収寮曠敤鐨勪笟鍔$被鍨嬪璇濇鐩稿叧鏁版嵁 */
-          isShowSelectReferBtmOption: false,   //瀵硅瘽妗嗘樉绀烘帶鍒�
-          referBtmDialogLoading: true,   //琛ㄦ牸鏁版嵁鍔犺浇鎻愮ず
-          referBtmDataPage: {
-            pageSize: 10,
-            currentPage: 1,
-            total: 0
+          referBtmDialogParams: {
+            ref: 'crudReferBtm',
+            selectReferBtmSettingBox: false,
           },
-          referBtmOption: referBtmOption, //琛ㄦ牸閰嶇疆
-          referBtmData: [], //琛ㄦ牸鏁版嵁
-          referBtmQuery: {}, //鏌ヨ鏉′欢
-          referBtmSelectionList: [], //褰撳墠閫変腑琛�
 
           /** 鍩虹鐮佹鏂板琛ㄥ崟 */
           form: {
@@ -1027,79 +1036,85 @@
             componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
             pkCodeRule: '', //鎵�灞炵紪鐮佽鍒�
           },
-          // formRules: {
-          //   id: [
-          //     { required: true, message: '璇疯緭鍏ョ爜娈电紪鍙�', trigger: 'blur' },
-          //   ],
-          //   name: [
-          //     { required: true, message: '璇疯緭鍏ョ爜娈靛悕绉�', trigger: 'blur' },
-          //   ],
-          //   secType: [
-          //     { required: true, message: '璇烽�変腑鐮佹绫诲瀷', trigger: 'change' },
-          //   ],
-          //   codeSecLengthType: [
-          //     { required: true, message: '璇烽�夋嫨鐮佹闀垮害绫诲瀷', trigger: 'change' },
-          //   ],
-          //   codeSecLength: [
-          //     { required: true, message: '璇疯緭鍏ョ爜娈电殑闀垮害', trigger: ['blur', 'change']},
-          //     { type: 'number', message: '鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�',trigger: ['blur', 'change']}
-          //   ],
-          //   referAttributeName: [
-          //     { required: true, message: '璇烽�夋嫨灞炴��', trigger: 'change' },
-          //   ],
-          //   serialStart: [
-          //     { type: 'number', message: '娴佹按鍙风殑璧峰鍊煎繀椤讳负鏁板瓧鍊�',trigger: ['blur', 'change']}
-          //   ],
-          //   serialStep: [
-          //     { type: 'number', message: '娴佹按鐨勬闀垮繀椤讳负鏁板瓧鍊�',trigger: ['blur', 'change']}
-          //   ],
-          //   codeFillType: [
-          //     { required: true, message: '璇烽�夋嫨缂栫爜琛ヤ綅鏂瑰紡', trigger: ['blur', 'change']},
-          //   ],
-          //   // 璁剧疆琛ヤ綅鏃剁殑瀛楃锛岄渶瑕佽嚜瀹氫箟鏉ュ仛鍒ゆ柇
-          //   codeFillSeparatorSelect: [
-          //     { validator: validateCodeFill, trigger: ['blur', 'change'] },
-          //   ],
-          //   codeFillLength: [
-          //     { required: true, message: '璇疯緭鍏ュ~鍏呴暱搴�', trigger: ['blur', 'change'] },
-          //     { type: 'number', message: '濉厖闀垮害蹇呴』涓烘暟瀛楀��',trigger: ['blur', 'change']}
-          //   ],
-          //   codeFillLimit: [
-          //     { required: true, message: '璇疯緭鍏ユ祦姘翠笂闄�', trigger: ['blur', 'change'] },
-          //     { type: 'number', message: '娴佹按涓婇檺蹇呴』涓烘暟瀛楀��',trigger: ['blur', 'change']}
-          //   ],
-          //   codeLevelType: [
-          //     { required: true, message: '璇烽�夋嫨灞傜骇绫诲瀷', trigger: 'change' },
-          //   ],
-          //   codeLevelValue: [
-          //     { required: false, type: 'number', message: '灞傜骇鐨勫�煎繀椤讳负鏁板瓧鍊�', trigger: 'change'}
-          //   ],
-          //   valueCutType: [
-          //     { required: true, message: '璇烽�夋嫨瀛楃鎴彇绫诲瀷', trigger: 'change' },
-          //   ],
-          //   referBtmId: [
-          //     { required: true, message: '璇烽�夋嫨鍙傜収搴旂敤鐨勪笟鍔$被鍨�', trigger: 'change' },
-          //   ],
-          //   referConfig: [
-          //     { required: true, message: '璇烽�夋嫨鍙傜収閰嶇疆', trigger: 'change' },
-          //   ],
-          //   codeDateFormatStr: [
-          //     { required: true, message: '璇疯緭鍏ユ棩鏈熸牸寮�', trigger: ['blur', 'change'] },
-          //   ],
-
-          // },
+          
           //鏋氫妇鍜屽彲杈撳彲閫夋煡璇�
-          sectypeList:[],    //鐮佹绫诲瀷
-          codeSecLengthType:[],  //鐮佹闀垮害绫诲瀷
-          codeFillType:[],   //缂栫爜琛ヤ綅鏂瑰紡
-          codeFillSeparator:[], //琛ヤ綅鏃剁殑瀛楃锛屽彲杈撳彲閫夊唴瀹�
-          codeLevelType:[],     //灞傜骇绫诲瀷
-          codeCutType:[],       //瀛楃鎴彇绫诲瀷
-          codeGetValueType:[],  //鍙栧�肩被鍨�
+          enumParam: {
+            secTypeList:[],    //鐮佹绫诲瀷
+            codeSecLengthType:[],  //鐮佹闀垮害绫诲瀷
+            codeFillType:[],   //缂栫爜琛ヤ綅鏂瑰紡
+            codeFillSeparator:[], //琛ヤ綅鏃剁殑瀛楃锛屽彲杈撳彲閫夊唴瀹�
+            codeLevelType:[],     //灞傜骇绫诲瀷
+            codeCutType:[],       //瀛楃鎴彇绫诲瀷
+            codeGetValueType:[],  //鍙栧�肩被鍨�
+          },
 
           //琛ㄥ崟鍏冪礌鏍囩瀹藉害
           leftFormLabelWidth: '110px',
           rightFormLabelWidth: '150px',
+
+          // 楂樼骇鏌ヨ瀵硅瘽妗嗙浉鍏冲弬鏁�
+          advancedQueryParam: {
+            advancedQuerySettingBox: false,
+            searchForm: {
+              name: 'advanced',
+            },
+            options: {
+              labelWidth: '110px',
+              // 鏌ヨ瀛楁
+              searchfeildName: [
+                    {
+                      label: '缂栧彿',
+                      value: 'id',
+                    },
+                    {
+                      label: '鍚嶇О',
+                      value: 'name',
+                    },
+                    {
+                      label: '鐘舵��',
+                      value: 'status',
+                    },
+              ], 
+              // 鏌ヨ鏉′欢 绛変簬銆佸寘鍚�佷笉绛変簬銆佷粙浜庘�︹��
+              searchCondition: [
+                {
+                  label: '绛変簬',
+                  value: '=',
+                },
+                {
+                  label: '鍖呭惈',
+                  value: 'like',
+                },
+                {
+                  label: '澶т簬绛変簬',
+                  value: '>=',
+                },
+                {
+                  label: '灏忎簬绛変簬',
+                  value: '<=',
+                },
+                {
+                  label: '涓嶇瓑浜�',
+                  value: '!=',
+                },
+                {
+                  label: '浠嬩簬',
+                  value: 'between',
+                },
+              ], 
+              column: [
+                {
+                  type: 'text',
+                  
+                  
+                },
+                {
+                  
+                },
+              ],
+            },
+          },
+          
 
         };
       },
@@ -1114,13 +1129,20 @@
           };
         },
       },
+      created() {
+          MasterTable({
+            codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
+            functionId: 5,
+          }).then(res=>{
+            console.log(res.data.tableDefineVO.seniorQueryColumns);
+          }) 
+      },
       methods: {
 
         /* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
         updateFormulaContent(content){
           this.form.getValueClass = content;
         },
-
         /* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺~瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
         echoReferConfig(content){
           // console.log(content.referTypeName);
@@ -1130,137 +1152,72 @@
           let submitFormJson = JSON.stringify(content);
           this.form.referConfig = submitFormJson;
         },
+        /** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
+        echoReferBtmType(content){
+            // 瀹炵幇鍥炴樉
+            this.form.referBtmId = content.id;
+            this.form.referBtmName = content.name;
+        },
         
-        /** 涓哄弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷閫夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉�  */
-        // 琛ㄦ牸鏁版嵁鍒锋柊鎸夐挳
-        referBtmDataChange(){
-          this.referBtmOnLoad(this.referBtmDataPage, this.referBtmQuery);
-        },
-        saveSelectedreferBtm(){
-          if(this.referBtmSelectionList.length != 1){
-            this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
-            return false;
-          }
-          //璋冪敤瀛愮粍浠跺苟浼犻�掑綋鍓嶉�変腑鐨勫弬鏁板�硷紝瀹炵幇鍥炴樉
-          this.form.referBtmId = this.referBtmSelectionList[0].id;
-          this.form.referBtmName = this.referBtmSelectionList[0].name;
-          //娓呯┖褰撳墠閫変腑鐨勮
-          this.referBtmSelectionClear();
-          this.isShowSelectReferBtmOption = false;
-        },
-        referBtmSearchReset() {
-          this.referBtmQuery = {};
-          this.referBtmOnLoad(this.referBtmDataPage);
-        },
-        referBtmSearchChange(params, done) {
-          this.referBtmQuery = params;
-          this.referBtmDataPage.currentPage = 1;
-          this.referBtmOnLoad(this.page, params);
-          done();
-        },
-         // 鍗曞嚮閫変腑琛ㄦ牸琛屾椂瑙﹀彂
-        referBtmRowClick(row){
-          this.$refs.crudReferBtm.toggleSelection();
-          this.referBtmSelectionList = row;
-          this.$refs.crudReferBtm.setCurrentRow(row);
-          this.$refs.crudReferBtm.toggleRowSelection(row); //閫変腑褰撳墠琛�
-        },
-        referBtmSelectionChange(list) {
-          this.referBtmSelectionList = list;
-          this.$refs.crudReferBtm.setCurrentRow(this.referBtmSelectionList[list.length-1]);
-        },
-        referBtmSelectionClear() {
-          this.referBtmSelectionList = [];
-          this.$refs.crudReferBtm.toggleSelection();
-        },
-        referBtmCurrentChange(currentPage){
-          this.referBtmDataPage.currentPage = currentPage;
-        },
-        referBtmSizeChange(pageSize){
-          this.referBtmDataPage.pageSize = pageSize;
-        },
-        refreshReferBtmDataChange() {
-          this.referBtmOnLoad(this.referBtmDataPage, this.referBtmQuery);
-        },
-        //鍔犺浇涓弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷鐨勬暟鎹�
-        referBtmOnLoad(page, params = {}) {
-          //琛ㄦ牸琛岄敊浣嶉棶棰�
-          this.$nextTick(() => {
-            this.$refs.crudReferBtm.doLayout();
-          })
-          this.referBtmDialogLoading = true;
-          let oid = this.selectionList.length==0 ?  this.form.pkCodeRule:this.selectionList[0].oid;
-          Object.assign(params,{pkCodeRule:oid})
-          //鎺ュ彛杩樻湭鎻愪緵锛屽緟鏇存敼
-          refDataGridClassifySec(page.currentPage, page.pageSize, Object.assign(params, this.parentClassifyQuery)).then(res => {
-            //console.log(res.data);
-            const data = res.data.data;
-            this.referBtmDataPage.total = data.total;
-            this.referBtmData = data.records;
-            this.referBtmDialogLoading = false;
-            this.referBtmSelectionClear();
-          });
-        },
-
-
         /** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */ 
         // 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄�
         saveSelectedParentClassify(){
-          //console.log(this.parentClassifySelectionList.length);
-          if(this.parentClassifySelectionList.length != 1){
+          //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
+          if(this.parentClsfyParams.parentClassifySelectionList.length != 1){
             this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
             return false;
           }
           //鍙傛暟鍊硷紝瀹炵幇鍥炴樉
-          this.form.parentClassifySecOid = this.parentClassifySelectionList[0].oid;
-          this.form.parentClassifySecText = this.parentClassifySelectionList[0].name;
+          this.form.parentClassifySecOid = this.parentClsfyParams.parentClassifySelectionList[0].oid;
+          this.form.parentClassifySecText = this.parentClsfyParams.parentClassifySelectionList[0].name;
           //娓呯┖褰撳墠閫変腑鐨勮
           this.parentClassifySelectionClear();
-          this.isShowParentClassifyOption = false;
+          this.parentClsfyParams.isShowParentClassifySettingBox = false;
         },
         parentClassifySearchReset() {
-          this.parentClassifyQuery = {};
-          this.parentClassifyOnLoad(this.parentClassifyDataPage);
+          this.parentClsfyParams.parentClassifyQuery = {};
+          this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage);
         },
         parentClassifySearchChange(params, done) {
-          this.parentClassifyQuery = params;
-          this.parentClassifyDataPage.currentPage = 1;
+          this.parentClsfyParams.parentClassifyQuery = params;
+          this.parentClsfyParams.parentClassifyDataPage.currentPage = 1;
           this.parentClassifyOnLoad(this.page, params);
           done();
         },
         parentClassifyRowClick(row){
-          this.$refs.crudParentClassify.toggleSelection();
-          this.parentClassifySelectionList = row;
-          this.$refs.crudParentClassify.setCurrentRow(row);
-          this.$refs.crudParentClassify.toggleRowSelection(row); //閫変腑褰撳墠琛�
+          this.$refs[this.parentClsfyParams.ref].toggleSelection();
+          this.parentClsfyParams.parentClassifySelectionList = row;
+          this.$refs[this.parentClsfyParams.ref].setCurrentRow(row);
+          this.$refs[this.parentClsfyParams.ref].toggleRowSelection(row); //閫変腑褰撳墠琛�
         },
         parentClassifySelectionChange(list) {
-          this.parentClassifySelectionList = list;
-          this.$refs.crudParentClassify.setCurrentRow(this.parentClassifySelectionList[list.length-1]);
+          this.parentClsfyParams.parentClassifySelectionList = list;
+          this.$refs[this.parentClsfyParams.ref].setCurrentRow(this.parentClsfyParams.parentClassifySelectionList[list.length-1]);
         },
         parentClassifySelectionClear() {
-          this.parentClassifySelectionList = [];
-          this.$refs.crudParentClassify.toggleSelection();
+          this.parentClsfyParams.parentClassifySelectionList = [];
+          this.$refs[this.parentClsfyParams.ref].toggleSelection();
         },
         parentClassifyCurrentChange(currentPage){
-          this.parentClassifyDataPage.currentPage = currentPage;
+          this.parentClsfyParams.parentClassifyDataPage.currentPage = currentPage;
         },
         parentClassifySizeChange(pageSize){
-          this.parentClassifyDataPage.pageSize = pageSize;
+          this.parentClsfyParams.parentClassifyDataPage.pageSize = pageSize;
         },
         refreshParentClassifyDataChange() {
-          this.parentClassifyOnLoad(this.parentClassifyDataPage, this.parentClassifyQuery);
+          this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage, this.parentClsfyParams.parentClassifyQuery);
         },
         parentClassifyOnLoad(page, params = {}) {
-          this.classifyDialogLoading = true;
+          let parentClsParam = this.parentClsfyParams;
+          parentClsParam.classifyDialogLoading = true;
           let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
           Object.assign(params,{pkCodeRule:oid})
-          refDataGridClassifySec(page.currentPage, page.pageSize, Object.assign(params, this.parentClassifyQuery)).then(res => {
+          refDataGridClassifySec(page.currentPage, page.pageSize, Object.assign(params, parentClsParam.parentClassifyQuery)).then(res => {
             //console.log(res.data);
             const data = res.data.data;
-            this.parentClassifyDataPage.total = data.total;
-            this.parentClassifyData = data.records;
-            this.classifyDialogLoading = false;
+            parentClsParam.parentClassifyDataPage.total = data.total;
+            parentClsParam.parentClassifyData = data.records;
+            parentClsParam.classifyDialogLoading = false;
             this.parentClassifySelectionClear();
           });
         },
@@ -1273,48 +1230,62 @@
           this.loadlistClassifyLinkAttr()
         },
         // 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹�
-        loadlistClassifyLinkAttr(condition) {
-          //杩欏効杩橀渶瑕佸畬鍠�
-          this.selectAttrOptionLoading = true;
-          listClassifyLinkAttr({"page": 1,"limit": -1,'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid}).then(res=>{
-            console.log(res.data.data);
-            this.selectattrData = res.data.data;
-            this.selectAttrOptionLoading = false;
+        loadlistClassifyLinkAttr() {
+          let attrParam = this.selectAttrParams;
+          //console.log(this.currentSelectTreeData);
+          attrParam.selectAttrOptionLoading = true;
+          let param = {};
+          // 澶氫釜conditionMap杩欐牱浼犲弬
+          if(attrParam.selectAttrQeury){
+              Object.keys(attrParam.selectAttrQeury).forEach(key=>{
+                  param['conditionMap['+key+']'] = attrParam.selectAttrQeury[key];
+              });
+          }
+          param['conditionMap[codeClassifyOid]'] = this.currentSelectTreeData.oid;
+          param['conditionMap[btmTypeOid]'] = this.currentSelectTreeData.btmTypeOid;
+          listClassifyLinkAttr(param).then(res=>{
+            //console.log(res.data.data);
+            attrParam.selectAttrData = res.data.data;
+            attrParam.selectAttrOptionLoading = false;
+            this.$nextTick(() => {
+                this.$refs[attrParam.ref].doLayout()
+            });
           })
         },
         // 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
         selectAttrSearchChange(params, done) {
-          this.query = params;
+          this.selectAttrParams.selectAttrQeury = params;
           //console.log(params);  //杩欏効闇�瑕佹敼
-          this.loadlistClassifyLinkAttr(Object.assign(params,{'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid}));
+          this.loadlistClassifyLinkAttr();
           done();
         },
         // 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠�
         selectionAttrRowClick(row){
-          this.$refs.selectionAttrCrud.toggleSelection();
-          this.selectionChangeAttrList = row;
-          this.$refs.selectionAttrCrud.setCurrentRow(row);
-          this.$refs.selectionAttrCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+          this.$refs[this.selectAttrParams.ref].toggleSelection();
+          this.selectAttrParams.selectionChangeAttrList = row;
+          this.$refs[this.selectAttrParams.ref].setCurrentRow(row);
+          this.$refs[this.selectAttrParams.ref].toggleRowSelection(row); //閫変腑褰撳墠琛�
         },
         // 灞炴�у彇鍊煎綋鍓嶉�変腑琛屽彂鐢熷彉鍖栨椂瑙﹀彂
         selectionChangeAttr(list){
-          this.selectionChangeAttrList = list;
-          this.$refs.selectionAttrCrud.setCurrentRow(this.selectionChangeAttrList[list.length-1]);
+          this.selectAttrParams.selectionChangeAttrList = list;
+          this.$refs[this.selectAttrParams.ref].setCurrentRow(this.selectAttrParams.selectionChangeAttrList[list.length-1]);
         },
         // 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟
         searchAttrReset() {
+          this.selectAttrParams.selectAttrQeury = {};
           this.loadlistClassifyLinkAttr()
         },
         // 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉
         selectedListClassifyLinkAttr(){
-          if(this.selectionChangeAttrList.length != 1){
+          if(this.selectAttrParams.selectionChangeAttrList.length != 1){
             this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
             return false;
           }
           //璋冪敤瀛愮粍浠跺苟浼犻�掑綋鍓嶉�変腑鐨勫弬鏁板�硷紝瀹炵幇鍥炴樉
           this.form = Object.assign({}, this.form, {
-            referAttributeId:this.selectionChangeAttrList[0].id,
-            referAttributeName:this.selectionChangeAttrList[0].name,
+            referAttributeId:this.selectAttrParams.selectionChangeAttrList[0].id,
+            referAttributeName:this.selectAttrParams.selectionChangeAttrList[0].name,
             referCodeClassifyOid: this.currentSelectTreeData.key,
             referCodeClassifyOidName: this.currentSelectTreeData.title,
           })
@@ -1377,8 +1348,16 @@
               window.console.log(error);
             });
           }else {
+            if(this.codeClassifyForm.id.trim() == ''){
+              this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+              return;
+            }
+            if(this.codeClassifyForm.id.trim().length > 4 ){
+              this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�4锛�");
+              return;
+            }
             this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysecOid;
-            console.log(this.codeClassifyForm);
+            // console.log(this.codeClassifyForm);
             addSaveCodeClassifyValue(this.codeClassifyForm).then(() => {
               this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
               this.clearFixedOrClassifyForm('codeclassifyvaluesec');
@@ -2052,6 +2031,12 @@
 
 
         /** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
+        // 鎵撳紑楂樼骇鏌ヨ绐楀彛
+        openAdvancedQuery(){
+          //this.$refs.advancedQuery.visible = true;
+          //this.advancedQueryParam.timer = new Date().getTime()
+          this.advancedQueryParam.advancedQuerySettingBox = !this.advancedQueryParam.advancedQuerySettingBox;
+        },
         // 鏌ヨ浣跨敤鑼冨洿
         handleRange(){
           if(!this.tipsMessage(this.selectionList)){
@@ -2377,23 +2362,24 @@
             this.isShowSelectAttrOption = true;
           }else if(condition === 'value'){
             //鎵撳紑鍏紡缂栬緫妗嗭紝绗簩灞傚祵濂楀璇濇
-            this.$refs.formulaEditor.isShowformulaEdit = true;
+            //this.$refs.formulaEditor.isShowformulaEdit = true;
+            this.formulaEditorParams.formulaEditorSettingBox = true;
           }else if(condition === 'parentClassifySecOid'){
-            this.isShowParentClassifyOption = true;
+            this.parentClsfyParams.isShowParentClassifySettingBox = true;
           }else if(condition === 'referBtmId'){
-            this.isShowSelectReferBtmOption = true;
-            this.refreshReferBtmDataChange();
+            this.referBtmDialogParams.selectReferBtmSettingBox = true;
+            // 璋冪敤瀛愮粍浠跺埛鏂拌〃鏍兼暟鎹�
+            this.$refs[this.referBtmDialogParams.ref].referBtmOnLoad();
           }else if(condition === 'referConfig'){
             if(func.notEmpty(this.form.referConfig) || func.notEmpty(this.form.referBtmName)){
               this.openReconfigInterFace(this.form);
             }else{
               this.openTipsChooseOrCust();
             }
-             //this.$refs.referConfigFormDialog.onloadAttrData();
           }
         },
 
-        // 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬灞曢厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
+        // 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬鐓ч厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
         openReconfigInterFace(preReferConfigForm){
           // console.log(preReferConfigForm);
           this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
@@ -2458,7 +2444,7 @@
         // 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��
         changeSectypeFormItems(row){     
           //console.log(row);   
-          if(this.sectypeList.length==0){
+          if(this.enumParam.secTypeList.length==0){
             this.loadCodeSecType();
           }
           if(row != null){
@@ -2512,7 +2498,7 @@
               codeSecLength: row!=null&&row.codeSecLength != '' ? row.codeSecLength:'', //鐮佹鐨勯暱搴�
               serialStart: row!=null&&row.serialStart != '' ? row.serialStart:1,  //娴佹按鍙疯捣濮嬪��
               serialStep: row!=null&&row.serialStep != '' ? row.serialStep:1,   //娴佹按鐨勬闀�
-              codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_right', //缂栫爜琛ヤ綅鏂瑰紡
+              codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_left', //缂栫爜琛ヤ綅鏂瑰紡
               codeFillSeparatorSelect: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparatorSelect:0,    //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
               codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:0,          //琛ヤ綅鏃剁殑瀛楃
               codeFillLength: row!=null&&row.codeFillLength != '' ? row.codeFillLength:'',              //濉厖闀垮害
@@ -2573,38 +2559,38 @@
         //鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
         loadCodeSecType(){
           getDictionary({code: "codeSecType"}).then(res=>{
-            this.sectypeList = res.data.data;
+            this.enumParam.secTypeList = res.data.data;
           })
           this.loadCodeSecLength();
         },
         loadCodeSecLength(){
           getDictionary({code: "codeSecLength"}).then(res=>{
-            this.codeSecLengthType = res.data.data;
+            this.enumParam.codeSecLengthType = res.data.data;
           })
         },
         loadCodeFillType(){
           getDictionary({code: "codeFillType"}).then(res=>{
-            this.codeFillType = res.data.data;
+            this.enumParam.codeFillType = res.data.data;
           })
         },
         loadCodeFillSeparator(){
           getDictionary({code: "codeFillSeparator"}).then(res=>{
-            this.codeFillSeparator = res.data.data;
+            this.enumParam.codeFillSeparator = res.data.data;
           })
         },
         loadCodeLevelType(){
           getDictionary({code: "codeLevelType"}).then(res=>{
-            this.codeLevelType = res.data.data;
+            this.enumParam.codeLevelType = res.data.data;
           })
         },
         loadCodeCutType(){
           getDictionary({code: "codeCutType"}).then(res=>{
-            this.codeCutType = res.data.data;
+            this.enumParam.codeCutType = res.data.data;
           })
         },
         loadCodeGetValueType(){
           getDictionary({code: "codeGetValueType"}).then(res=>{
-            this.codeGetValueType = res.data.data;
+            this.enumParam.codeGetValueType = res.data.data;
           })
         },
         
@@ -2667,11 +2653,11 @@
   }
 
   .el-card__body > .treeBox {
-    height: 50vh;
+    height: 56vh;
   }
 
   .el-col-5 > .box {
-    height: 55vh;
+    height: 56vh;
   }
 
   .operator_,filter, .layui-btn{
@@ -2694,6 +2680,7 @@
   /** 鏂板鐮佹 */
   .add-basicsec-total {
     width: 100%;
+    padding: 20px 0 0 0;
   }
 
   .add-basicsec-total .el-input__inner,.add-basicsec-total .el-textarea__inner {

--
Gitblit v1.9.3