From d4e94f635dbe265f10ad614eac7386968ae30c23 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 11:25:30 +0800
Subject: [PATCH] 提交代码

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

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 807ace5..b54b160 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -99,6 +99,13 @@
               @click="clearAllCodeSec">
               娓呯┖鐮佸��
           </el-button>
+          <el-button
+              size="small"
+              icon="el-icon-guide"
+              plain
+              @click="escapeOwner">
+              杞Щ鎵�鏈夎��
+          </el-button>
         </template>
       </avue-crud>
     </basic-container>
@@ -219,6 +226,27 @@
         <el-button type="primary" @click="saveOtherCodeBasic">淇� 瀛�</el-button>
         <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
       </div>
+    </el-dialog>
+    
+    <!-- 缂栫爜瑙勫垯,杞Щ鎵�鏈夎�呭璇濇 -->
+    <el-dialog
+      :visible.sync="escapeOwnerVisible"
+      append-to-body
+      title="杞Щ鎵�鏈夎��"
+      width="30%">
+      <el-select v-model="ruleOwner" placeholder="璇烽�夋嫨" class="selects">
+        <el-option
+          v-for="item in ruleAdminUserList"
+          :key="item.VALUE"
+          :label="item.LABLE"
+          :value="item.VALUE"
+          class="seloption">
+        </el-option>
+      </el-select>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="escapeOwnerVisible = false">鍙� 娑�</el-button>
+          <el-button type="primary" @click="escapeOwnerConfirm">纭� 瀹�</el-button>
+        </span>
     </el-dialog>
 
     <!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
@@ -683,11 +711,11 @@
           </span>
         </el-form>
       </div>
-      <!-- 绗竴灞傚璇濇鐨勬寜閽拰锛岀嚎鏉� -->
+      <!-- 绗竴灞傚璇濇鐨勬寜閽拰鍒嗛殧绾挎潯 -->
       <el-divider class="horizontal-line" direction="horizontal"></el-divider>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveOrEditBasicCode" v-show="showbtn">淇� 瀛�</el-button>
-        <el-button @click="addBasicCodeSettingBox = false" v-show="showbtn">鍙� 娑�</el-button>
+        <el-button type="primary" @click="saveOrEditBasicCode" :disabled="!showbtn">淇� 瀛�</el-button>
+        <el-button @click="addBasicCodeSettingBox = false">鍙� 娑�</el-button>
       </div>
 
       <!--  绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨瀵硅瘽妗� -->
@@ -739,8 +767,8 @@
       <formula-editor
         ref="formulaEditor"
         @updateFormulaContent="updateFormulaContent"
-        :thisSceneTableData="formulaEditorParams.thisSceneTableData"
         :visible.sync="formulaEditorParams.formulaEditorSettingBox"
+        :thisSceneTableData="formulaEditorParams.thisSceneTableData"
         :systemVariableTableData="formulaEditorParams.systemVariableTableData">
       </formula-editor>
 
@@ -779,18 +807,12 @@
         @echoReferBtmType="echoReferBtmType">
       </refer-btm-type-crud-dialog>
 
-      <!-- 绗簩灞傚璇濇,鑷畾涔夊弬鐓ч厤缃瓼orm缁勪欢 -->
-      <refer-config-form-dialog
-        ref="referConfigFormDialog"
-        @echoReferConfig="echoReferConfig">
-      </refer-config-form-dialog>
-
-      <!-- 绗簩灞傚璇濇,鐩存帴閫夋嫨鍙傜収閰嶇疆crud缁勪欢 -->
-      <refer-config-crud-dialog
-        ref="referConfigCrudDialog"
-        @openReconfigInterFace="openReconfigInterFace"
-        @echoReferConfig="echoReferConfig">
-      </refer-config-crud-dialog>
+      <!-- 绗簩灞傚璇濇,鍙傜収閰嶇疆缁勪欢 -->
+      <refer-config-dialog
+        :display="referConfigVisble"
+        @setReferConfigValue="setReferConfigValue"
+        :referConfigOption="referConfigOption">
+      </refer-config-dialog>
 
     </el-dialog>
 
@@ -824,8 +846,7 @@
   import parentClassifyParentOption from "@/const/code/parentClassifyParentOptionDialog";
   import fixedValueOption from "@/const/code/fixedValueMgrDialog";
   import {mapGetters} from "vuex";
