From 7602a824e39e19260ae32bb45e799e6ce43300ac Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 14 七月 2023 21:15:29 +0800
Subject: [PATCH] 参照配置组件修改
---
Source/UBCS-WEB/src/views/code/code.vue | 1272 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 687 insertions(+), 585 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9016174..2c009fa 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -92,12 +92,19 @@
@click="handleRange">
浣跨敤鑼冨洿
</el-button>
- <el-button
+ <el-button
size="small"
icon="icon-qingkong"
plain
@click="clearAllCodeSec">
娓呯┖鐮佸��
+ </el-button>
+ <el-button
+ size="small"
+ icon="el-icon-guide"
+ plain
+ @click="escapeOwner">
+ 杞Щ鎵�鏈夎��
</el-button>
</template>
</avue-crud>
@@ -118,7 +125,7 @@
width="800px"
style="height: 116vh; margin-top: -10vh;">
<avue-crud
- :option="dialogeOption"
+ :option="dialogeOption"
:table-loading="dialogLoading"
:data="useRangeData"
@refresh-change="refreshUseRangeChange">
@@ -220,6 +227,27 @@
<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>
<!-- 鍩虹鐮佹灞曠ず鍖哄煙 -->
<basic-container class="code-basicsec-container">
@@ -300,6 +328,7 @@
size="small"
icon="el-icon-search"
plain
+ :disabled="selectionList.length <= 0"
@click="openAdvancedQuery('codeBasicSec')">
楂樼骇鏌ヨ
</el-button>
@@ -325,8 +354,8 @@
<basic-container>
<div class="abox" style="height:54vh">
<avue-tree
- :data="classifyValueTreeData"
- :option="classisyValueTreeOption"
+ :data="classifyValueTreeData"
+ :option="classisyValueTreeOption"
@node-click="classisyValueTreeOnodeClick"
style="overflow-y: auto; height: 54vh"/>
</div>
@@ -417,6 +446,8 @@
append-to-body
style="height: 115vh; margin-top: -13vh; overflow: hidden"
destroy-on-close
+ lock-scroll
+ :close-on-click-modal="false"
@close="clearBasicAddForm">
<!-- 绗竴灞傚璇濇,娣诲姞鐮佹淇℃伅瀵硅瘽妗嗕腑鐨勫唴瀹� -->
@@ -430,7 +461,7 @@
<el-form-item label="鐮佹鍚嶇О:" :label-width="leftFormLabelWidth" required>
<el-input ref="name" v-model="form.name" :readonly="basicSecOnlyRead"></el-input>
</el-form-item>
-
+
<el-form-item label="鐮佹绫诲瀷" :label-width="leftFormLabelWidth" required>
<el-select v-model="form.secType" placeholder="璇烽�夋嫨" @change="changeSectypeFormItems(null)" :disabled="basicSecOnlyRead">
<el-option
@@ -488,7 +519,7 @@
</el-input>
</el-form-item>
<el-form-item label="灞炴�ф墍鍦ㄥ垎绫�:" :label-width="rightFormLabelWidth">
- <el-input
+ <el-input
v-model="form.referCodeClassifyOidName"
disabled>
</el-input>
@@ -526,8 +557,8 @@
</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-form-item v-if="form.codeFillType!='code_fill_none'" label="琛ヤ綅鏃剁殑瀛楃:" :label-width="rightFormLabelWidth">
+ <el-select v-model="form.codeFillSeparator" @blur="inputSelectBlur" filterable placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
v-for="item in enumParam.codeFillSeparator"
:key="item.itemValue"
@@ -565,7 +596,7 @@
<el-input v-model.number="form.codeLevelValue" ref="codeLevelValue" :readonly="basicSecOnlyRead"></el-input>
</el-form-item>
<el-form-item label="瀛楃鎴彇绫诲瀷:" :label-width="rightFormLabelWidth" required>
- <el-select v-model="form.valueCutType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
+ <el-select v-model="form.valueCutType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead" @change="changeCutType($event)">
<el-option
v-for="item in enumParam.codeCutType"
:key="item.itemValue"
@@ -573,6 +604,9 @@
:value="item.itemValue">
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item id="ShowOrHide" v-if="form.valueCutType!='code_cut_none'" label="鍊兼埅鍙栭暱搴�:" :label-width="rightFormLabelWidth">
+ <el-input v-model.number="form.valueCutLength" ref="valueCutLength" :readonly="basicSecOnlyRead"></el-input>
</el-form-item>
<el-form-item label="鍙栧�肩被鍨�:" :label-width="rightFormLabelWidth">
<el-select v-model="form.codeGetValueType" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
@@ -589,7 +623,7 @@
<div v-show="form.secType==='coderefersec' ? true:false">
<el-form-item label="鍙傜収寮曠敤鐨勪笟鍔＄被鍨�:" label-width="152px" required>
<el-input
- ref="referBtmId"
+ ref="referBtmId"
placeholder="璇烽�夋嫨"
prefix-icon="el-icon-search"
readonly="true"
@@ -601,7 +635,7 @@
</el-form-item>
<el-form-item label="鍙傜収閰嶇疆:" label-width="152px" required>
<el-input
- ref="referConfig"
+ ref="referConfig"
placeholder="璇烽�夋嫨"
prefix-icon="el-icon-search"
readonly="true"
@@ -663,8 +697,8 @@
</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-form-item v-if="form.codeFillType!='code_fill_none'" label="琛ヤ綅鏃剁殑瀛楃:" :label-width="rightFormLabelWidth">
+ <el-select v-model="form.codeFillSeparator" filterable @blur="inputSelectBlur" placeholder="璇烽�夋嫨" :disabled="basicSecOnlyRead">
<el-option
v-for="item in enumParam.codeFillSeparator"
:key="item.itemValue"
@@ -677,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>
<!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝灞炴�ч�夋嫨瀵硅瘽妗� -->
@@ -730,11 +764,11 @@
</el-dialog>
<!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗璇濇缁勪欢 -->
- <formula-editor
- ref="formulaEditor"
- @updateFormulaContent="updateFormulaContent"
- :thisSceneTableData="formulaEditorParams.thisSceneTableData"
+ <formula-editor
+ ref="formulaEditor"
+ @updateFormulaContent="updateFormulaContent"
:visible.sync="formulaEditorParams.formulaEditorSettingBox"
+ :thisSceneTableData="formulaEditorParams.thisSceneTableData"
:systemVariableTableData="formulaEditorParams.systemVariableTableData">
</formula-editor>
@@ -748,7 +782,7 @@
<avue-crud
:page.sync="parentClsfyParams.parentClassifyDataPage"
:ref="parentClsfyParams.ref"
- :option="parentClsfyParams.parentClassifyParentOption"
+ :option="parentClsfyParams.parentClassifyParentOption"
:table-loading="parentClsfyParams.classifyDialogLoading"
:data="parentClsfyParams.parentClassifyData"
@refresh-change="refreshParentClassifyDataChange"
@@ -773,17 +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>
@@ -792,12 +821,12 @@
<script>
import { gridCodeRule, getDetail, add, update, remove, listUseRange, updateStatus,clone,clearAllCode } from "@/api/code/mdmrule";
- import {
- gridCodeBasicSec,
- downOrderNum,
- upOrderNum,
- deleteData,
- editSave,
+ import {
+ gridCodeBasicSec,
+ downOrderNum,
+ upOrderNum,
+ deleteData,
+ editSave,
cloneCodeBasic,
addSave,
refDataGridClassifySec,
@@ -817,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() {
@@ -852,6 +880,10 @@
cloneBasicOption: cloneBasicOption,
cloneCodeRuleOption: cloneCodeRuleOption,
selectionOtherCloneCodeBasicList: [], // 褰撳墠閫変腑鐨勫熀纭�鐮佹
+ /** 杞Щ鎵�鏈夎�呭璇濇 */
+ escapeOwnerVisible: false,
+ ruleAdminUserList: [], //瑙勫垯绠＄悊鍛樺垪琛�
+ ruleOwner: '', // 褰撳墠瑕佽浆绉荤粰鍝釜瑙勫垯绠＄悊鍛樼殑ID
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
@@ -908,7 +940,7 @@
codeFixedSecOid: "",
description: "",
id: "",
- },
+ },
isShowFixedForm: true, //true鏄剧ず鍥哄畾鐮佹鐮佸�肩鐞嗙晫闈紝false鏄剧ず鍒嗙被鐮佹鐮佸�肩鐞嗙晫闈�
fixedValueData: [], //鍥哄畾鐮佹鐮佸�艰〃鏍兼暟鎹�
fixedValueOption: fixedValueOption, //琛ㄦ牸閰嶇疆
@@ -924,7 +956,6 @@
},
classisyValueTreeOption: classisyValueTreeOption, //鍒嗙被鐮佹鏍戠浉鍏抽厤缃」
classifyValueTreeData: [],
- //currentSelectClsValueTreeData: '', //褰撳墠閫変腑鐨勫垎绫荤爜鍊兼爲鑺傜偣
/* 涓哄睘鎬ч�夊彇鍊肩獥鍙ｆ樉绀烘墦寮�鎺у埗鍙橀噺 */
isShowSelectAttrOption: false,
@@ -933,7 +964,7 @@
treeOption: treeOption,
currentSelectTreeData: '', //褰撳墠閫変腑鐨勬爲鑺傜偣
/* 涓哄睘鎬ч�夊�煎彸渚ц〃鏍肩浉鍏虫暟鎹� */
-
+
selectAttrParams: {
ref: "selectionAttrCrud",
attrOption: attrOption,
@@ -1011,7 +1042,7 @@
],
formulaEditorSettingBox: false,
},
-
+
/* 鐖跺垎绫荤爜娈靛璇濇 */
parentClsfyParams: {
ref: 'crudParentClassify',
@@ -1028,7 +1059,7 @@
parentClassifyQuery: {}, //鏌ヨ鏉′欢
parentClassifySelectionList: [], //褰撳墠閫変腑琛�
},
-
+
/** 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬪璇濇鐩稿叧鏁版嵁 */
referBtmDialogParams: {
ref: 'crudReferBtm',
@@ -1048,7 +1079,7 @@
componentCodeFlag: false, //鏄惁鍙備笌缂栫爜
pkCodeRule: '', //鎵�灞炵紪鐮佽鍒�
},
-
+
//鏋氫妇鍜屽彲杈撳彲閫夋煡璇�
enumParam: {
secTypeList:[], //鐮佹绫诲瀷
@@ -1073,6 +1104,10 @@
//conditionMapParams: {},
},
+ //寮曠敤鐮佹涓弬鐓ч厤缃粍浠剁浉鍏冲弬鏁�
+ referConfigOption: {},
+ referConfigVisble: false,
+
};
},
computed: {
@@ -1089,7 +1124,48 @@
watch:{
},
+ mounted(){
+ this.loadTotalEnum();
+ },
+ // 瑙ｅ喅琛ㄦ牸閿欒闂
+ 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){
@@ -1104,28 +1180,27 @@
//console.log(conditionMaps);
}
},
-
/* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
updateFormulaContent(content){
this.form.getValueClass = content;
},
/* 寮曠敤鐮佹鍙傜収閰嶇疆,瀛愮粍浠跺～瀹屽弬鐓ч厤缃箣鍚庡唴瀹瑰洖鏄炬椂璋冪敤 */
- echoReferConfig(content){
+ setReferConfigValue(content){
// console.log(content.referTypeName);
- this.form.referBtmId = content.referType;
- this.form.referBtmName = 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.referConfig = submitFormJson || '';
},
/** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content){
- // 瀹炵幇鍥炴樉
- this.form.referBtmId = content.id;
- this.form.referBtmName = content.name;
+ // 瀹炵幇鍥炴樉
+ this.form.referBtmId = content.id || '';
+ this.form.referBtmName = content.name || content.id;
},
-
- /** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
+
+ /** 鐖跺垎绫婚�夋嫨瀵硅瘽妗嗭紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
// 淇濆瓨褰撳墠鐖跺垎绫荤爜娈电殑閫変腑琛岋紝骞惰繘琛屽洖鏄�
saveSelectedParentClassify(){
//console.log(this.parentClsfyParams.parentClassifySelectionList.length);
@@ -1173,15 +1248,15 @@
refreshParentClassifyDataChange() {
this.parentClassifyOnLoad(this.parentClsfyParams.parentClassifyDataPage, this.parentClsfyParams.parentClassifyQuery);
},
- // TODO:寰呬慨鏀�
parentClassifyOnLoad(page, params = {}) {
let parentClsParam = this.parentClsfyParams;
parentClsParam.classifyDialogLoading = true;
let oid = this.selectionList.length==0 ? this.form.pkCodeRule:this.selectionList[0].oid;
- let conditionMaps = this.paramsToConditionMa({"pkCodeRule":oid});
+ let conditionMaps = {};
+ conditionMaps['conditionMap[pkCodeRule]'] = oid;
refDataGridClassifySec(
- page.currentPage,
- page.pageSize,
+ page.currentPage,
+ page.pageSize,
conditionMaps
).then(res => {
//console.log(res.data);
@@ -1192,9 +1267,9 @@
this.parentClassifySelectionClear();
});
},
-
- /** 鎵撳紑灞炴�ч�夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
+
+ /** 鎵撳紑灞炴�ч�夊彇鍊硷紝绗簩灞傚祵濂楀璇濇锛屽強鍏剁浉鍏虫柟娉� */
// 鑾峰彇褰撳墠琚�変腑鏍戣妭鐐圭殑oid
nodeClick(data) {
this.currentSelectTreeData = data;
@@ -1204,22 +1279,25 @@
loadlistClassifyLinkAttr() {
let attrParam = this.selectAttrParams;
//console.log(this.currentSelectTreeData);
- attrParam.selectAttrOptionLoading = true;
+ this.selectAttrParams.selectAttrOptionLoading = true;
let conditionMaps = {};
if(attrParam.selectAttrQeury){
Object.keys(attrParam.selectAttrQeury).forEach(key=>{
- conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key];
+ conditionMaps['conditionMap['+key+']'] = attrParam.selectAttrQeury[key].trim();
});
}
conditionMaps['conditionMap[codeClassifyOid]'] = this.currentSelectTreeData.oid;
conditionMaps['conditionMap[btmTypeOid]'] = this.currentSelectTreeData.btmTypeOid;
listClassifyLinkAttr(conditionMaps).then(res=>{
- //console.log(res.data.data);
- attrParam.selectAttrData = res.data.data;
- attrParam.selectAttrOptionLoading = false;
+ const data = res.data;
this.$nextTick(() => {
- this.$refs[attrParam.ref].doLayout()
+ this.$refs[attrParam.ref].doLayout()
});
+ //console.log(data.data);
+ this.selectAttrParams.selectAttrData = data.data;
+ this.selectAttrParams.selectAttrOptionLoading = false;
+ // 灏嗘悳绱㈡鍐呭缃┖
+ this.selectAttrParams.selectAttrQeury = {};
})
},
// 鐐瑰嚮鎼滅储鍚庤Е鍙戣浜嬩欢
@@ -1261,7 +1339,7 @@
})
this.isShowSelectAttrOption = false;
},
-
+
/** 鍩虹鐮佹琛ㄤ腑鐨勭爜鍊肩鐞嗙殑鐩稿叧鏂规硶 */
// 鐮佸�肩鐞嗗脊绐楁帶鍒�
@@ -1381,6 +1459,11 @@
});
}else {
this.codeClassifyForm.oid = this.selectedFixedOrCodeclassifyValue.attributes.oid;
+ // 鍒嗙被鐮佹锛屽瓙鍒嗙被鍜岀埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰鏇存敼
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ return;
+ }
+ this.$delete(this.codeClassifyForm,"parentClassifyValueOid");
editCodeClassifyValue(this.codeClassifyForm).then(() => {
this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid})
this.$message({
@@ -1391,10 +1474,10 @@
window.console.log(error);
});
}
-
+
},
//鍒犻櫎鐮佸��
- delCodeSecValue(condition){
+ delCodeSecValue(condition){
//鍥哄畾鐮佹鐮佸�煎垹闄�
if(condition == 'codefixedsec'){
//console.log(this.selectedFixedOrCodeclassifyValue.oid);
@@ -1417,6 +1500,9 @@
});
});
}else{
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,this.codeClassifyForm.codeClassifySecOid)){
+ return;
+ }
//鍒嗙被鐮佹鐮佸�煎垹闄�
this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
confirmButtonText: "纭畾",
@@ -1436,8 +1522,7 @@
message: "鎿嶄綔鎴愬姛!"
});
});
- }
-
+ }
},
//瀵瑰浐瀹氱爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
codeFixedValueOpetion(condition,row){
@@ -1477,10 +1562,13 @@
},
//瀵瑰垎绫荤爜鍊艰〃杩涜锛氫笂绉汇�佷笅绉汇�佺Щ闄ゆ搷浣�
codeClassifyValueOpetion(condition){
+ if(this.checkClassUpdate(this.codefixedsecOrCodeclassifysecOid,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){
// 璋冩暣椤哄簭
@@ -1498,10 +1586,8 @@
saveData[0].orderNum = parseInt(saveData[0].orderNum)+1;
saveData[1].orderNum = parseInt(saveData[1].orderNum)-1;
this.saveCodeFixedOrClassifyValueOption('classifyValue',saveData);
- }
+ }
}
- console.log(saveData);
- console.log(this.classifyValueTreeData);
},
//閫変腑琚皟鏁撮『搴忕殑涓や釜鏍戠殑鑺傜偣
getCodeClassifyValueTreeData(){
@@ -1511,10 +1597,10 @@
*/
//璇存槑鏄牴鑺傜偣锛岀洿鎺ユ壘鍐嶅垽鏂槸鍚︽槸杈圭晫鍊�
if(currentNodeTreeData.parentId.trim() == ''){
- return this.findTreeIndex(this.classifyValueTreeData,currentNodeTreeData.oid,true);
+ return this.findTreeIndex(this.classifyValueTreeData,currentNodeTreeData.oid,true);
}else{
//璇存槑涓嶆槸鏍硅妭鐐�,鍏堟壘鍒扮埗鑺傜偣鍐嶆壘鍒板瓙鑺傜偣,鍒ゆ柇鏄惁鏄竟鐣屽��
- return this.findTreeIndex(this.classifyValueTreeData,currentNodeTreeData.parentId,false);
+ return this.findTreeIndex(this.classifyValueTreeData,currentNodeTreeData.parentId,false);
}
},
/**
@@ -1540,7 +1626,7 @@
}
},
//涓婄Щ涓嬬Щ绛夋搷浣滅殑淇濆瓨
- saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
+ async saveCodeFixedOrClassifyValueOption(condition,editOrderNumdata){
//淇濆瓨瀵瑰浐瀹氱爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
if(condition == "fixedValue"){
let data = {
@@ -1559,7 +1645,7 @@
});
}else {
//淇濆瓨瀵瑰垎绫荤爜鍊肩爜娈电爜鍊肩殑涓婄Щ涓嬬Щ绉诲嚭绛夋搷浣�
- saveCodeClassifyValueOrder({
+ await saveCodeClassifyValueOrder({
"codeClassifySecOid": this.codefixedsecOrCodeclassifysecOid,
"dtoList": JSON.stringify(editOrderNumdata),
}).then(() => {
@@ -1572,7 +1658,7 @@
});
this.loadClassifyValueData({"oid":this.codefixedsecOrCodeclassifysecOid});
}
-
+
},
//鍒嗙被鐮佸�兼爲data鍔犺浇
loadClassifyValueData(row){
@@ -1598,427 +1684,26 @@
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);
},
-
-
- /** 鍩虹鐮佹鐩稿叧鏂规硶 */
- //闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
- clearBasicAddForm(){
- this.form = this.$options.data().form;
- // this.changeSectypeFormItems(null);
- },
- // 鎵撳紑鏂板绐楀彛
- openAddBasicCodeSec(){
- if(!this.tipsMessage(this.selectionList)){
- return;
- }
- if(this.selectionList[0].lcStatus != 'Editing'){
- this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽缂栬緫鐮佹!');
- return;
- }
- this.openBasicDialog('add',null);
- this.loadCodeSecType();
- },
- // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
- openBasicDialog(condition,row){
- //console.log(row);
- if(condition == 'add') {
- this.basicSecDialogTitle = '娣诲姞鐮佹淇℃伅';
- this.showbtn = true;
- this.basicSecOnlyRead = false;
- }else if(condition == 'edit'){
- if(this.selectionList.length!=1){
- this.$message.warning('璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!');
- return;
- }
- this.basicSecDialogTitle = '淇敼鐮佹淇℃伅';
- this.showbtn = true;
- this.basicSecOnlyRead = false;
- //涓篺orm缁戝畾鍊�
- }else{
- this.basicSecDialogTitle = '鏌ョ湅鐮佹淇℃伅';
- this.showbtn = false;
- this.basicSecOnlyRead = true;
- }
- //console.log(this.form);
- this.changeSectypeFormItems(condition == 'add' ? null:row);
- this.addBasicCodeSettingBox = true;
- },
- // 鏂板鍩虹鐮佹
- saveOrEditBasicCode(){
- if(this.selectionList[0].oid == null || this.selectionList[0].oid == ''){
- this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
- return;
- }
- this.form.pkCodeRule = this.selectionList[0].oid;
- if(this.form.oid == '' || this.form.oid == null){
- if(this.checkForm()){
- addSave(this.form).then(() => {
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
- }, error => {
- window.console.log(error);
- });
- // 鍏抽棴瀵硅瘽妗�
- this.addBasicCodeSettingBox = false
- }
-
- }else{
- editSave(this.form).then(() => {
- // 鍏抽棴瀵硅瘽妗�
- this.addBasicCodeSettingBox = false
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
- }, error => {
- window.console.log(error);
- });
- }
- // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
- this.loadBasic(this.selectionList[0]);
- },
- // 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�
- checkForm(){
- let form = this.form;
- //console.log(form);
- const regNumber = /^[0-9]+\.{0,1}[0-9]*$/; //鏁板瓧鎴栧皬鏁版鍒欐牎楠�
- const tipsMsg = "蹇呭～椤逛笉鑳戒负绌�";
- if(form.id == ''){
- this.$message.warning("(鐮佹缂栧彿)"+tipsMsg);
- this.$refs.id.$el.querySelector('input').focus();
- return false;
- }
- if(form.name == ''){
- this.$message.warning("(鐮佹鍚嶇О)"+tipsMsg);
- this.$refs.name.$el.querySelector('input').focus();
- return false;
- }
- if(form.secType == ''){
- this.$message.warning("(鐮佹绫诲瀷)"+tipsMsg);
- this.$refs.secType.$el.querySelector('select').focus();
- return false;
- }
- if(form.secType==='codefixedsec'){
- //鍥哄畾鐮佹
- if(form.codeSecLengthType == ''){
- this.$message.warning("(鐮佹闀垮害绫诲瀷)"+tipsMsg);
- this.$refs.codeSecLengthType.$el.querySelector('select').focus();
- return false;
- }
- if(form.codeSecLength == ''){
- this.$message.warning("(鐮佹闀垮害)"+tipsMsg);
- this.$refs.codeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeSecLength)){
- this.$message.warning("鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�");
- this.$refs.codeSecLength.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codeattrsec'){
- //灞炴�х爜娈�
- if(form.referAttributeId == ''){
- this.$message.warning('(灞炴��)'+tipsMsg);
- this.$refs.referAttributeId.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codeserialsec'){
- console.log(form.codeFillType);
- //娴佹按鐮佹
- if(form.codeSecLength == ''){
- this.$message.warning('(鐮佹鐨勯暱搴�)'+tipsMsg);
- this.$refs.seriaCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeSecLength)){
- this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
- this.$refs.seriaCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.serialStart)){
- this.$message.warning('娴佹按鍙风殑璧峰鍊煎繀椤讳负鏁板瓧鍊�');
- this.$refs.serialStart.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.serialStep)){
- this.$message.warning('娴佹按鐨勬闀垮繀椤讳负鏁板瓧鍊�');
- this.$refs.serialStep.$el.querySelector('input').focus();
- return false;
- }
- if(form.codeFillType == ''){
- this.$message.warning('(缂栫爜琛ヤ綅鏂瑰紡)'+tipsMsg);
- return false;
- }
- if(form.codeFillType != '涓嶈ˉ浣�' && form.codeFillSeparatorSelect == ''){
- this.$message.warning('褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖');
- return false;
- }
- if(form.codeFillLength == ''){
- this.$message.warning('濉厖闀垮害涓嶈兘涓虹┖');
- this.$refs.codeFillLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeFillLength)){
- this.$message.warning('濉厖闀垮害蹇呴』涓烘暟瀛楀��');
- this.$refs.codeFillLength.$el.querySelector('input').focus();
- return false;
- }
- if(form.codeFillLimit == ''){
- this.$message.warning('(娴佹按涓婇檺)'+tipsMsg);
- this.$refs.codeFillLimit.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeFillLimit)){
- this.$message.warning('娴佹按涓婇檺蹇呴』涓烘暟瀛楀��');
- this.$refs.codeFillLimit.$el.querySelector('input').focus();
- return false;
- }
- if(form.codeFillFlag == ''){
- this.$message.warning('(娴佹按鏄惁琛ョ爜)'+tipsMsg);
- this.$refs.switch.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codelevelsec'){
- //灞傜骇鐮佹
- if(form.codeLevelType == ''){
- this.$message.warning('(灞傜骇绫诲瀷)'+tipsMsg);
- return false;
- }
- if(!regNumber.test(form.codeLevelValue)){
- this.$message.warning('灞傜骇鐨勫��)鍙兘濉啓鏁板瓧');
- this.$refs.codeLevelValue.$el.querySelector('input').focus();
- return false;
- }
- if(form.valueCutType == ''){
- this.$message.warning('(瀛楃鎴彇绫诲瀷)'+tipsMsg);
- this.$refs.valueCutType.$el.querySelector('select').focus();
- return false;
- }
- }else if(this.form.secType==='coderefersec'){
- //寮曠敤鐮佹
- if(form.referBtmId == ''){
- this.$message.warning('(鍙傜収寮曠敤鐨勪笟鍔＄被鍨�)'+tipsMsg);
- this.$refs.referBtmId.$el.querySelector('input').focus();
- return false;
- }
- if(form.referConfig == ''){
- this.$message.warning('(鍙傜収閰嶇疆)'+tipsMsg);
- this.$refs.referConfig.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codedatesec'){
- //鏃ユ湡鐮佹
- if(form.codeDateFormatStr == ''){
- this.$message.warning('(鏃ユ湡鏍煎紡)'+tipsMsg);
- this.$refs.codeDateFormatStr.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codeclassifysec'){
- //鍒嗙被鐮佹
- if(form.codeSecLengthType == ''){
- this.$message.warning('(鐮佹闀垮害绫诲瀷)'+tipsMsg);
- return false;
- }
- if(form.codeSecLength == ''){
- this.$message.warning('(鐮佹闀垮害)'+tipsMsg);
- this.$refs.classCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeSecLength)){
- this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
- this.$refs.classCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- }else if(this.form.secType==='codevariablesec'){
- //鍙彉鐮佹
- if(form.codeSecLength == ''){
- this.$message.warning('(鐮佹闀垮害)'+tipsMsg);
- this.$refs.varCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(!regNumber.test(form.codeSecLength)){
- this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
- this.$refs.classCodeSecLength.$el.querySelector('input').focus();
- return false;
- }
- if(form.codeFillType == ''){
- this.$message.warning('(缂栫爜琛ヤ綅鏂瑰紡)'+tipsMsg);
- return false;
- }
- if(form.codeFillType != '涓嶈ˉ浣�' && form.codeFillSeparatorSelect == ''){
- this.$message.warning('褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖');
- return false;
- }
- }
- return true;
- },
- // 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁
- tipsMessage(list){
- if(list.length != 1){
- this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
- return false;
- }
- return true;
- },
- // 鍩虹鐮佹鍒犻櫎
- deleteBasicCode(){
- if(!this.tipsMessage(this.selectionBasicList)){
- return;
- }
- let oid = this.selectionBasicList[0].oid;
- this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- let ts = new Date(this.selectionBasicList[0].ts).getTime();
- return deleteData({"oid": oid,"ts": ts});
- })
- .then(() => {
- this.loadBasic({"oid":this.currentCodeRuleOid == null || this.currentCodeRuleOid == '' ? this.selectionList[0].oid:this.currentCodeRuleOid});
+ /**
+ * 鍒嗙被鐮佹鐮佸�硷紝淇敼銆佸垹闄ゃ�佷笂涓嬬Щ涔嬪墠锛屾鏌ユ槸鍚︿负瀛愬垎绫诲拰鐖跺垎绫讳箣闂寸浉浜掓洿鏀�
+ * @currentRowClassOid 褰撳墠閫変腑琛宱id
+ * @updateClassOid 瑕佷慨鏀圭殑鍒嗙被鐮佸�紀id
+ */
+ checkClassUpdate(currentRowClassOid,updateClassOid){
+ if(currentRowClassOid!=updateClassOid){
this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
- this.$refs.crudBasic.toggleSelection();
- });
- },
- // 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅
- loadBasic(row){
- if(this.cloneSettingBox){
- this.cloneTableLoading = true;
- }else{
- this.loadingBasic = true;
- }
- // console.log(row.oid);
- //瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
- this.currentCodeRuleOid = row.oid;
- this.currentRuleLcStatus = row.lcStatus;
- this.sendGridCodeBasicSec({"pkCodeRule_equal":row.oid},false);
- },
- // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
- sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
- // 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
- if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
- this.hideBasicTable(true);
- }
- let conditionMaps = {};
- if(condition && !isAdancedQuery){
- Object.keys(condition).forEach(key=>{
- conditionMaps['conditionMap[t.'+key+']'] = condition[key];
+ type: "error",
+ message: "鎿嶄綔澶辫触銆愬瓙鍒嗙被涓庣埗鍒嗙被涔嬮棿涓嶈兘鐩镐簰淇敼鐮佸�笺��!"
});
}
- if(isAdancedQuery){
- condition['conditionMap[t.pkCodeRule_equal]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
- ? this.selectionList[0].oid:this.currentCodeRuleOid;
- }
- gridCodeBasicSec(1, -1,isAdancedQuery ? condition:conditionMaps).then(res => {
- const data = res.data.data;
- if(this.cloneSettingBox){
- this.cloneData = data.records;
- // console.log(tihs.cloneData);
- this.cloneTableLoading = false;
- }else {
- this.basicData = data.records;
- // console.log(this.basicData);
- this.loadingBasic = false;
- }
- });
+ return currentRowClassOid!=updateClassOid;
},
- // 鍩虹鐮佹閫変腑鏃惰Е鍙�
- 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_equal":this.selectionList[this.selectionList.length-1].oid}),false);
- done();
- },
- basicSearchReset(){
- this.sendGridCodeBasicSec({"pkCodeRule_equal":this.selectionList[this.selectionList.length-1].oid},false);
- },
- // 涓婄Щ涓嬬Щ鍩虹鐮佹
- upOrderNum(row){
- //console.log(row.oid);
- if(!this.tipsMessage(this.selectionList)){
- return;
- }
- let codeRuleOid = this.selectionList[0].oid;
- if (this.selectionList[0].lcStatus != 'Editing') {
- this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
- return;
- }
- if(row.oid==null || row.oid==''){
- this.$message.warning("鏈幏鍙栧埌蹇呭～鍙傛暟!");
- return;
- }
- upOrderNum(row.oid).then(() => {
- this.loadBasic({"oid":codeRuleOid});
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
- })
- },
- downOrderNum(row){
- //console.log(row.oid);
- if(!this.tipsMessage(this.selectionList)){
- return;
- }
- let codeRuleOid = this.selectionList[0].oid;
- //console.log(this.selectionList);
- if (this.selectionList[0].lcStatus != 'Editing') {
- this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
- return;
- }
- if(row.oid==null || row.oid==''){
- this.$message.warning("鏈幏鍙栧埌蹇呭～鍙傛暟!");
- return;
- }
- downOrderNum(row.oid).then(() => {
- this.loadBasic({"oid":codeRuleOid});
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
- });
- })
- },
- // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
- 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(condition){
- // MasterTable({
- // codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
- // functionId: 5,
- // }).then(res=>{
- // console.log(res.data.tableDefineVO.seniorQueryColumns);
- // })
if(condition=='codeRule'){
this.advancedQueryParam.options = [
{
@@ -2055,7 +1740,7 @@
fieldType: 'combox',
queryField: 'lcStatus',
comboxKey: 'codeSearchLCStatus',
- }
+ },
]
}else {
this.advancedQueryParam.options = [
@@ -2063,22 +1748,22 @@
data: [],
title: '鐮佹缂栧彿',
fieldType: 'text',
- queryField: 't.id',
+ queryField: 'id',
},{
data: [],
title: '鐮佹鍚嶇О',
fieldType: 'text',
- queryField: 't.name',
+ queryField: 'name',
},{
data: [],
title: '鎻忚堪',
fieldType: 'text',
- queryField: 't.description',
+ queryField: 'description',
},{
data: [],
title: '鐮佹绫诲瀷',
fieldType: 'combox',
- queryField: 't.secType',
+ queryField: 'secType',
comboxKey: 'codeSecType',
}
]
@@ -2095,7 +1780,7 @@
this.getRangeCodeList()
},
// 鍔犺浇浣跨敤鑼冨洿鍒楄〃
- getRangeCodeList(){
+ getRangeCodeList(){
this.dialogLoading = true;
if(this.selectionList[0].oid==null){
this.$message.error("鏈幏鍙栧埌鍙傛暟!");
@@ -2110,17 +1795,6 @@
// 鍒锋柊浣跨敤鑼冨洿鍒楄〃
refreshUseRangeChange(){
this.getRangeCodeList();
- },
- // 鍗曞嚮缂栫爜瑙勫垯瀹炵幇琛岄�夋嫨
- codeRuleRowClick (row) {
- // 杩欏効搴旇鍙互涓嶈锛屽洜涓簍oggleRowSelection涔熶細瑙﹀彂琛岄�夋嫨鏃堕棿
- this.selectionList = row;
- this.$refs.crud.toggleSelection();
- this.$refs.crud.setCurrentRow(row);
- this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
- if(row!=''){
- this.loadBasic(row);
- }
},
// 鍚敤涓庡仠鐢�
enableOrDeactivatse(oId,update){
@@ -2174,7 +1848,7 @@
}, error => {
window.console.log(error);
});
- //console.log(data);
+ //console.log(data);
},
// 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�
openOtherCodeRuleDialog(){
@@ -2183,7 +1857,7 @@
}
if(this.selectionList[0].lcStatus != 'Editing'){
this.$message.warning("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄�!");
- return;
+ return;
}
this.cloneOtherCodeRuleSettingBox = true;
},
@@ -2218,7 +1892,7 @@
this.selectionOtherCloneCodeBasicList = list;
this.$refs.crudCloneCodeBasicOther.setCurrentRow(this.selectionOtherCloneCodeBasicList[list.length-1]);
},
- // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅
+ // 浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹淇℃伅
saveOtherCodeBasic(){
let oid = this.selectionList[0].oid;
let fromDialogPkCodebasic = this.selectionOtherCloneCodeBasicList;
@@ -2236,7 +1910,7 @@
//console.log(res);
let oidArr = [];
fromDialogPkCodebasic.forEach(ele => {
- oidArr.push(ele.id);
+ oidArr.push(ele.oid);
});
let data = {
"pkCodeRule": oid,
@@ -2284,6 +1958,7 @@
},
// 娣诲姞
rowSave(row, done, loading) {
+ console.log(row);
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@@ -2355,28 +2030,36 @@
searchChange(params, done) {
this.page.currentPage = 1;
// 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+ let requestData = {};
if(params){
Object.keys(params).forEach(key=>{
- this.query['conditionMap['+key+'_like]'] = params[key];
+ requestData["conditionMap"+'['+key+'_like]'] = params[key].trim();
});
}
+ this.query = requestData;
this.onLoad(this.page);
done();
- },
+ },
// 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
selectionChange(list) {
this.selectionList = list;
- this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
//褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
- if(list == ''){
- this.basicData = [];
+ if(this.selectionList.length <= 0){
this.hideBasicTable(false);
}
- if(this.selectionList.length > 0){
+ 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 = [];
@@ -2394,8 +2077,8 @@
onLoad(page,params={}) {
this.loading = true;
gridCodeRule(
- page.currentPage,
- page.pageSize,
+ page.currentPage,
+ page.pageSize,
this.query
).then(res => {
//console.log(res.data);
@@ -2406,8 +2089,6 @@
// 鏌ヨ鐨勫�间负绌烘椂锛岃灏嗙爜娈电鐞嗙浉鍏崇殑鍐呭绂佺敤
if(data.records.length <= 0) {
this.hideBasicTable(false);
- this.selectionList = [];
- this.basicData = [];
return;
}
this.loadBasic(this.data[0])
@@ -2418,6 +2099,441 @@
this.selectionList = data.records[0];
//this.selectionClear();
});
+ },
+
+
+ /** 鍩虹鐮佹鐩稿叧鏂规硶 */
+ //闃叉鎵撳紑杩囩紪杈戠獥鍙ｄ箣鍚庤〃鍗曚腑瀛樺湪鍊硷紝鎵�浠ラ渶瑕佹竻绌�,骞跺垵濮嬪寲form琛ㄥ崟灞炴��
+ clearBasicAddForm(){
+ this.form = this.$options.data().form;
+ // this.changeSectypeFormItems(null);
+ },
+ // 鎵撳紑鏂板绐楀彛
+ openAddBasicCodeSec(){
+ if(!this.tipsMessage(this.selectionList)){
+ return;
+ }
+ if(this.selectionList[0].lcStatus != 'Editing'){
+ this.$message.warning('缂栫爜瑙勫垯鐘舵�佷笉鏄�"缂栬緫涓�"锛屼笉鍏佽缂栬緫鐮佹!');
+ return;
+ }
+ this.openBasicDialog('add',null);
+ this.loadCodeSecType();
+ },
+ // 鎵撳紑鏂板鎴栫紪杈戝熀纭�鐮佹瀵硅瘽妗�
+ openBasicDialog(condition,row){
+ //console.log(row);
+ if(condition == 'add') {
+ this.basicSecDialogTitle = '娣诲姞鐮佹淇℃伅';
+ this.showbtn = true;
+ this.basicSecOnlyRead = false;
+ }else if(condition == 'edit'){
+ if(this.selectionList.length!=1){
+ this.$message.warning('璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!');
+ return;
+ }
+ this.basicSecDialogTitle = '淇敼鐮佹淇℃伅';
+ this.showbtn = true;
+ this.basicSecOnlyRead = false;
+ //涓篺orm缁戝畾鍊�
+ }else{
+ this.basicSecDialogTitle = '鏌ョ湅鐮佹淇℃伅';
+ this.showbtn = false;
+ this.basicSecOnlyRead = true;
+ }
+ //console.log(this.form);
+ this.changeSectypeFormItems(condition == 'add' ? null:row);
+ this.addBasicCodeSettingBox = true;
+ },
+ // 鏂板鍩虹鐮佹
+ async saveOrEditBasicCode(){
+ if(this.selectionList[0].oid == null || this.selectionList[0].oid == ''){
+ this.$message.warning('缂哄け蹇呰鍙傛暟锛岃閲嶆柊閫夋嫨缂栫爜瑙勫垯鍚庡啀璇�!');
+ return;
+ }
+ this.form.pkCodeRule = this.selectionList[0].oid;
+ if(this.form.oid == '' || this.form.oid == null){
+ if(this.checkForm()){
+ await addSave(this.form).then(() => {
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ }, error => {
+ window.console.log(error);
+ });
+ // 鍏抽棴瀵硅瘽妗�
+ this.addBasicCodeSettingBox = false
+ }
+ // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
+ this.loadBasic(this.selectionList[0]);
+ }else{
+ // 鍙兘鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩細鍙戠敓鏀瑰彉鎵�浠ヨ繖鍎跨洿鎺ュreferConfig鐨刯son杩涜鏀瑰彉
+ if(this.form.referConfig === "coderefersec" || this.form.referConfig != undefined){
+ let referConfig = JSON.parse(this.form.referConfig);
+ 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;
+ }
+ editSave(this.form).then(() => {
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ }, error => {
+ window.console.log(error);
+ });
+ this.loadBasic(this.selectionList[0]);
+ // 鍏抽棴瀵硅瘽妗�
+ this.addBasicCodeSettingBox = false
+ }
+ },
+ // 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�
+ checkForm(){
+ let form = this.form;
+ //console.log(form);
+ const regNumber = /^[0-9]+\.{0,1}[0-9]*$/; //鏁板瓧鎴栧皬鏁版鍒欐牎楠�
+ const regPos = /^[0-9]*[1-9][0-9]*$/; //闈炶礋鏁存暟姝ｅ垯鏍￠獙
+ const tipsMsg = "蹇呭～椤逛笉鑳戒负绌�";
+ if(form.id == ''){
+ this.$message.warning("(鐮佹缂栧彿)"+tipsMsg);
+ this.$refs.id.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.name == ''){
+ this.$message.warning("(鐮佹鍚嶇О)"+tipsMsg);
+ this.$refs.name.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.secType == ''){
+ this.$message.warning("(鐮佹绫诲瀷)"+tipsMsg);
+ this.$refs.secType.$el.querySelector('select').focus();
+ return false;
+ }
+ if(form.secType==='codefixedsec'){
+ //鍥哄畾鐮佹
+ if(form.codeSecLengthType == ''){
+ this.$message.warning("(鐮佹闀垮害绫诲瀷)"+tipsMsg);
+ // this.$refs.codeSecLengthType.$el.querySelector('select').focus();
+ return false;
+ }
+ if(form.codeSecLength == ''){
+ this.$message.warning("(鐮佹闀垮害)"+tipsMsg);
+ this.$refs.codeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeSecLength)){
+ this.$message.warning("鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�");
+ this.$refs.codeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='codeattrsec'){
+ //灞炴�х爜娈�
+ if(form.referAttributeId == ''){
+ this.$message.warning('(灞炴��)'+tipsMsg);
+ this.$refs.referAttributeId.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='codeserialsec'){
+ //console.log(form.codeFillType);
+ //娴佹按鐮佹
+ if(form.codeSecLength == ''){
+ this.$message.warning('(鐮佹鐨勯暱搴�)'+tipsMsg);
+ this.$refs.seriaCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeSecLength)){
+ this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
+ this.$refs.seriaCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.serialStart)){
+ this.$message.warning('娴佹按鍙风殑璧峰鍊煎繀椤讳负鏁板瓧鍊�');
+ this.$refs.serialStart.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.serialStep)){
+ this.$message.warning('娴佹按鐨勬闀垮繀椤讳负鏁板瓧鍊�');
+ this.$refs.serialStep.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.codeFillType == ''){
+ this.$message.warning('(缂栫爜琛ヤ綅鏂瑰紡)'+tipsMsg);
+ return false;
+ }
+ if(form.codeFillType != '涓嶈ˉ浣�' && form.codeFillSeparator == ''){
+ this.$message.warning('褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖');
+ return false;
+ }
+ if(form.codeFillLength == ''){
+ this.$message.warning('濉厖闀垮害涓嶈兘涓虹┖');
+ this.$refs.codeFillLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeFillLength)){
+ this.$message.warning('濉厖闀垮害蹇呴』涓烘暟瀛楀��');
+ this.$refs.codeFillLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.codeFillLimit == ''){
+ this.$message.warning('(娴佹按涓婇檺)'+tipsMsg);
+ this.$refs.codeFillLimit.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeFillLimit)){
+ this.$message.warning('娴佹按涓婇檺蹇呴』涓烘暟瀛楀��');
+ this.$refs.codeFillLimit.$el.querySelector('input').focus();
+ return false;
+ }
+ // if(form.codeFillFlag == '' || ){
+ // this.$message.warning('(娴佹按鏄惁琛ョ爜)'+tipsMsg);
+ // return false;
+ // }
+ }else if(this.form.secType==='codelevelsec'){
+ //灞傜骇鐮佹
+ if(form.codeLevelType == ''){
+ this.$message.warning('(灞傜骇绫诲瀷)'+tipsMsg);
+ return false;
+ }
+ if(form.codeLevelType != 'code_level_min'&& !regNumber.test(form.codeLevelValue)){
+ this.$message.warning('(灞傜骇鐨勫��)鍙兘濉啓鏁板瓧');
+ this.$refs.codeLevelValue.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.valueCutType == ''){
+ this.$message.warning('(瀛楃鎴彇绫诲瀷)'+tipsMsg);
+ // this.$refs.valueCutType.$el.querySelector('select').focus();
+ return false;
+ }
+ if(form.valueCutType != 'code_cut_none' && !regPos.test(form.valueCutLength)){
+ this.$message.warning('(鍊兼埅鍙栭暱搴�)鍙兘濉啓姝ｆ暣鏁�');
+ this.$refs.valueCutLength.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='coderefersec'){
+ //寮曠敤鐮佹
+ if(form.referBtmId == ''){
+ this.$message.warning('(鍙傜収寮曠敤鐨勪笟鍔＄被鍨�)'+tipsMsg);
+ this.$refs.referBtmId.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.referConfig == ''){
+ this.$message.warning('(鍙傜収閰嶇疆)'+tipsMsg);
+ this.$refs.referConfig.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='codedatesec'){
+ //鏃ユ湡鐮佹
+ if(form.codeDateFormatStr == ''){
+ this.$message.warning('(鏃ユ湡鏍煎紡)'+tipsMsg);
+ this.$refs.codeDateFormatStr.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='codeclassifysec'){
+ //鍒嗙被鐮佹
+ if(form.codeSecLengthType == ''){
+ this.$message.warning('(鐮佹闀垮害绫诲瀷)'+tipsMsg);
+ return false;
+ }
+ if(form.codeSecLength == ''){
+ this.$message.warning('(鐮佹闀垮害)'+tipsMsg);
+ this.$refs.classCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeSecLength)){
+ this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
+ this.$refs.classCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ }else if(this.form.secType==='codevariablesec'){
+ //鍙彉鐮佹
+ if(form.codeSecLength == ''){
+ this.$message.warning('(鐮佹闀垮害)'+tipsMsg);
+ this.$refs.varCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(!regNumber.test(form.codeSecLength)){
+ this.$message.warning('鐮佹鐨勯暱搴﹀繀椤讳负鏁板瓧鍊�');
+ this.$refs.classCodeSecLength.$el.querySelector('input').focus();
+ return false;
+ }
+ if(form.codeFillType == ''){
+ this.$message.warning('(缂栫爜琛ヤ綅鏂瑰紡)'+tipsMsg);
+ return false;
+ }
+ // console.log(form);
+ if(form.codeFillType != 'code_fill_none' && form.codeFillSeparator == ''){
+ this.$message.warning('褰撹ˉ浣嶆柟寮忎负宸﹁ˉ浣嶆垨鑰呭彸琛ヤ綅鐨勬椂鍊欙紝琛ヤ綅瀛楃涓嶈兘涓虹┖');
+ return false;
+ }
+ }
+ return true;
+ },
+ // 鍒ゆ柇鏁版嵁鏄惁閫夋嫨浠ュ強鍙兘閫夋嫨鍗曟潯鏁版嵁
+ tipsMessage(list){
+ if(list.length != 1){
+ this.$message.warning("璇烽�夋嫨涓�鏉＄紪鐮佽鍒欐暟鎹�!");
+ return false;
+ }
+ return true;
+ },
+ // 鍩虹鐮佹鍒犻櫎
+ deleteBasicCode(){
+ if(!this.tipsMessage(this.selectionBasicList)){
+ return;
+ }
+ let oid = this.selectionBasicList[0].oid;
+ this.$confirm("鏄惁鍒犻櫎杩欐潯鏁版嵁锛熷鏋滆寮曠敤灏嗕笉鑳借鍒犻櫎锛�", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ })
+ .then(() => {
+ let ts = new Date(this.selectionBasicList[0].ts).getTime();
+ return deleteData({"oid": oid,"ts": ts});
+ })
+ .then(() => {
+ this.loadBasic({"oid":this.currentCodeRuleOid == null || this.currentCodeRuleOid == '' ? this.selectionList[0].oid:this.currentCodeRuleOid});
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ this.$refs.crudBasic.toggleSelection();
+ });
+ },
+ // 鐐瑰嚮瑙﹀彂鍔犺浇鍩虹鐮佹淇℃伅
+ loadBasic(row){
+ if(this.cloneSettingBox){
+ this.cloneTableLoading = true;
+ }else{
+ this.loadingBasic = true;
+ }
+ // console.log(row.oid);
+ //瀛樺偍褰撳墠鍏宠仈鐨勭紪鐮佽鍒欑浉鍏充俊鎭�
+ if(row!='' || row!=null){
+ this.currentCodeRuleOid = row.oid;
+ this.currentRuleLcStatus = row.lcStatus;
+ this.sendGridCodeBasicSec({"pkCodeRule":row.oid},false);
+ }
+ },
+ // 鍙戦�佸姞杞藉熀纭�鐮佹鐨勮姹�
+ sendGridCodeBasicSec(condition,isAdancedQuery/** 鏄惁楂樼骇鏌ヨ */){
+ // 濡傛灉褰撳墠鍩虹鐮佹琛ㄤ腑鐨勬悳绱㈡寜閽闅愯棌锛屽氨闇�瑕佸湪姝ゅ紑鍚�
+ if(this.selectionList.length>=0 && !this.$refs.crudBasic.option.column[0].search){
+ this.hideBasicTable(true);
+ }
+ let conditionMaps = {};
+ if(condition && !isAdancedQuery){
+ Object.keys(condition).forEach(key=>{
+ conditionMaps['conditionMap['+key+']'] = condition[key].trim();
+ });
+ }
+ if(isAdancedQuery){
+ condition['conditionMap[pkCodeRule]'] = this.currentCodeRuleOid == null || this.currentCodeRuleOid == ''
+ ? this.selectionList[0].oid:this.currentCodeRuleOid;
+ }
+ gridCodeBasicSec(1, -1,isAdancedQuery ? condition:conditionMaps).then(res => {
+ const data = res.data.data;
+ if(this.cloneSettingBox){
+ this.cloneData = data.records;
+ // console.log(tihs.cloneData);
+ this.cloneTableLoading = false;
+ }else {
+ this.basicData = data.records;
+ // console.log(this.basicData);
+ this.loadingBasic = false;
+ }
+ });
+ },
+ // 鍩虹鐮佹閫変腑鏃惰Е鍙�
+ 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}),false);
+ done();
+ },
+ basicSearchReset(){
+ this.sendGridCodeBasicSec({"pkCodeRule":this.selectionList[this.selectionList.length-1].oid},false);
+ },
+ // 涓婄Щ涓嬬Щ鍩虹鐮佹
+ async upOrderNum(row){
+ if(!this.tipsMessage(this.selectionList)){
+ return;
+ }
+ if (this.selectionList[0].lcStatus != 'Editing') {
+ this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
+ return;
+ }
+ if(row.oid==null || row.oid==''){
+ this.$message.warning("鏈幏鍙栧埌蹇呭～鍙傛暟!");
+ return;
+ }
+ await upOrderNum(row.oid).then(() => {
+ this.loadBasic(this.selectionList[0]);
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ })
+ },
+ downOrderNum(row){
+ //console.log(row.oid);
+ if(!this.tipsMessage(this.selectionList)){
+ return;
+ }
+ let codeRuleOid = this.selectionList[0].oid;
+ //console.log(this.selectionList);
+ if (this.selectionList[0].lcStatus != 'Editing') {
+ this.$message.warning("鍙湁缂栫爜瑙勫垯鐨勭姸鎬佹槸 [缂栬緫涓璢 鐨勬椂鍊欙紝鎵嶈兘璋冩暣鐮佹椤哄簭!");
+ return;
+ }
+ if(row.oid==null || row.oid==''){
+ this.$message.warning("鏈幏鍙栧埌蹇呭～鍙傛暟!");
+ return;
+ }
+ downOrderNum(row.oid).then(() => {
+ this.loadBasic({"oid":codeRuleOid});
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ })
+ },
+ // 鍩虹鐮佹鍒锋柊鏃舵煡璇�
+ refreshChangeBasicSec(){
+ this.loadBasic(this.selectionList.at(-1));
+ },
+ // 鎿嶄綔鍩虹鐮佹涓悳绱㈡竻绌虹瓑鎸夐挳鐨勬樉绀�/闅愯棌
+ hideBasicTable(hideBoolean){
+ this.$refs.crudBasic.option.refreshBtn = hideBoolean;
+ this.$refs.crudBasic.option.column[0].search = hideBoolean;
+ this.$refs.crudBasic.option.column[1].search = hideBoolean;
+ if(!hideBoolean){
+ this.selectionList = [];
+ this.basicData = [];
+ }
+ },
+ changeCutType(value){
+ if (value != 'code_cut_none'){
+ if(this.form.valueCutLength == ''){
+ this.form.valueCutLength = 1;
+ }
+ }else{
+ this.form.valueCutLength = '';
+ }
},
/** 绗竴灞傚璇濇鐩稿叧鏂规硶 */
@@ -2436,49 +2552,14 @@
// 璋冪敤瀛愮粍浠跺埛鏂拌〃鏍兼暟鎹�
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();
},
// 鐐瑰嚮杈撳叆妗嗙殑脳鍙凤紝娓呯┖杈撳叆妗嗕腑鐨勫唴瀹�
@@ -2502,13 +2583,13 @@
},
// 琛ヤ綅鏃剁殑瀛楃锛屽疄鐜板彲杈撳彲閫�
inputSelectBlur(e){
- if (e.target.value) {
- this.form.codeFillSeparatorSelect = e.target.value;
+ if (e.target.value) {
+ this.form.codeFillSeparator = e.target.value;
}
},
// 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��
- changeSectypeFormItems(row){
- //console.log(row);
+ changeSectypeFormItems(row){
+ //console.log(row);
if(this.enumParam.secTypeList.length==0){
this.loadCodeSecType();
}
@@ -2564,8 +2645,8 @@
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_left', //缂栫爜琛ヤ綅鏂瑰紡
- codeFillSeparatorSelect: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
- codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:0, //琛ヤ綅鏃剁殑瀛楃
+ // codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? 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:'', //娴佹按涓婇檺
codeFillFlag: row!=null&&row.codeFillFlag != '' ? row.codeFillFlag=='true' ? true:false :false, //娴佹按鏄惁琛ョ爜
@@ -2591,6 +2672,7 @@
referBtmId: row!=null&&row.referBtmId != '' ? row.referBtmId:'', //鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬶紝鐨刬d
referBtmName: row!=null&&row.referBtmName != '' ? row.referBtmName:'', //鍙傜収寮曠敤鐨勪笟鍔＄被鍨�
referConfig: row!=null&&row.referConfig != '' ? row.referConfig:'', //鍙傜収閰嶇疆
+ referValueInfo: row!=null&&row.referValueInfo != '' ? row.referValueInfo:'', //鍙傜収閰嶇疆
});
}else if(this.form.secType==='codedatesec'){
//鏃ユ湡鐮佹
@@ -2612,9 +2694,9 @@
//鍙彉鐮佹
this.form = Object.assign({}, this.form,{
codeSecLength: row!=null&&row.codeSecLength != '' ? row.codeSecLength:'', //鐮佹鐨勯暱搴�
- codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_right', //缂栫爜閮ㄤ綅鏂瑰紡锛屾灇涓炬煡璇�
- codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //閫変腑鐨勮ˉ浣嶆椂鐨勫瓧绗︾殑涓嬫爣
- codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:'', //琛ヤ綅鏃剁殑瀛楃锛屽彲杈撳彲閫夋煡璇�
+ codeFillType: row!=null&&row.codeFillType != '' ? row.codeFillType:'code_fill_left', //缂栫爜閮ㄤ綅鏂瑰紡锛屾灇涓炬煡璇�
+ // codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //閫変腑鐨勮ˉ浣嶆椂鐨勫瓧绗︾殑涓嬫爣
+ codeFillSeparator: row!=null&&row.codeFillSeparator != '' ? row.codeFillSeparator:'0', //琛ヤ綅鏃剁殑瀛楃锛屽彲杈撳彲閫夋煡璇�
});
this.loadCodeFillType();
this.loadCodeFillSeparator();
@@ -2622,15 +2704,25 @@
// console.log(this.form);
},
// 绗竴娆¤姹傜殑鏋氫妇鏁版嵁鏀剧紦瀛�
- getLocalStorageEnum(key){
- let enumCach = JSON.parse(localStorage.getItem(key));
+ getLocalStorageEnum(enumKey){
+ let enumCach = JSON.parse(localStorage.getItem(enumKey));
if(enumCach == null) {
- getDictionary({code: key}).then(res=>{
+ getDictionary({code: enumKey}).then(res=>{
enumCach = res.data.data;
- localStorage.setItem(key,JSON.stringify(res.data.data));
+ localStorage.setItem(enumKey,JSON.stringify(res.data.data));
})
}
return enumCach;
+ },
+ // 缁熶竴鍔犺浇鎵�鏈夋灇涓炬煡璇紝涓昏鏄负閬垮厤鍒囨崲鐮佹绫诲瀷鏃惰繕鏈姞杞藉畬鎴愮殑鎯呭喌
+ loadTotalEnum(){
+ this.loadCodeSecType();
+ this.loadCodeSecLength();
+ this.loadCodeFillType();
+ this.loadCodeFillSeparator();
+ this.loadCodeLevelType();
+ this.loadCodeCutType();
+ this.loadCodeGetValueType();
},
//鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇�
loadCodeSecType(){
@@ -2644,7 +2736,13 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
},
loadCodeFillSeparator(){
- this.enumParam.codeFillSeparator = this.getLocalStorageEnum("codeFillSeparator");
+ let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ if(enumCach == null) {
+ getDictionary("codeFillSeparator").then(res=>{
+ this.enumParam.codeFillSeparator = res.data.data;
+ localStorage.setItem(key,JSON.stringify(res.data.data));
+ })
+ }
},
loadCodeLevelType(){
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
@@ -2670,7 +2768,7 @@
.code-rule-crud > .avue-crud__pagination {
padding: 14px 0 2px 20px;
}
-
+
.clone-input-textarea > .el-form-item__content {
width: 495px;
}
@@ -2690,7 +2788,7 @@
.other-clone-coderule-crud > .el-card> .el-card__body > .avue-crud__menu {
display: none!important;
}
-
+
.el-table--small .el-table__cell {
padding: 3px 0;
}
@@ -2732,8 +2830,8 @@
.left > .el-form-item > .el-form-item__content > .el-input-number > .el-input > .el-input__inner {
width:120px;
- }
-
+ }
+
.el-col>.el-card > .el-card__header {
background: rgb(213 231 239);
border-radius: inherit;
@@ -2788,4 +2886,8 @@
padding: 5px 10px 10px;
}
-</style>
\ No newline at end of file
+ .seloption{
+ margin-left: 10px;
+}
+
+</style>
--
Gitblit v1.9.3