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 | 1092 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 617 insertions(+), 475 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 069b97a..9d36936 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container style="height: 350px;">
+ <basic-container style="height: 100%;">
<!-- 缂栫爜瑙勫垯淇℃伅灞曠ず鍖哄煙 -->
<basic-container class="code-rule-container">
@@ -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"
@@ -149,8 +166,8 @@
</el-row>
</div>
<div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;">
- <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
<el-button type="primary" @click="saveCloneCodeRule">淇� 瀛�</el-button>
+ <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
</div>
</el-dialog>
<!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 -->
@@ -184,13 +201,14 @@
ref="crudCloneCodeBasicOther"
:table-loading="loadingBasic"
:data="basicData"
+ @row-click="codeOtherCloneBasicRowClick"
@selection-change="selectionOtherCloneCodeBasicChange">
</avue-crud>
</el-row>
</div>
<div slot="footer" class="dialog-footer" style="height: 50px; margin-top: -4vh;">
- <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
<el-button type="primary" @click="saveOtherCodeBasic">淇� 瀛�</el-button>
+ <el-button @click="cloneOtherCodeRuleSettingBox = false">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -202,6 +220,9 @@
ref="crudBasic"
:table-loading="loadingBasic"
:data="basicData"
+ @row-click="codeBasicSecRowClick"
+ @search-change="basicSearchChange"
+ @search-reset="basicSearchReset"
:permission="permissionList"
@selection-change="selectionBasicChange"
@refresh-change="refreshChangeBasicSec">
@@ -252,15 +273,19 @@
<!-- 鍩虹鐮佹琛ㄦ牸宸︿笂鏂规寜閽尯鍩� -->
<template slot="menuLeft" slot-scope="scope">
<el-button type="primary"
- size="small"
- icon="el-icon-plus"
- @click="addBasicCodeSec">鏂� 澧�
+ size="small"
+ icon="el-icon-plus"
+ :disabled="selectionList.length <= 0"
+ @click="openAddBasicCodeSec">
+ 鏂� 澧�
</el-button>
<el-button type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- @click="deleteBasicCode(scope.row)">鍒� 闄�
+ size="small"
+ icon="el-icon-delete"
+ :disabled="selectionList.length <= 0"
+ plain
+ @click="deleteBasicCode(scope.row)">
+ 鍒� 闄�
</el-button>
</template>
@@ -360,7 +385,7 @@
</div>
<div style="margin-top:20px; display: flex; align-items:center; justify-content:center;">
<el-button :disabled="selectedFixedOrCodeclassifyValue!=''" size="mini" type="primary" icon="el-icon-circle-plus" class="button" @click="addCodeSecValue('codefixedsec')">娣诲姞</el-button>
- <el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="success" plain plain icon="el-icon-edit-outline" class="button" @click="editCodeSecValue('codefixedsec')">淇敼</el-button>
+ <el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="success" plain icon="el-icon-edit-outline" class="button" @click="editCodeSecValue('codefixedsec')">淇敼</el-button>
<el-button :disabled="selectedFixedOrCodeclassifyValue==''" size="mini" type="danger" icon="el-icon-close" class="button" @click="delCodeSecValue('codefixedsec')">鍒犻櫎</el-button>
<el-button size="mini" type="warning" plain icon="el-icon-close" class="button" @click = "clearFixedOrClassifyForm('codefixedsec')">鍙栨秷</el-button>
</div>
@@ -379,8 +404,8 @@
@close="clearBasicAddForm">
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
- <div class="total" style="overflow-y: auto; height: 70vh">
- <el-form :model="form">
+ <div class="add-basicsec-total" style="overflow-y: auto; height: 70vh">
+ <el-form :model="form" class="add-basicsec-form">
<span class="left">
<el-form-item label="鐮佹缂栧彿:" :label-width="leftFormLabelWidth" required>
<el-input v-model="form.id" :readonly="basicSecOnlyRead" ref="id"></el-input>
@@ -393,10 +418,10 @@
<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"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.secTypeList"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -421,10 +446,10 @@
<el-form-item label="鐮佹闀垮害绫诲瀷:" :label-width="rightFormLabelWidth" required>
<el-select v-model="form.codeSecLengthType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeSecLengthType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeSecLengthType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -478,20 +503,20 @@
<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"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeFillType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
<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"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeFillSeparator"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -513,10 +538,10 @@
<el-form-item label="灞傜骇绫诲瀷:" :label-width="rightFormLabelWidth" required>
<el-select v-model="form.codeLevelType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeLevelType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeLevelType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -526,20 +551,20 @@
<el-form-item label="瀛楃鎴彇绫诲瀷:" :label-width="rightFormLabelWidth" required>
<el-select v-model="form.valueCutType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeCutType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeCutType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍙栧�肩被鍨�:" :label-width="rightFormLabelWidth">
<el-select v-model="form.codeGetValueType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeGetValueType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeGetValueType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -552,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>
@@ -582,10 +607,10 @@
<el-form-item label="鐮佹闀垮害绫诲瀷:" :label-width="rightFormLabelWidth" required>
<el-select v-model="form.codeSecLengthType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeSecLengthType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeSecLengthType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -600,7 +625,7 @@
placeholder="璇烽�夋嫨"
prefix-icon="el-icon-search"
readonly="true"
- v-model="form.parentClassifySecOid"
+ v-model="form.parentClassifySecText"
@focus="openAttrSelectOrGetValue('parentClassifySecOid')"
:disabled="basicSecOnlyRead">
<i slot="suffix" class="el-icon-circle-close" @click="clearAttrDataByIcon('parentClassifySecOid')" style="margin-right: 5px;cursor: pointer;"></i>
@@ -615,20 +640,20 @@
<el-form-item label="缂栫爜琛ヤ綅鏂瑰紡:" :label-width="rightFormLabelWidth" required>
<el-select v-model="form.codeFillType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
- v-for="item in codeFillType"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeFillType"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
<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"
- :key="item.dictValue"
- :label="item.dictValue"
- :value="item.dictKey">
+ v-for="item in enumParam.codeFillSeparator"
+ :key="item.itemValue"
+ :label="item.itemName"
+ :value="item.itemValue">
</el-option>
</el-select>
</el-form-item>
@@ -637,13 +662,13 @@
</el-form>
</div>
<!-- 绗竴灞傚璇濇鐨勬寜閽拰锛岀嚎鏉� -->
- <el-divider direction="horizontal"></el-divider>
+ <el-divider class="horizontal-line" direction="horizontal"></el-divider>
<div slot="footer" class="dialog-footer">
- <el-button @click="addBasicCodeSettingBox = false" v-show="showbtn">鍙� 娑�</el-button>
<el-button type="primary" @click="saveOrEditBasicCode" v-show="showbtn">淇� 瀛�</el-button>
+ <el-button @click="addBasicCodeSettingBox = false" v-show="showbtn">鍙� 娑�</el-button>
</div>
- <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨寮圭獥 -->
+ <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨瀵硅瘽妗� -->
<el-dialog title="涓恒�愬睘鎬с�戦�夊彇鍊�"
append-to-body
:visible.sync="isShowSelectAttrOption"
@@ -656,109 +681,97 @@
<div class="box">
<el-scrollbar style="height: auto; border-bottom-right-radius:8px ">
<basic-container>
- <div class="abox">
+ <div class="treeBox">
<avue-tree :data="attrClassifyTreeData" :option="treeOption" @node-click="nodeClick"/>
</div>
</basic-container>
</el-scrollbar>
</div>
</el-col>
-
<!-- 鍙充晶琛ㄦ牸鏄剧ず鍖哄煙 -->
<el-col span="19">
<basic-container>
<div class="bbox">
<avue-crud
- :data="selectattrData"
- :option="attrOption"
- :table-loading="selectAttrOptionLoading"
- @search-change="selectAttrOptionSearchChange"
+ :data="selectAttrParams.selectAttrData"
+ :option="selectAttrParams.attrOption"
+ :table-loading="selectAttrParams.selectAttrOptionLoading"
+ :ref="selectAttrParams.ref"
+ @search-change="selectAttrSearchChange"
@search-reset="searchAttrReset"
+ @row-click="selectionAttrRowClick"
@selection-change="selectionChangeAttr">
</avue-crud>
</div>
</basic-container>
</el-col>
-
</el-row>
</div>
-
<div slot="footer" class="dialog-footer">
- <el-button @click="isShowSelectAttrOption = false">鍙� 娑�</el-button>
<el-button type="primary" @click="selectedListClassifyLinkAttr">纭� 瀹�</el-button>
+ <el-button @click="isShowSelectAttrOption = false">鍙� 娑�</el-button>
</div>
-
</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"
+ @row-click="parentClassifyRowClick"
@selection-change="parentClassifySelectionChange"
@current-change="parentClassifyCurrentChange"
@size-change="parentClassifySizeChange"
@on-load="parentClassifyOnLoad">
</avue-crud>
-
<div slot="footer" class="dialog-footer">
- <el-button @click="isShowParentClassifyOption = false">鍙� 娑�</el-button>
<el-button type="primary" @click="saveSelectedParentClassify">淇� 瀛�</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;"
- destroy-on-close>
+ <!-- 绗簩灞傚璇濇,涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊煎璇濇 -->
+ <refer-btm-type-crud-dialog
+ :visible.sync="referBtmDialogParams.selectReferBtmSettingBox"
+ :ref="referBtmDialogParams.ref"
+ @echoReferBtmType="echoReferBtmType">
+ </refer-btm-type-crud-dialog>
- <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"
- @on-load="referBtmOnLoad">
- </avue-crud>
-
- <div slot="footer" class="dialog-footer">
- <el-button @click="isShowSelectReferBtmOption = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="saveSelectedreferBtm">淇� 瀛�</el-button>
- </div>
- </el-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>
</el-dialog>
</basic-container>
-
</template>
<script>
@@ -776,11 +789,11 @@
import { treeTopCodeClassify, listClassifyLinkAttr } from "@/api/code/codeclassify";
import { gridCodeFixedValue,addSaveCodeFixedValue,deleteCodeFixedValue,editCodeFixedValue,saveOrder } from "@/api/code/codeFixedValue";
import { treeCodeClassifyValue,addSaveCodeClassifyValue,editCodeClassifyValue,deleteCodeClassifyValue,saveCodeClassifyValueOrder } from "@/api/code/codeClassifyValue";
- import { getDictionary } from "@/api/omd/dict";
+ import { getDictionary } from "@/api/omd/enum";
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";
@@ -789,10 +802,15 @@
import referBtmOption from "@/const/code/referBtmDialog";
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,
@@ -894,7 +912,7 @@
},
classisyValueTreeOption: classisyValueTreeOption, //鍒嗙被鐮佹鏍戠浉鍏抽厤缃」
classifyValueTreeData: [],
- currentSelectTreeData: '', //褰撳墠閫変腑鐨勫垎绫荤爜鍊兼爲鑺傜偣
+ //currentSelectClsValueTreeData: '', //褰撳墠閫変腑鐨勫垎绫荤爜鍊兼爲鑺傜偣
/* 涓哄睘鎬ч�夊彇鍊肩獥鍙ｆ樉绀烘墦寮�鎺у埗鍙橀噺 */
isShowSelectAttrOption: false,
@@ -903,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: {
@@ -1014,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',
+
+
+ },
+ {
+
+ },
+ ],
+ },
+ },
+
};
},
@@ -1101,122 +1129,95 @@
};
},
},
+ 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);
+ this.form.referBtmId = content.referType;
+ this.form.referBtmName = content.referTypeName;
+ //杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
+ let submitFormJson = JSON.stringify(content);
+ this.form.referConfig = submitFormJson;
+ },
+ /** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
+ echoReferBtmType(content){
+ // 瀹炵幇鍥炴樉
+ this.form.referBtmId = content.id;
+ this.form.referBtmName = content.name;
+ },
- /** 閫変腑鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬶紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
- 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();
- },
- referBtmSelectionChange(list) {
- //console.log(list);
- this.referBtmSelectionList = list;
- },
- 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.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){
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+ //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[this.parentClsfyParams.ref].toggleSelection();
+ this.parentClsfyParams.parentClassifySelectionList = row;
+ this.$refs[this.parentClsfyParams.ref].setCurrentRow(row);
+ this.$refs[this.parentClsfyParams.ref].toggleRowSelection(row); //閫変腑褰撳墠琛�
+ },
parentClassifySelectionChange(list) {
- //console.log(this.parentClassifyCurrentChange);
- this.parentClassifySelectionList = list;
+ 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();
});
},
@@ -1229,45 +1230,62 @@
this.loadlistClassifyLinkAttr()
},
// 鍔犺浇鍒嗙被杩炴帴灞炴�ц〃鏍兼暟鎹�
- loadlistClassifyLinkAttr(){
- this.selectAttrOptionLoading = true;
- listClassifyLinkAttr({"page": 1,"limit": -1,'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid}).then(res=>{
- //console.log(res.data.data);
- //閫犲亣鏁版嵁
- let dataInfo =[
- {"id":"address","name":"浼氳瀹ゅ湴鍧�","oid":"058D840D-1010-A7DE-7C52-B39C03CE89C1","attrLength":"150","description":"","attributeDataTypeText":"瀛楃涓�"},
- {"id":"businesslicensetype","name":"钀ヤ笟鎵х収绫诲瀷","oid":"BDAC6D3E-1827-35A0-F3CA-0E58A43F6A07","attrLength":"255","description":"钀ヤ笟鎵х収绫诲瀷","attributeDataTypeText":"瀛楃涓�"},
- {"id":"certificatenumber","name":"淇濆瘑璇佺紪鍙�","oid":"E2BC8332-A721-3713-26C3-C9F6340C2C1D","attrLength":"255","description":"淇濆瘑璇佺紪鍙�","attributeDataTypeText":"瀛楃涓�"},
- ]
- this.selectattrData = dataInfo;
- 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()
+ });
})
},
// 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
- selectAttrOptionSearchChange(params, done) {
- this.query = params;
- console.log(params); //杩欏効闇�瑕佹敼
- this.loadlistClassifyLinkAttr({"page":1,"limit":-1 ,'conditionMap[codeClassifyOid]':this.currentSelectTreeData.oid});
+ 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.selectionChangeAttrList = 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.selectionChangeAttrList.length != 1){
- this.$message.warning("鍙兘閫夋嫨涓�鏉℃暟鎹�!");
+ 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,
})
@@ -1330,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');
@@ -1609,11 +1635,11 @@
/** 鍩虹鐮佹鐩稿叧鏂规硶 */
//闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
clearBasicAddForm(){
- this.form = this.$options.data().form;;
+ this.form = this.$options.data().form;
// this.changeSectypeFormItems(null);
},
// 鎵撳紑鏂板绐楀彛
- addBasicCodeSec(){
+ openAddBasicCodeSec(){
if(!this.tipsMessage(this.selectionList)){
return;
}
@@ -1624,7 +1650,7 @@
this.openBasicDialog('add',null);
this.loadCodeSecType();
},
- //鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
+ // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
openBasicDialog(condition,row){
//console.log(row);
if(condition == 'add') {
@@ -1659,10 +1685,10 @@
if(this.form.oid == '' || this.form.oid == null){
if(this.checkForm()){
addSave(this.form).then(() => {
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
}, error => {
window.console.log(error);
});
@@ -1903,9 +1929,16 @@
//瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
this.currentCodeRuleOid = row.oid;
this.currentRuleLcStatus = row.lcStatus;
- gridCodeBasicSec(1, -1, {"pkCodeRule":row.oid}).then(res => {
+ this.sendGridCodeBasicSec({"pkCodeRule":row.oid});
+ },
+ // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
+ sendGridCodeBasicSec(condition){
+ // 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
+ if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
+ this.hideBasicTable(true);
+ }
+ gridCodeBasicSec(1, -1, condition).then(res => {
const data = res.data.data;
- // console.log(data);
if(this.cloneSettingBox){
this.cloneData = data.records;
// console.log(tihs.cloneData);
@@ -1920,7 +1953,23 @@
// 鍩虹鐮佹閫変腑鏃惰Е鍙�
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;
+ this.$refs.crudBasic.setCurrentRow(row);
+ this.$refs.crudBasic.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ },
+ basicSearchChange(params, done){
+ //console.log(this.$refs.crudBasic);
+ this.sendGridCodeBasicSec(Object.assign(params,{"pkCodeRule":this.selectionList[this.selectionList.length-1].oid}));
+ done();
+ },
+ basicSearchReset(){
+ this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid});
},
// 涓婄Щ涓嬬Щ鍩虹鐮佹
upOrderNum(row){
@@ -1968,13 +2017,26 @@
});
})
},
- //鍩虹鐮佹鏌ヨ
+ // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
refreshChangeBasicSec(){
this.loadBasic({"oid":this.currentCodeRuleOid == null || this.currentCodeRuleOid == '' ? this.selectionList[0].oid:this.currentCodeRuleOid});
},
+ // 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌
+ 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;
+ },
-
+
/** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
+ // 鎵撳紑楂樼骇鏌ヨ绐楀彛
+ openAdvancedQuery(){
+ //this.$refs.advancedQuery.visible = true;
+ //this.advancedQueryParam.timer = new Date().getTime()
+ this.advancedQueryParam.advancedQuerySettingBox = !this.advancedQueryParam.advancedQuerySettingBox;
+ },
// 鏌ヨ浣跨敤鑼冨洿
handleRange(){
if(!this.tipsMessage(this.selectionList)){
@@ -1983,7 +2045,7 @@
this.codeRangeSettingBox = true;
this.getRangeCodeList()
},
- //鍔犺浇浣跨敤鑼冨洿鍒楄〃
+ // 鍔犺浇浣跨敤鑼冨洿鍒楄〃
getRangeCodeList(){
this.dialogLoading = true;
if(this.selectionList[0].oid==null){
@@ -1996,17 +2058,20 @@
this.dialogLoading = false;
});
},
- //鍒锋柊浣跨敤鑼冨洿鍒楄〃
+ // 鍒锋柊浣跨敤鑼冨洿鍒楄〃
refreshUseRangeChange(){
this.getRangeCodeList();
},
- //鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
codeRuleRowClick (row) {
- this.$refs.crud.toggleSelection();
+ // 杩欏効搴旇鍙互涓嶈锛屽洜涓簍oggleRowSelection涔熶細瑙﹀彂琛岄�夋嫨鏃堕棿
this.selectionList = row;
+ this.$refs.crud.toggleSelection();
this.$refs.crud.setCurrentRow(row);
- //this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- this.loadBasic(row);
+ this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+ if(row!=''){
+ this.loadBasic(row);
+ }
},
// 鍚敤涓庡仠鐢�
enableOrDeactivatse(oId,update){
@@ -2073,26 +2138,42 @@
}
this.cloneOtherCodeRuleSettingBox = true;
},
- //鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
- codeOtherCloneRuleRowClick (row) {
+ // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�-鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
+ 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.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){
+ if(fromDialogPkCodebasic.length <= 0){
this.$message.warning("璇烽�夋嫨鐮佹鏁版嵁!");
return;
}
@@ -2104,13 +2185,13 @@
return;
}
//console.log(res);
- let oidArr = '';
- fromDialogPkCodebasic.forEach((item) =>{
- oidArr = oidArr+","+item.oid;
- })
+ let oidArr = [];
+ fromDialogPkCodebasic.forEach(ele => {
+ oidArr.push(ele.id);
+ });
let data = {
"pkCodeRule": oid,
- "oidArr": oidArr,
+ "oidArr": oidArr.join(","),
}
//console.log(data);
cloneCodeBasic(data).then(() => {
@@ -2136,9 +2217,9 @@
}
let currentData = this.selectionList[0];
this.$confirm("纭畾瑕佹竻绌虹爜鍊硷紵濡傛灉娓呯┖灏嗕笉鑳借鎭㈠锛岃璋ㄦ厧锛�", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
})
.then(() => {
let ts = new Date(currentData.ts).getTime();
@@ -2152,7 +2233,6 @@
});
});
},
-
// 娣诲姞
rowSave(row, done, loading) {
add(row).then(() => {
@@ -2232,12 +2312,15 @@
// 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
selectionChange(list) {
this.selectionList = list;
- //console.log("selectionChange====="+list);
this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
+ //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�
+ if(list == ''){
+ this.basicData = [];
+ this.hideBasicTable(false);
+ }
if(this.selectionList.length > 0){
this.currentCodeRuleOid = this.selectionList[list.length-1].oid;
this.currentRuleLcStatus = this.selectionList[list.length-1].lcStatus;
- //console.log(this.currentRuleLcStatus);
this.loadBasic(this.selectionList[list.length-1]);
}
},
@@ -2264,7 +2347,7 @@
this.loading = false;
this.loadBasic(this.data[0])
this.$nextTick(() => {
- //this.$refs.crud.toggleRowSelection(this.data[0]);
+ this.$refs.crud.toggleRowSelection(this.data[0]);
this.$refs.crud.setCurrentRow(this.data[0]);
})
this.selectionList = data.records[0];
@@ -2272,22 +2355,65 @@
});
},
-
/** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
- // 鎵撳紑浜屽眰寮圭獥鏂规硶
+ // 鎵撳紑浜屽眰瀵硅瘽妗嗘柟娉�
openAttrSelectOrGetValue(condition){
if(condition === 'attr'){
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.referBtmDialogParams.selectReferBtmSettingBox = true;
+ // 璋冪敤瀛愮粍浠跺埛鏂拌〃鏍兼暟鎹�
+ this.$refs[this.referBtmDialogParams.ref].referBtmOnLoad();
}else if(condition === 'referConfig'){
- //this.$emit('openSelectreferConfig')
+ if(func.notEmpty(this.form.referConfig) || func.notEmpty(this.form.referBtmName)){
+ this.openReconfigInterFace(this.form);
+ }else{
+ this.openTipsChooseOrCust();
+ }
}
+ },
+
+ // 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬鐓ч厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
+ 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();
},
// 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�
@@ -2303,8 +2429,10 @@
this.form.parentClassifySecOid = '';
}else if(condition === 'referBtmId'){
this.form.referBtmId = '';
+ this.form.referBtmName = '';
+ this.form.referConfig = '';
}else if(condition === 'referConfig'){
- this.form.referBtmId = '';
+ this.form.referConfig = '';
}
},
// 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�
@@ -2316,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){
@@ -2370,8 +2498,8 @@
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', //缂栫爜琛ヤ綅鏂瑰紡
- codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
+ 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:'', //濉厖闀垮害
codeFillLimit: row!=null&&row.codeFillLimit != '' ? row.codeFillLimit:'', //娴佹按涓婇檺
@@ -2430,41 +2558,39 @@
},
//鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
loadCodeSecType(){
- getDictionary({code: "codeBasicSecType"}).then(res=>{
- this.sectypeList = res.data.data;
+ getDictionary({code: "codeSecType"}).then(res=>{
+ this.enumParam.secTypeList = res.data.data;
})
this.loadCodeSecLength();
- //console.log(this.sectypeList);
},
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;
- //console.log(this.codeGetValueType);
+ this.enumParam.codeGetValueType = res.data.data;
})
},
@@ -2473,7 +2599,7 @@
</script>
-<style scope>
+<style>
.code-rule-crud > .avue-crud__search ,.code-basic-crud > .avue-crud__search {
margin-bottom: -15px;
@@ -2483,12 +2609,11 @@
padding: 14px 0 2px 20px;
}
-
.clone-input-textarea > .el-form-item__content {
width: 495px;
}
- .clone-avue-crud > .el-card> .el-card__body > .avue-crud__menu {
+ .clone-avue-crud > .el-card > .el-card__body > .avue-crud__menu {
display: none!important;
}
@@ -2515,36 +2640,35 @@
.basic-container > .el-card > .el-card__body {
margin: -10px 0;
}
+
.code-basicsec-container{
padding: 1px 6px;
}
- .el-divider--horizontal {
- margin-top: 19px !important;
+ .horizontal-line {
+ /* margin-top: 19px !important; */
margin-bottom: -20px !important;
+ width: 100%;
height: 2px;
- margin: 0;
- position: fixed;
- width: 57.5vw;
}
- .el-card__body > .abox {
- height: 50vh;
+ .el-card__body > .treeBox {
+ height: 56vh;
}
.el-col-5 > .box {
- height: 55vh;
+ height: 56vh;
}
.operator_,filter, .layui-btn{
width:60px;
}
- .el-input-number {
+ .left > .el-form-item > .el-form-item__content > .el-input-number {
width: 120px;
}
- .el-input-number >.el-input > .el-input__inner {
+ .left > .el-form-item > .el-form-item__content > .el-input-number > .el-input > .el-input__inner {
width:120px;
}
@@ -2554,34 +2678,52 @@
}
/** 鏂板鐮佹 */
- .total{
- height: 500px;
+ .add-basicsec-total {
width: 100%;
+ padding: 20px 0 0 0;
}
- .total .el-input__inner,.total .el-textarea__inner {
+ .add-basicsec-total .el-input__inner,.add-basicsec-total .el-textarea__inner {
width: 220px;
}
- .el-divider--vertical {
+ .add-basicsec-total > .add-basicsec-form {
+ display: flex;
+ flex-direction: row;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: space-around;
+ }
+
+ .add-basicsec-form > .el-divider--vertical {
width: 2px;
- height: 72vh;
- margin: 0 5px;
- position: fixed;
+ height: 100%;
+ margin: 0 auto;
+ /* position: fixed; */
}
.left {
- float: left;
- width: 49%;
+ /* float: left; */
+ width: 45%;
+ height: 100%;
}
+
.right {
- float: right;
- margin-right: 2.5vw;
- /* width: 40%; */
+ /* float: right; */
+ margin-right: 2vw;
+ height: 100%;
+ width: auto;
}
+
.right > .el-form > .el-form-item{
margin-bottom: 8px;
}
-
+ /* 瀵硅瘽妗嗗簳閮ㄦ寜閽竟妗嗘牱寮� */
+ .el-dialog__footer{
+ /* width: 100%; */
+ border-top: 1px solid #E9E7E7;
+ padding: 5px 10px 10px;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3