-  import func from "@/util/func";
-  import {MasterTable} from "@/api/GetItem";
+  import {getByRoleUserList} from "@/api/system/user";
 
   export default {
       data() {
@@ -859,6 +880,10 @@
           cloneBasicOption: cloneBasicOption,
           cloneCodeRuleOption: cloneCodeRuleOption,
           selectionOtherCloneCodeBasicList: [], // 褰撳墠閫変腑鐨勫熀纭�鐮佹
+          /** 杞Щ鎵�鏈夎�呭璇濇 */
+          escapeOwnerVisible: false,
+          ruleAdminUserList: [], //瑙勫垯绠$悊鍛樺垪琛�
+          ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠$悊鍛樼殑ID
 
           /*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
           codeRangeSettingBox: false,
@@ -908,7 +933,7 @@
 
           /** 鐮佸�肩鐞嗙浉鍏虫暟鎹� */
           isShowBasicSecCodeValueMgr: false, //鐮佹鐮佸�肩鐞嗗璇濇
-          codefixedsecOrCodeclassifysecOid: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
+          codefixedsecOrCodeclassifysec: '', //瀛樻斁鍩虹鐮佹鐐瑰嚮鐮佸�肩鐞嗘椂鐨勫綋鍓嶈id锛岀敤浜庝繚瀛樼爜鍊兼椂浣跨敤
           selectedFixedOrCodeclassifyValue: '', //褰撳墠閫変腑鐨勭爜鍊兼暟鎹�
           //鍥哄畾鐮佹鐮佸�艰〃鍗�
           codeFixdForm: {
@@ -931,7 +956,6 @@
           },
           classisyValueTreeOption: classisyValueTreeOption, //鍒嗙被鐮佹鏍戠浉鍏抽厤缃」
           classifyValueTreeData: [],
-          //currentSelectClsValueTreeData: '', //褰撳墠閫変腑鐨勫垎绫荤爜鍊兼爲鑺傜偣
 
           /* 涓哄睘鎬ч�夊彇鍊肩獥鍙f樉绀烘墦寮�鎺у埗鍙橀噺 */
           isShowSelectAttrOption: false,
@@ -1080,6 +1104,10 @@
             //conditionMapParams: {},
           },
 
+          //寮曠敤鐮佹涓弬鐓ч厤缃粍浠剁浉鍏冲弬鏁�
+          referConfigOption: {},
+          referConfigVisble: false,
+
         };
       },
       computed: {
@@ -1099,7 +1127,45 @@
       mounted(){
         this.loadTotalEnum();
       },
+      // 瑙e喅琛ㄦ牸閿欒闂
+      activated () {
+        this.$nextTick(() => {
+          this.$refs.crud.doLayout();
+          this.$refs.crudBasic.doLayout();
+        })
+      },
       methods: {
+
+        /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
+        escapeOwner(){
+          if (this.selectionList.length === 0) {
+            this.$message.warning("璇烽�夋嫨涓�鏉$紪鐮佽鍒欙紒");
+            return;
+          }
+          this.escapeOwnerVisible = true;
+          getByRoleUserList("瑙勫垯绠$悊鍛�").then(res=>{
+            this.ruleAdminUserList = res.data.data;
+          });
+        },
+        /** 纭杞Щ鎵�鏈夎�� */
+        escapeOwnerConfirm(){
+          if(!this.ruleOwner){
+            this.$message.warning("璇烽�夋嫨鎮ㄨ杞Щ鐨勮鍒欑鐞嗗憳锛�");
+            return;
+          }
+          this.selectionList[0].owner = this.ruleOwner;
+          let data = this.selectionList[0];
+          update(data).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "瑙勫垯杞Щ鎴愬姛!"
+            });
+            this.escapeOwnerVisible = false;
+          }, error => {
+            console.log(error);
+          });
+        },
 
         /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀浜嗗拰涔嬪墠涓�鏍风殑鏂瑰紡 */
         echoSeniorContionMap(conditionMaps){
@@ -1119,14 +1185,13 @@
           this.form.getValueClass = content;
         },
         /* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺~瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
-        echoReferConfig(content){
+        setReferConfigValue(content){
           // console.log(content.referTypeName);
           this.form.referBtmId = content.referType || '';
           this.form.referBtmName = content.referTypeName || content.referType;
           //杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
           let submitFormJson = JSON.stringify(content);
           this.form.referConfig = submitFormJson || '';
-          this.form.referValueInfo = submitFormJson || '';
         },
         /** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
         echoReferBtmType(content){
@@ -1136,7 +1201,7 @@
         },
 
         /** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
-        // 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄�
+        /** 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄� */
         saveSelectedParentClassify(){
           //console.log(this.parentClsfyParams.parentClassifySelectionList.length);
           if(this.parentClsfyParams.parentClassifySelectionList.length != 1){
@@ -1188,7 +1253,9 @@
           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(
             page.currentPage,
             page.pageSize,
@@ -1205,12 +1272,12 @@
 
 
         /** 鎵撳紑灞炴�ч�夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
-        // 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid
+        /** 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid */
         nodeClick(data) {
           this.currentSelectTreeData = data;
           this.loadlistClassifyLinkAttr()
         },
-        // 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹�
+        /** 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹� */
         loadlistClassifyLinkAttr() {
           let attrParam = this.selectAttrParams;
           //console.log(this.currentSelectTreeData);
@@ -1235,49 +1302,50 @@
             this.selectAttrParams.selectAttrQeury = {};
           })
         },
-        // 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
+        /** 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢 */
         selectAttrSearchChange(params, done) {
           this.selectAttrParams.selectAttrQeury = params;
           //console.log(params);  //杩欏効闇�瑕佹敼
           this.loadlistClassifyLinkAttr();
           done();
         },
-        // 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠�
+        /** 涓哄睘鎬ч�夊�肩晫闈紝鍗曞嚮琛ㄦ牸琛屾椂瑙﹀彂璇ヤ簨浠� */
         selectionAttrRowClick(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.selectAttrParams.selectionChangeAttrList = list;
           this.$refs[this.selectAttrParams.ref].setCurrentRow(this.selectAttrParams.selectionChangeAttrList[list.length-1]);
         },
-        // 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟
+        /** 閲嶇疆浣嶅睘鎬ч�夊彇鍊艰〃鏍肩殑鎼滅储妗嗕箣鍚庣殑鍥炶皟 */
         searchAttrReset() {
           this.selectAttrParams.selectAttrQeury = {};
           this.loadlistClassifyLinkAttr()
         },
-        // 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉
+        /** 涓哄睘鎬ч�夊彇鍊间箣鍚庣殑鍥炴樉 */
         selectedListClassifyLinkAttr(){
           if(this.selectAttrParams.selectionChangeAttrList.length != 1){
             this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�!");
             return false;
           }
+          const attr = this.selectAttrParams.selectionChangeAttrList[0];
           //璋冪敤瀛愮粍浠跺苟浼犻�掑綋鍓嶉�変腑鐨勫弬鏁板�硷紝瀹炵幇鍥炴樉
           this.form = Object.assign({}, this.form, {
-            referAttributeId:this.selectAttrParams.selectionChangeAttrList[0].id,
-            referAttributeName:this.selectAttrParams.selectionChangeAttrList[0].name,
-            referCodeClassifyOid: this.currentSelectTreeData.key,
-            referCodeClassifyOidName: this.currentSelectTreeData.title,
+            referAttributeId: attr.id || '',
+            referAttributeName: attr.name || attr.id,
+            referCodeClassifyOid: this.currentSelectTreeData.key || '',
+            referCodeClassifyOidName: this.currentSelectTreeData.title || '',
           })
           this.isShowSelectAttrOption = false;
         },
 
 
         /** 鍩虹鐮佹琛ㄤ腑鐨勭爜鍊肩鐞嗙殑鐩稿叧鏂规硶 */
-        // 鐮佸�肩鐞嗗脊绐楁帶鍒�
+        /** 鐮佸�肩鐞嗗脊绐楁帶鍒�*/
         openBasicSecCodeValueMgr(row){
           //褰撳墠涓哄浐瀹氱爜娈电爜鍊肩鐞嗙爜鍊肩鐞�
           if(row.secType === "codefixedsec"){
@@ -1288,10 +1356,10 @@
             this.isShowFixedForm = false;
             this.loadClassifyValueData(row);
           }
-          this.codefixedsecOrCodeclassifysecOid = row.oid;
+          this.codefixedsecOrCodeclassifysec = row;
           this.isShowBasicSecCodeValueMgr = true;
         },
-        //鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁
+        /** 鍔犺浇鍥哄畾鐮佹鐮佸�艰〃鏁版嵁*/
         loadFixedValueTableData(row){
           this.fixedValueOptionLoading = true;
           gridCodeFixedValue(1, -1, {"codeFixedSecOid":row.oid}).then(res=>{
@@ -1300,7 +1368,7 @@
             this.fixedValueOptionLoading = false;
           })
         },
-        //鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢
+        /** 鍗曞嚮鍥哄畾鐮佹鐨勭爜鍊艰〃涓鏃惰Е鍙戠殑浜嬩欢*/
         selectedCodeValueRow(row){
           //console.log(row);
           this.selectedFixedOrCodeclassifyValue = row;
@@ -1308,20 +1376,15 @@
           this.codeFixdForm.description = row.description;
           this.codeFixdForm.codeFixedSecOid = row.codefixedsecoid;
         },
-        //鏂板鐮佸��
+        /** 鏂板鐮佸��*/
         addCodeSecValue(condition){
           if(condition === "codefixedsec"){
-            if(this.codeFixdForm.id.trim() == ''){
-              this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+            if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
               return;
             }
-            if(this.codeFixdForm.id.trim().length >= 12 ){
-              this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�12锛�");
-              return;
-            }
-            this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysecOid;
+            this.codeFixdForm.codeFixedSecOid = this.codefixedsecOrCodeclassifysec.oid;
             addSaveCodeFixedValue(this.codeFixdForm).then(() => {
-              this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid});
+              this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid});
               this.clearFixedOrClassifyForm('codefixedsec');
               this.$message({
                 type: "success",
@@ -1331,18 +1394,13 @@
               window.console.log(error);
             });
           }else {
-            if(this.codeClassifyForm.id.trim() == ''){
-              this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+            if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
               return;
             }
-            if(this.codeClassifyForm.id.trim().length > 4 ){
-              this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�4锛�");
-              return;
-            }
-            this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysecOid;
+            this.codeClassifyForm.codeClassifySecOid = this.codefixedsecOrCodeclassifysec.oid;
             // console.log(this.codeClassifyForm);
             addSaveCodeClassifyValue(this.codeClassifyForm).then(() => {
-              this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+              this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
               this.clearFixedOrClassifyForm('codeclassifyvaluesec');
               this.$message({
                 type: "success",
@@ -1356,7 +1414,7 @@
             });
           }
         },
-        //娓呯┖鐮佸�艰〃鍗�
+        /** 娓呯┖鐮佸�艰〃鍗� */
         clearFixedOrClassifyForm(condition){
           //鐐瑰嚮鍙栨秷鏃舵竻绌鸿〃鍗曚笌褰撳墠閫変腑鐨勭爜鍊硷紝骞剁鐢ㄦ寜閽�
           this.selectedFixedOrCodeclassifyValue = '';
@@ -1372,19 +1430,34 @@
             this.codeClassifyForm = this.$options.data().codeClassifyForm;
           }
         },
-        //淇敼鐮佸��
+        /** 娣诲姞鎴栦慨鏀圭爜鍊间箣鍓嶅鐮佸�奸暱搴︽牴鎹鍒欒繘琛屾牎楠� */
+        tipsCodeSecValueMessage(id){
+          if(id.trim() == ''){
+            this.$message.warning("鐮佸�间笉鑳戒负绌猴紒");
+            return false;
+          }
+          if(id.trim().length > this.codefixedsecOrCodeclassifysec.codeSecLength ){
+            this.$message.warning("鐮佸�奸暱搴︿笉鑳藉ぇ浜�" + this.codefixedsecOrCodeclassifysec.codeSecLength);
+            return false;
+          }
+          return true;
+        },
+        /** 淇敼鐮佸�� */
         editCodeSecValue(condition){
           if(condition=='codefixedsec'){
-            //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涙瘮瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佺┛鍏朵粬鍙傛暟鐨勮鑷娣诲姞
+            if(!this.tipsCodeSecValueMessage(this.codeFixdForm.id)){
+              return;
+            }
+            //浠ュ墠鏄洿鎺ユ妸褰撳墠閫変腑琛岀殑鎵�鏈夋暟鎹兘杩涜鎻愪氦锛屼絾鍏跺疄鍙渶瑕佷紶杈撲竴浜涘繀瑕佸弬鏁板嵆鍙紝杩欏効鍋氫簡淇敼锛岄渶瑕佷紶鍏朵粬鍙傛暟鐨勮鑷娣诲姞
             let editData = {
-            "oid": this.selectedFixedOrCodeclassifyValue.oid,
-            "ts": new Date().getTime(),
-            "description": this.codeFixdForm.description,
-            "id": this.codeFixdForm.id,
-            "codeFixedSecOid":  this.selectedFixedOrCodeclassifyValue.codefixedsecoid
+              "oid": this.selectedFixedOrCodeclassifyValue.oid,
+              "ts": new Date().getTime(),
+              "description": this.codeFixdForm.description,
+              "id": this.codeFixdForm.id,
+              "codeFixedSecOid":  this.selectedFixedOrCodeclassifyValue.codefixedsecoid
             }
             editCodeFixedValue(editData).then(() => {
-                this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+                this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
                 this.$message({
                   type: "success",
                   message: "鎿嶄綔鎴愬姛!"
@@ -1393,9 +1466,17 @@
                 window.console.log(error);
             });
           }else {
+            if(!this.tipsCodeSecValueMessage(this.codeClassifyForm.id)){
+              return;
+            }
             this.codeClassifyForm.oid = this.selectedFixedOrCodeclassifyValue.attributes.oid;
+            // 鍒嗙被鐮佹锛屽瓙鍒嗙被鍜岀埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰鏇存敼
+            if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
+              return;
+            }
+            this.$delete(this.codeClassifyForm,"parentClassifyValueOid");
             editCodeClassifyValue(this.codeClassifyForm).then(() => {
-                this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+                this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
                 this.$message({
                   type: "success",
                   message: "鎿嶄綔鎴愬姛!"
@@ -1406,7 +1487,7 @@
           }
 
         },
-        //鍒犻櫎鐮佸��
+        /** 鍒犻櫎鐮佸�� */
         delCodeSecValue(condition){
           //鍥哄畾鐮佹鐮佸�煎垹闄�
           if(condition == 'codefixedsec'){
@@ -1422,7 +1503,7 @@
             })
             .then(() => {
               this.selectedFixedOrCodeclassifyValue = '';
-              this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysecOid})
+              this.loadFixedValueTableData({"oid":this.codefixedsecOrCodeclassifysec.oid})
               this.clearFixedOrClassifyForm('codefixedsec');
               this.$message({
                 type: "success",
@@ -1430,6 +1511,9 @@
               });
             });
           }else{
+            if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
+              return;
+            } 
             //鍒嗙被鐮佹鐮佸�煎垹闄�
             this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
               confirmButtonText: "纭畾",
@@ -1442,7 +1526,7 @@
             })
             .then(() => {
               this.selectedFixedOrCodeclassifyValue = '';
-              this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
+              this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid})
               this.clearFixedOrClassifyForm('codeclassifyvalue');
               this.$message({
                 type: "success",
@@ -1450,9 +1534,8 @@
               });
             });
           }
-
         },
-        //瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+        /** 瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
         codeFixedValueOpetion(condition,row){
           //console.log(this.fixedValueData[row.$index].orderNum);
           const index = row.$index;
@@ -1488,12 +1571,15 @@
           }
           //console.log(this.fixedValueData);
         },
-        //瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
+        /** 瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�*/
         codeClassifyValueOpetion(condition){
+          if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysec.oid,this.codeClassifyForm.codeClassifySecOid)){
+            return;
+          } 
           //姝ゅ娑夊強鍒版繁娴呮嫹璐濋棶棰橈紝浣嗘槸鎵ц涓婁笅绉讳繚瀛樻搷浣滀箣鍚庝細閲嶆柊鍔犺浇treedata锛屾墍浠ュ奖鍝嶄笉澶�
           let currentTreeList = this.getCodeClassifyValueTreeData();
           let saveData = [];
-          console.log(currentTreeList.treeList);
+          // console.log(currentTreeList.treeList);
           if(condition == 'up'){
             if(currentTreeList.index-1>=0){
               // 璋冩暣椤哄簭
@@ -1513,10 +1599,8 @@
               this.saveCodeFixedOrClassifyValueOption('classifyValue',saveData);
             }
           }
-          console.log(saveData);
-          console.log(this.classifyValueTreeData);
         },
-        //閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣
+        /** 閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣*/
         getCodeClassifyValueTreeData(){
           const currentNodeTreeData = this.selectedFixedOrCodeclassifyValue;
           /**鑰冭檻鍑犵鎯呭喌锛岀涓�绉嶅綋鍓嶄笂绉粅涓嬬Щ鎿嶄綔宸茬粡鏄竟鐣岋紝
@@ -1552,12 +1636,12 @@
             }
           }
         },
-        //涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨
-        saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
+        /** 涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨*/
+        async saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
           //淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
           if(condition == "fixedValue"){
             let data = {
-            "codeFixedSecOid": this.codefixedsecOrCodeclassifysecOid,
+            "codeFixedSecOid": this.codefixedsecOrCodeclassifysec.oid,
             "dtoList": JSON.stringify(this.fixedValueData),
             }
             saveOrder(data).then(() => {
@@ -1572,8 +1656,8 @@
             });
           }else {
             //淇濆瓨瀵瑰垎绫荤爜鍊肩爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
-            saveCodeClassifyValueOrder({
-              "codeClassifySecOid": this.codefixedsecOrCodeclassifysecOid,
+            await saveCodeClassifyValueOrder({
+              "codeClassifySecOid": this.codefixedsecOrCodeclassifysec.oid,
               "dtoList": JSON.stringify(editOrderNumdata),
             }).then(() => {
               this.$message({
@@ -1583,11 +1667,11 @@
               }, error => {
                 window.console.log(error);
             });
-            this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
+            this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysec.oid});
           }
 
         },
-        //鍒嗙被鐮佸�兼爲data鍔犺浇
+        /** 鍒嗙被鐮佸�兼爲data鍔犺浇*/
         loadClassifyValueData(row){
           //console.log(row);
           let condtionData = {
@@ -1603,7 +1687,7 @@
             //console.log(res.data);
           });
         },
-        //鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢
+        /** 鍒嗙被鐮佸�兼爲鍗曞嚮鏃惰Е鍙戠殑浜嬩欢*/
         classisyValueTreeOnodeClick(node){
           //console.log(node);
           this.selectedFixedOrCodeclassifyValue = node;
@@ -1611,17 +1695,431 @@
           this.codeClassifyForm.id = node.attributes.id;
           this.codeClassifyForm.name = node.attributes.name;
           this.codeClassifyForm.parentClassifyValueOid = node.attributes.oid;
-          //console.log(this.codeClassifyForm);
+          // console.log(this.codeClassifyForm);
+        },
+        /**
+         * 鍒嗙被鐮佹鐮佸�硷紝淇敼銆佸垹闄ゃ�佷笂涓嬬Щ涔嬪墠锛屾鏌ユ槸鍚︿负瀛愬垎绫诲拰鐖跺垎绫讳箣闂寸浉浜掓洿鏀�
+         * @currentRowClassOid 褰撳墠閫変腑琛宱id
+         * @updateClassOid 瑕佷慨鏀圭殑鍒嗙被鐮佸�紀id
+         */
+        checkClassUpdate(currentRowClassOid,updateClassOid){
+          if(currentRowClassOid!=updateClassOid){
+            this.$message({
+              type: "error",
+              message: "鎿嶄綔澶辫触銆愬瓙鍒嗙被涓庣埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰淇敼鐮佸�笺��!"
+            });
+          }
+          return currentRowClassOid!=updateClassOid;
+        },
+
+        /** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
+        /** 鎵撳紑楂樼骇鏌ヨ绐楀彛 */
+        openAdvancedQuery(condition){
+          if(condition=='codeRule'){
+            this.advancedQueryParam.options = [
+              {
+                data: [],
+                title: '缂栧彿',
+                fieldType: 'text',
+                queryField: 'id',
+              },{
+                data: [],
+                title: '鍚嶇О',
+                fieldType: 'text',
+                queryField: 'name',
+              },{
+                data: [],
+                title: '鎻忚堪',
+                fieldType: 'text',
+                queryField: 'description',
+              },{
+                data: [
+                  // {
+                  //   key: '缂栬緫涓�',
+                  //   value: 'Editing',
+                  // },
+                  // {
+                  //   key: '宸插彂甯�',
+                  //   value: 'Released',
+                  // },
+                  // {
+                  //   key: '鍋滅敤',
+                  //   value: 'Disabled',
+                  // },
+                ],
+                title: '鐘舵��',
+                fieldType: 'combox',
+                queryField: 'lcStatus',
+                comboxKey: 'codeSearchLCStatus',
+              },
+            ]
+          }else {
+            this.advancedQueryParam.options = [
+              {
+                data: [],
+                title: '鐮佹缂栧彿',
+                fieldType: 'text',
+                queryField: 'id',
+              },{
+                data: [],
+                title: '鐮佹鍚嶇О',
+                fieldType: 'text',
+                queryField: 'name',
+              },{
+                data: [],
+                title: '鎻忚堪',
+                fieldType: 'text',
+                queryField: 'description',
+              },{
+                data: [],
+                title: '鐮佹绫诲瀷',
+                fieldType: 'combox',
+                queryField: 'secType',
+                comboxKey: 'codeSecType',
+              }
+            ]
+          }
+          this.advancedQueryParam.currentOpen = condition;
+          this.advancedQueryParam.advancedQuerySettingBox = true;
+        },
+        /** 鏌ヨ浣跨敤鑼冨洿*/
+        handleRange(){
+          if(!this.tipsMessage(this.selectionList)){
+            return;
+          }
+          this.codeRangeSettingBox = true;
+          this.getRangeCodeList()
+        },
+        /** 鍔犺浇浣跨敤鑼冨洿鍒楄〃*/
+        getRangeCodeList(){
+          this.dialogLoading = true;
+          if(this.selectionList[0].oid==null){
+            this.$message.error("鏈幏鍙栧埌鍙傛暟!");
+          }
+
+          listUseRange(this.selectionList[0].oid).then(res => {
+            this.useRangeData = res.data.data;
+            //console.log(this.useRangeData);
+            this.dialogLoading = false;
+          });
+        },
+        /** 鍒锋柊浣跨敤鑼冨洿鍒楄〃*/
+        refreshUseRangeChange(){
+          this.getRangeCodeList();
+        },
+        /** 鍚敤涓庡仠鐢�*/
+        enableOrDeactivatse(oId,update){
+          updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+          }, error => {
+            window.console.log(error);
+          });
+        },
+        /** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
+        openCodeRuleDialog() {
+          if (!this.tipsMessage(this.selectionList)) {
+            return;
+          }
+          this.cloneSettingBox = true;
+          this.cloneCodeRuleForm.id = this.selectionList[0].id;
+          this.cloneCodeRuleForm.name = this.selectionList[0].name;
+          this.cloneCodeRuleForm.description = this.selectionList[0].description;
+          this.loadBasic({"oid": this.selectionList[0].oid});
+        },
+        /** 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘*/
+        saveCloneCodeRule(){
+          let form = this.cloneCodeRuleForm;
+          if(form.id.trim()==''){
+            this.$message.warning("缂栧彿涓嶈兘涓虹┖!");
+            return;
+          }
+          if(form.name.trim()==''){
+            this.$message.warning("鐮佸�间笉鑳戒负绌�!");
+            return;
+          }
+          this.selectionList[0].oid = '';
+          this.selectionList[0].id = form.id;
+          this.selectionList[0].name = form.name;
+          this.selectionList[0].description = form.description;
+          this.selectionList[0].createTime = new Date().getTime();
+          this.selectionList[0].ts = new Date(this.selectionList[0].ts).getTime();
+          this.selectionList[0].lcStatus = 'Editing';
+          let data = Object.assign({}, this.selectionList[0],{elements:this.cloneData});
+          clone(data).then(() => {
+            this.cloneSettingBox = false;
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+          }, error => {
+            window.console.log(error);
+          });
+          //console.log(data);
+        },
+        /** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
+        openOtherCodeRuleDialog(){
+          if (!this.tipsMessage(this.selectionList)) {
+            return;
+          }
+          if(this.selectionList[0].lcStatus != 'Editing'){
+            this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!");
+            return;
+          }
+          this.cloneOtherCodeRuleSettingBox = true;
+        },
+        //** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
+        codeOtherCloneRuleRowClick(row) {
+          this.$refs.crudCloneCodeRuleOther.toggleSelection();
+          this.selectionOtherCloneCodeRuleList = row;
+          this.$refs.crudCloneCodeRuleOther.setCurrentRow(row);
+          this.$refs.crudCloneCodeRuleOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
+          this.loadBasic(row);
+        },
+        /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨*/
+        codeOtherCloneBasicRowClick(row){
+          this.$refs.crudCloneCodeBasicOther.toggleSelection();
+          this.selectionOtherCloneCodeBasicList = row;
+          this.$refs.crudCloneCodeBasicOther.setCurrentRow(row);
+          this.$refs.crudCloneCodeBasicOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
+        },
+        /** 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
+        selectionOtherCloneCodeRuleChange(list) {
+          //console.log(list);
+          this.selectionOtherCloneCodeRuleList = list;
+          this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
+          if(list == ''){
+            this.basicData = [];
+          }
+          if(this.selectionOtherCloneCodeRuleList.length > 0){
+            this.loadBasic(this.selectionOtherCloneCodeRuleList[list.length-1]);
+          }
+        },
+        selectionOtherCloneCodeBasicChange(list){
+          this.selectionOtherCloneCodeBasicList = list;
+          this.$refs.crudCloneCodeBasicOther.setCurrentRow(this.selectionOtherCloneCodeBasicList[list.length-1]);
+        },
+        /** 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅*/
+        saveOtherCodeBasic(){
+          let oid = this.selectionList[0].oid;
+          let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
+          if(fromDialogPkCodebasic.length <= 0){
+            this.$message.warning("璇烽�夋嫨鐮佹鏁版嵁!");
+            return;
+          }
+          let res = fromDialogPkCodebasic.filter((item) => {
+            return item.pkCodeRule == oid;
+          });
+          if(res != ''){
+            this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!");
+            return;
+          }
+          //console.log(res);
+          let oidArr = [];
+          fromDialogPkCodebasic.forEach(ele => {
+            oidArr.push(ele.oid);
+          });
+          let data = {
+            "pkCodeRule": oid,
+            "oidArr": oidArr.join(","),
+          }
+          //console.log(data);
+          cloneCodeBasic(data).then(() => {
+            this.cloneOtherCodeRuleSettingBox = false;
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+          }, error => {
+            window.console.log(error);
+          });
+        },
+        /** 娓呯┖鐮佸��*/
+        clearAllCodeSec(){
+          if(this.selectionList.length == 0){
+            this.$message.warning("娌℃湁閫夋嫨鏁版嵁!");
+            return;
+          }
+          if(this.selectionList.length != 1){
+            this.$message.warning("姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+            return;
+          }
+          let currentData = this.selectionList[0];
+          this.$confirm("纭畾瑕佹竻绌虹爜鍊硷紵濡傛灉娓呯┖灏嗕笉鑳借鎭㈠锛岃璋ㄦ厧锛�", {
+              confirmButtonText: "纭畾",
+              cancelButtonText: "鍙栨秷",
+              type: "warning"
+            })
+            .then(() => {
+              let ts = new Date(currentData.ts).getTime();
+              return clearAllCode({"oid": currentData.oid,"ts": ts});
+            })
+            .then(() => {
+              this. this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "鎿嶄綔鎴愬姛!"
+              });
+            });
+        },
+        /** 娣诲姞*/
+        rowSave(row, done, loading) {
+          console.log(row);
+          add(row).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+            done();
+          }, error => {
+            loading();
+            window.console.log(error);
+          });
+        },
+        openEdit(row){
+          this.$refs.crud.rowEdit(row,row.$index);
+        },
+        /** 淇敼*/
+        rowUpdate(row, index, done, loading) {
+          row.ts = new Date().getTime;
+          update(row).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "鎿嶄綔鎴愬姛!"
+            });
+            done();
+          }, error => {
+            loading();
+            console.log(error);
+          });
+        },
+        /** 鍒犻櫎*/
+        handleDelete() {
+          if(!this.tipsMessage(this.selectionList)){
+            return;
+          }
+          this.$confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?", {
+            confirmButtonText: "纭畾",
+            cancelButtonText: "鍙栨秷",
+            type: "warning"
+          })
+            .then(() => {
+              // 鍙敮鎸佹瘡娆″崟鏉¤褰曞垹闄�
+              let oid = this.selectionList[0].oid;
+              let ts = new Date(this.selectionList[0].ts).getTime();
+              return remove({oid: oid,ts: ts});
+            })
+            .then(() => {
+              this.onLoad(this.page);
+              this.$message({
+                type: "success",
+                message: "鎿嶄綔鎴愬姛!"
+              });
+              this.$refs.crud.toggleSelection();
+            });
+        },
+        // 鎵撳紑淇敼*/
+        beforeOpen(done, type) {
+          if (["edit", "view"].includes(type)) {
+            getDetail(this.ruleForm.oid).then(res => {
+              this.ruleForm = res.data.data;
+            });
+          }
+          done();
+        },
+        searchReset() {
+          this.query = {};
+          this.onLoad(this.page);
+        },
+        searchChange(params, done) {
+          this.page.currentPage = 1;
+          // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+          let requestData = {};
+          if(params){
+            Object.keys(params).forEach(key=>{
+              requestData["conditionMap"+'['+key+'_like]'] = params[key].trim();
+            });
+          }
+          this.query = requestData;
+          this.onLoad(this.page);
+          done();
+        },
+        /** 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�*/
+        selectionChange(list) {
+          this.selectionList = list;
+          //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
+          if(this.selectionList.length <= 0){
+            this.hideBasicTable(false);
+          }
+          if (this.selectionList.length > 0) {
+            this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
+            this.currentCodeRuleOid = this.selectionList[list.length-1].oid;
+            this.currentRuleLcStatus = this.selectionList[list.length-1].lcStatus;
+            this.loadBasic(this.selectionList[list.length-1]);
+          }
+        },
+        /** 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨*/
+        codeRuleRowClick (row) {
+          // console.log(this.currentRuleLcStatus);
+          this.$refs.crud.toggleSelection();
+          this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+
+        },
+        selectionClear() {
+          this.selectionList = [];
+          this.$refs.crud.toggleSelection();
+        },
+        currentChange(currentPage){
+          this.page.currentPage = currentPage;
+        },
+        sizeChange(pageSize){
+          this.page.pageSize = pageSize;
+        },
+        refreshChange() {
+          this.onLoad(this.page, this.query);
+        },
+        onLoad(page,params={}) {
+          this.loading = true;
+          gridCodeRule(
+            page.currentPage,
+            page.pageSize,
+            this.query
+          ).then(res => {
+            //console.log(res.data);
+            const data = res.data.data;
+            this.page.total = data.total;
+            this.data = data.records;
+            this.loading = false;
+            // 鏌ヨ鐨勫�间负绌烘椂锛岃灏嗙爜娈电鐞嗙浉鍏崇殑鍐呭绂佺敤
+            if(data.records.length <= 0) {
+              this.hideBasicTable(false);
+              return;
+            }
+            this.loadBasic(this.data[0])
+            this.$nextTick(() => {
+              this.$refs.crud.toggleRowSelection(this.data[0]);
+              this.$refs.crud.setCurrentRow(this.data[0]);
+            })
+            this.selectionList = data.records[0];
+            //this.selectionClear();
+          });
         },
 
 
         /** 鍩虹鐮佹鐩稿叧鏂规硶 */
-        //闃叉鎵撳紑杩囩紪杈戠獥鍙d箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
+        /** 闃叉鎵撳紑杩囩紪杈戠獥鍙d箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��*/
         clearBasicAddForm(){
           this.form = this.$options.data().form;
           // this.changeSectypeFormItems(null);
         },
-        // 鎵撳紑鏂板绐楀彛
+        /** 鎵撳紑鏂板绐楀彛*/
         openAddBasicCodeSec(){
           if(!this.tipsMessage(this.selectionList)){
             return;
@@ -1633,7 +2131,7 @@
           this.openBasicDialog('add',null);
           this.loadCodeSecType();
         },
-        // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
+        /** 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�*/
         openBasicDialog(condition,row){
           //console.log(row);
           if(condition == 'add') {
@@ -1658,7 +2156,7 @@
           this.changeSectypeFormItems(condition == 'add' ? null:row);
           this.addBasicCodeSettingBox = true;
         },
-        // 鏂板鍩虹鐮佹
+        /** 鏂板鍩虹鐮佹*/
         async saveOrEditBasicCode(){
           if(this.selectionList[0].oid == null ||  this.selectionList[0].oid == ''){
             this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
@@ -1687,8 +2185,8 @@
               referConfig.referType = this.form.referBtmId;
               referConfig.referTypeName = this.form.referBtmName;
               this.form.referConfig = JSON.stringify(referConfig);
-              let referValueInfo = JSON.parse(this.form.referValueInfo);
-              referValueInfo.referType = this.form.referBtmId;
+              // let referValueInfo = JSON.parse(this.form.referValueInfo);
+              // referValueInfo.referType = this.form.referBtmId;
             }
             editSave(this.form).then(() => {
               this.$message({
@@ -1703,7 +2201,7 @@
             this.addBasicCodeSettingBox = false
           }
         },
-        // 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�
+        /** 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
         checkForm(){
           let form = this.form;
           //console.log(form);
@@ -1884,7 +2382,7 @@
           }
           return true;
         },
-        // 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁
+        /** 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁*/
         tipsMessage(list){
           if(list.length != 1){
             this.$message.warning("璇烽�夋嫨涓�鏉$紪鐮佽鍒欐暟鎹�!");
@@ -1892,7 +2390,7 @@
           }
           return true;
         },
-        // 鍩虹鐮佹鍒犻櫎
+        /** 鍩虹鐮佹鍒犻櫎*/
         deleteBasicCode(){
           if(!this.tipsMessage(this.selectionBasicList)){
             return;
@@ -1916,7 +2414,7 @@
             this.$refs.crudBasic.toggleSelection();
           });
         },
-        // 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅
+        /** 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅*/
         loadBasic(row){
           if(this.cloneSettingBox){
             this.cloneTableLoading = true;
@@ -1931,7 +2429,7 @@
             this.sendGridCodeBasicSec({"pkCodeRule":row.oid},false);
           }
         },
-        // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
+        /** 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�*/
         sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
           // 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
           if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
@@ -1960,13 +2458,13 @@
             }
           });
         },
-        // 鍩虹鐮佹閫変腑鏃惰Е鍙�
+        /** 鍩虹鐮佹閫変腑鏃惰Е鍙�*/
         selectionBasicChange(list) {
           this.selectionBasicList = list;
           this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
           //console.log(this.selectionBasicList);
         },
-        // 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�
+        /** 鍩虹鐮佹琚崟鍑昏〃鏍艰鏃惰Е鍙�*/
         codeBasicSecRowClick(row){
           this.$refs.crudBasic.toggleSelection();
           this.selectionBasicList = row;
@@ -1981,8 +2479,8 @@
         basicSearchReset(){
           this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
         },
-        // 涓婄Щ涓嬬Щ鍩虹鐮佹
-        upOrderNum(row){
+        /** 涓婄Щ涓嬬Щ鍩虹鐮佹*/
+        async upOrderNum(row){
           if(!this.tipsMessage(this.selectionList)){
             return;
           }
@@ -1994,7 +2492,7 @@
             this.$message.warning("鏈幏鍙栧埌蹇呭~鍙傛暟!");
             return;
           }
-          upOrderNum(row.oid).then(() => {
+          await upOrderNum(row.oid).then(() => {
             this.loadBasic(this.selectionList[0]);
             this.$message({
               type: "success",
@@ -2025,374 +2523,18 @@
             });
           })
         },
-        // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
+        /** 鍩虹鐮佹鍒锋柊鏃舵煡璇�*/
         refreshChangeBasicSec(){
           this.loadBasic(this.selectionList.at(-1));
         },
-        // 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌
+        /** 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌*/
         hideBasicTable(hideBoolean){
           this.$refs.crudBasic.option.refreshBtn = hideBoolean;
-          this.$refs.crudBasic.option.columnBtn = hideBoolean;
           this.$refs.crudBasic.option.column[0].search = hideBoolean;
           this.$refs.crudBasic.option.column[1].search = hideBoolean;
           if(!hideBoolean){
             this.selectionList = [];
             this.basicData = [];
-          }
-        },
-
-
-        /** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
-        // 鎵撳紑楂樼骇鏌ヨ绐楀彛
-        openAdvancedQuery(condition){
-          if(condition=='codeRule'){
-            this.advancedQueryParam.options = [
-              {
-                data: [],
-                title: '缂栧彿',
-                fieldType: 'text',
-                queryField: 'id',
-              },{
-                data: [],
-                title: '鍚嶇О',
-                fieldType: 'text',
-                queryField: 'name',
-              },{
-                data: [],
-                title: '鎻忚堪',
-                fieldType: 'text',
-                queryField: 'description',
-              },{
-                data: [
-                  // {
-                  //   key: '缂栬緫涓�',
-                  //   value: 'Editing',
-                  // },
-                  // {
-                  //   key: '宸插彂甯�',
-                  //   value: 'Released',
-                  // },
-                  // {
-                  //   key: '鍋滅敤',
-                  //   value: 'Disabled',
-                  // },
-                ],
-                title: '鐘舵��',
-                fieldType: 'combox',
-                queryField: 'lcStatus',
-                comboxKey: 'codeSearchLCStatus',
-              },
-            ]
-          }else {
-            this.advancedQueryParam.options = [
-              {
-                data: [],
-                title: '鐮佹缂栧彿',
-                fieldType: 'text',
-                queryField: 'id',
-              },{
-                data: [],
-                title: '鐮佹鍚嶇О',
-                fieldType: 'text',
-                queryField: 'name',
-              },{
-                data: [],
-                title: '鎻忚堪',
-                fieldType: 'text',
-                queryField: 'description',
-              },{
-                data: [],
-                title: '鐮佹绫诲瀷',
-                fieldType: 'combox',
-                queryField: 'secType',
-                comboxKey: 'codeSecType',
-              }
-            ]
-          }
-          this.advancedQueryParam.currentOpen = condition;
-          this.advancedQueryParam.advancedQuerySettingBox = true;
-        },
-        // 鏌ヨ浣跨敤鑼冨洿
-        handleRange(){
-          if(!this.tipsMessage(this.selectionList)){
-            return;
-          }
-          this.codeRangeSettingBox = true;
-          this.getRangeCodeList()
-        },
-        // 鍔犺浇浣跨敤鑼冨洿鍒楄〃
-        getRangeCodeList(){
-          this.dialogLoading = true;
-          if(this.selectionList[0].oid==null){
-            this.$message.error("鏈幏鍙栧埌鍙傛暟!");
-          }
-
-          listUseRange(this.selectionList[0].oid).then(res => {
-            this.useRangeData = res.data.data;
-            //console.log(this.useRangeData);
-            this.dialogLoading = false;
-          });
-        },
-        // 鍒锋柊浣跨敤鑼冨洿鍒楄〃
-        refreshUseRangeChange(){
-          this.getRangeCodeList();
-        },
-        // 鍚敤涓庡仠鐢�
-        enableOrDeactivatse(oId,update){
-          updateStatus({"oid":oId,"ts":new Date().getTime,"update":update}).then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "鎿嶄綔鎴愬姛!"
-            });
-          }, error => {
-            window.console.log(error);
-          });
-        },
-        // 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�
-        openCodeRuleDialog() {
-          if (!this.tipsMessage(this.selectionList)) {
-            return;
-          }
-          this.cloneSettingBox = true;
-          this.cloneCodeRuleForm.id = this.selectionList[0].id;
-          this.cloneCodeRuleForm.name = this.selectionList[0].name;
-          this.cloneCodeRuleForm.description = this.selectionList[0].description;
-          this.loadBasic({"oid": this.selectionList[0].oid});
-        },
-        // 鍏嬮殕缂栫爜瑙勫垯淇濆瓨鍔熻兘
-        saveCloneCodeRule(){
-          let form = this.cloneCodeRuleForm;
-          if(form.id.trim()==''){
-            this.$message.warning("缂栧彿涓嶈兘涓虹┖!");
-            return;
-          }
-          if(form.name.trim()==''){
-            this.$message.warning("鐮佸�间笉鑳戒负绌�!");
-            return;
-          }
-          this.selectionList[0].oid = '';
-          this.selectionList[0].id = form.id;
-          this.selectionList[0].name = form.name;
-          this.selectionList[0].description = form.description;
-          this.selectionList[0].createTime = new Date().getTime();
-          this.selectionList[0].ts = new Date(this.selectionList[0].ts).getTime();
-          this.selectionList[0].lcStatus = 'Editing';
-          let data = Object.assign({}, this.selectionList[0],{elements:this.cloneData});
-          clone(data).then(() => {
-            this.cloneSettingBox = false;
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "鎿嶄綔鎴愬姛!"
-            });
-          }, error => {
-            window.console.log(error);
-          });
-          //console.log(data);
-        },
-        // 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�
-        openOtherCodeRuleDialog(){
-          if (!this.tipsMessage(this.selectionList)) {
-            return;
-          }
-          if(this.selectionList[0].lcStatus != 'Editing'){
-            this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!");
-            return;
-          }
-          this.cloneOtherCodeRuleSettingBox = true;
-        },
-        // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
-        codeOtherCloneRuleRowClick(row) {
-          this.$refs.crudCloneCodeRuleOther.toggleSelection();
-          this.selectionOtherCloneCodeRuleList = row;
-          this.$refs.crudCloneCodeRuleOther.setCurrentRow(row);
-          this.$refs.crudCloneCodeRuleOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
-          this.loadBasic(row);
-        },
-        // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮鍩虹鐮佹瀹炵幇琛岄�夋嫨
-        codeOtherCloneBasicRowClick(row){
-          this.$refs.crudCloneCodeBasicOther.toggleSelection();
-          this.selectionOtherCloneCodeBasicList = row;
-          this.$refs.crudCloneCodeBasicOther.setCurrentRow(row);
-          this.$refs.crudCloneCodeBasicOther.toggleRowSelection(row); //閫変腑褰撳墠琛�
-        },
-        // 浠庡叾浠栬鍒欏厠闅嗙爜娈电晫闈腑缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
-        selectionOtherCloneCodeRuleChange(list) {
-          //console.log(list);
-          this.selectionOtherCloneCodeRuleList = list;
-          this.$refs.crudBasic.setCurrentRow(this.selectionBasicList[list.length-1]);
-          if(list == ''){
-            this.basicData = [];
-          }
-          if(this.selectionOtherCloneCodeRuleList.length > 0){
-            this.loadBasic(this.selectionOtherCloneCodeRuleList[list.length-1]);
-          }
-        },
-        selectionOtherCloneCodeBasicChange(list){
-          this.selectionOtherCloneCodeBasicList = list;
-          this.$refs.crudCloneCodeBasicOther.setCurrentRow(this.selectionOtherCloneCodeBasicList[list.length-1]);
-        },
-        // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅
-        saveOtherCodeBasic(){
-          let oid = this.selectionList[0].oid;
-          let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
-          if(fromDialogPkCodebasic.length <= 0){
-            this.$message.warning("璇烽�夋嫨鐮佹鏁版嵁!");
-            return;
-          }
-          let res = fromDialogPkCodebasic.filter((item) => {
-            return item.pkCodeRule == oid;
-          });
-          if(res != ''){
-            this.$message.warning("闇�瑕佸厠闅嗙殑缂栫爜瑙勫垯涓庤鍏嬮殕鐨勭紪鐮佽鍒欑浉鍚�!");
-            return;
-          }
-          //console.log(res);
-          let oidArr = [];
-          fromDialogPkCodebasic.forEach(ele => {
-            oidArr.push(ele.oid);
-          });
-          let data = {
-            "pkCodeRule": oid,
-            "oidArr": oidArr.join(","),
-          }
-          //console.log(data);
-          cloneCodeBasic(data).then(() => {
-            this.cloneOtherCodeRuleSettingBox = false;
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "鎿嶄綔鎴愬姛!"
-            });
-          }, error => {
-            window.console.log(error);
-          });
-        },
-        // 娓呯┖鐮佸��
-        clearAllCodeSec(){
-          if(this.selectionList.length == 0){
-            this.$message.warning("娌℃湁閫夋嫨鏁版嵁!");
-            return;
-          }
-          if(this.selectionList.length != 1){
-            this.$message.warning("姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�!");
-            return;
-          }
-          let currentData = this.selectionList[0];
-          this.$confirm("纭畾瑕佹竻绌虹爜鍊硷紵濡傛灉娓呯┖灏嗕笉鑳借鎭㈠锛岃璋ㄦ厧锛�", {
-              confirmButtonText: "纭畾",
-              cancelButtonText: "鍙栨秷",
-              type: "warning"
-            })
-            .then(() => {
-              let ts = new Date(currentData.ts).getTime();
-              return clearAllCode({"oid": currentData.oid,"ts": ts});
-            })
-            .then(() => {
-              this. this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "鎿嶄綔鎴愬姛!"
-              });
-            });
-        },
-        // 娣诲姞
-        rowSave(row, done, loading) {
-          console.log(row);
-          add(row).then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "鎿嶄綔鎴愬姛!"
-            });
-            done();
-          }, error => {
-            loading();
-            window.console.log(error);
-          });
-        },
-        openEdit(row){
-          this.$refs.crud.rowEdit(row,row.$index);
-        },
-        // 淇敼
-        rowUpdate(row, index, done, loading) {
-          row.ts = new Date().getTime;
-          update(row).then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "鎿嶄綔鎴愬姛!"
-            });
-            done();
-          }, error => {
-            loading();
-            console.log(error);
-          });
-        },
-        // 鍒犻櫎
-        handleDelete() {
-          if(!this.tipsMessage(this.selectionList)){
-            return;
-          }
-          this.$confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?", {
-            confirmButtonText: "纭畾",
-            cancelButtonText: "鍙栨秷",
-            type: "warning"
-          })
-            .then(() => {
-              // 鍙敮鎸佹瘡娆″崟鏉¤褰曞垹闄�
-              let oid = this.selectionList[0].oid;
-              let ts = new Date(this.selectionList[0].ts).getTime();
-              return remove({oid: oid,ts: ts});
-            })
-            .then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "鎿嶄綔鎴愬姛!"
-              });
-              this.$refs.crud.toggleSelection();
-            });
-        },
-        // 鎵撳紑淇敼
-        beforeOpen(done, type) {
-          if (["edit", "view"].includes(type)) {
-            getDetail(this.ruleForm.oid).then(res => {
-              this.ruleForm = res.data.data;
-            });
-          }
-          done();
-        },
-        searchReset() {
-          this.query = {};
-          this.onLoad(this.page);
-        },
-        searchChange(params, done) {
-          this.page.currentPage = 1;
-          // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
-          let requestData = {};
-          if(params){
-            Object.keys(params).forEach(key=>{
-              requestData["conditionMap"+'['+key+'_like]'] = params[key].trim();
-            });
-          }
-          this.query = requestData;
-          this.onLoad(this.page);
-          done();
-        },
-        // 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
-        selectionChange(list) {
-          this.selectionList = list;
-          //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
-          if(this.selectionList.length <= 0){
-            this.hideBasicTable(false);
-          }
-          if (this.selectionList.length > 0) {
-            this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
-            this.currentCodeRuleOid = this.selectionList[list.length-1].oid;
-            this.currentRuleLcStatus = this.selectionList[list.length-1].lcStatus;
-            this.loadBasic(this.selectionList[list.length-1]);
           }
         },
         changeCutType(value){
@@ -2404,58 +2546,13 @@
             this.form.valueCutLength = '';
           }
         },
-        // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
-        codeRuleRowClick (row) {
-          // console.log(this.currentRuleLcStatus);
-          this.$refs.crud.toggleSelection();
-          this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
-
-        },
-        selectionClear() {
-          this.selectionList = [];
-          this.$refs.crud.toggleSelection();
-        },
-        currentChange(currentPage){
-          this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize){
-          this.page.pageSize = pageSize;
-        },
-        refreshChange() {
-          this.onLoad(this.page, this.query);
-        },
-        onLoad(page,params={}) {
-          this.loading = true;
-          gridCodeRule(
-            page.currentPage,
-            page.pageSize,
-            this.query
-          ).then(res => {
-            //console.log(res.data);
-            const data = res.data.data;
-            this.page.total = data.total;
-            this.data = data.records;
-            this.loading = false;
-            // 鏌ヨ鐨勫�间负绌烘椂锛岃灏嗙爜娈电鐞嗙浉鍏崇殑鍐呭绂佺敤
-            if(data.records.length <= 0) {
-              this.hideBasicTable(false);
-              return;
-            }
-            this.loadBasic(this.data[0])
-            this.$nextTick(() => {
-              this.$refs.crud.toggleRowSelection(this.data[0]);
-              this.$refs.crud.setCurrentRow(this.data[0]);
-            })
-            this.selectionList = data.records[0];
-            //this.selectionClear();
-          });
-        },
 
         /** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
-        // 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�
+        /** 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�*/
         openAttrSelectOrGetValue(condition){
           if(condition === 'attr'){
             this.isShowSelectAttrOption = true;
+            this.loadlistClassifyLinkAttr();
           }else if(condition === 'value'){
             //鎵撳紑鍏紡缂栬緫妗嗭紝绗簩灞傚祵濂楀璇濇
             //this.$refs.formulaEditor.isShowformulaEdit = true;
@@ -2467,52 +2564,17 @@
             // 璋冪敤瀛愮粍浠跺埛鏂拌〃鏍兼暟鎹�
             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.referConfigVisble = true;
+            this.referConfigOption = {
+              referBtmName: this.form.referBtmName,
+              referBtmId: this.form.referBtmId,
+              referConfig: this.form.referConfig || '',
             }
+            this.$refs.referConfig.$el.querySelector('input').blur();
           }
         },
 
-        // 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬鐓ч厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
-        openReconfigInterFace(preReferConfigForm){
-          // console.log(preReferConfigForm);
-          this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
-              let value = {
-                referTypeName: preReferConfigForm.referBtmName,
-                referType: preReferConfigForm.referBtmId,
-                referConfig: preReferConfigForm.referConfig,
-              }
-              this.$refs.referConfigFormDialog.initPageData(value);
-        },
-        // 鎵撳紑鑷畾涔夊弬鐓ч厤缃垨鐩存帴閫夋嫨鍙傜収閰嶇疆鐨勬彁绀烘
-        openTipsChooseOrCust(){
-          this.$confirm('璇烽�夋嫨鍙傜収閰嶇疆鐨勫畾涔夋柟寮忥紵','鍙傜収閰嶇疆鐨勬柟寮�', {
-            distinguishCancelAndClose: true,
-            closeOnClickModal: false,
-            confirmButtonText: '鑷畾涔夊弬鐓ч厤缃�',
-            cancelButtonText: '鐩存帴閫夋嫨鍙傜収閰嶇疆'
-          })
-          .then(() => {
-            // 鎵撳紑鑷畾鍙傜収閰嶇疆瀵硅瘽妗�
-            this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
-            // 琛ㄦ牸閿欒鐨勯棶棰�
-            this.$refs.referConfigFormDialog.onloadAttrData();
-          })
-          .catch(action => {
-            if (action === "cancel") {
-              // 鎵撳紑鐩存帴閫夋嫨鍙傜収閰嶇疆瀵硅瘽妗�
-              this.$refs.referConfigCrudDialog.isShowReferConfigCrud = true;
-              this.$refs.referConfigCrudDialog.referConfigOnload();
-            }
-            //console.log(action);
-          });
-          // 璁╁弬鐓ч厤缃緭鍏ユ澶卞幓鐒︾偣锛屽惁鍒欒鎻愮ず妗嗘棤娉曡鍏抽棴
-          this.$refs.referConfig.$el.querySelector('input').blur();
-        },
-
-        // 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�
+        /** 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�*/
         clearAttrDataByIcon(condition){
           if(condition === 'attr'){
             this.form.referAttributeName = '';
@@ -2531,13 +2593,13 @@
             this.form.referConfig = '';
           }
         },
-        // 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�
+        /** 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�*/
         inputSelectBlur(e){
           if (e.target.value) {
             this.form.codeFillSeparator = e.target.value;
           }
         },
-        // 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��
+        /** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
         changeSectypeFormItems(row){
           //console.log(row);
           if(this.enumParam.secTypeList.length==0){
@@ -2653,7 +2715,7 @@
           }
           // console.log(this.form);
         },
-        // 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�
+        /** 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�*/
         getLocalStorageEnum(enumKey){
           let enumCach = JSON.parse(localStorage.getItem(enumKey));
           if(enumCach == null) {
@@ -2664,7 +2726,7 @@
           }
           return enumCach;
         },
-        // 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌
+        /** 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌*/
         loadTotalEnum(){
           this.loadCodeSecType();
           this.loadCodeSecLength();
@@ -2674,7 +2736,7 @@
           this.loadCodeCutType();
           this.loadCodeGetValueType();
         },
-        //鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
+        /** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
         loadCodeSecType(){
           this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
           this.loadCodeSecLength();
@@ -2836,4 +2898,8 @@
     padding: 5px 10px 10px;
  }
 
+ .seloption{
+  margin-left: 10px;
+}
+
 </style>

--
Gitblit v1.9.3