From 3ed6dac0e18dab7ad794a7081bd6579c94eb65ba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 15 十一月 2023 14:25:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 284 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 189 insertions(+), 95 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 08cea12..88d4b0b 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -3,26 +3,38 @@
<el-container>
<!-- 宸︿晶鑿滃崟-->
<el-aside>
- <basic-container style="overflow:hidden;">
+ <basic-container>
<div>
<div>
<div style="display: flex; flex-direction: column;">
<div style="display: flex;">
- <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
- <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
- <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
- <el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
+ <el-button plain size="small" type="primary" @click="TreeAdd" v-if="permissionList.TreeAddStatus">娣诲姞</el-button>
+ <el-button plain size="small" type="primary" @click="TreeEdit" v-if="permissionList.TreeEditStatus">淇敼</el-button>
+ <el-button plain size="small" type="primary" @click="TreeDel" v-if="permissionList.TreeDelStatus">鍒犻櫎</el-button>
+ <el-button plain size="small" type="primary" @click="flushed" v-if="permissionList.flushedStatus">鍒锋柊</el-button>
</div>
<div style="display: flex; margin-top: 10px">
- <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
- <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
- <el-button plain size="small" type="primary" @click.native="ImportExcel">瀵煎叆</el-button>
- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
+ <el-button plain size="small" type="primary" @click="Enable" v-if="permissionList.EnableStatus">鍚敤</el-button>
+ <el-button plain size="small" type="primary" @click="Deactivate" v-if="permissionList.DeactivateStatus">鍋滅敤</el-button>
+ <el-button plain size="small" type="primary" @click.native="ImportExcel" v-if="permissionList.ImportExcelStatus">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="ExportExcel" v-if="permissionList.ExportExcelStatus">瀵煎嚭</el-button>
</div>
</div>
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
</div>
</div>
+<!-- 宸︿晶鏍�-->
+ <div style="height: calc(100vh - 230px);overflow: auto">
+ <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
+ :defaultExpandAll="false"
+ :option="Treeoption"
+ class="classifyTree"
+ style="height: calc(100vh - 280px)"
+ @node-click="nodeClick"
+ >
+ </avue-tree>
+ </div>
+
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
<el-dialog v-loading="AddLoading" :before-close="TreeEscHandler"
:title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" append-to-body
@@ -51,6 +63,16 @@
<el-input v-model="TreeAddform.codeKeyAttrRepeatOidName" autocomplete="off" style="width: 585px"
@focus="Keyfouce"></el-input>
</el-form-item>
+ <el-form-item label="鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岋細" label-width="150px">
+ <el-switch
+ v-model="TreeAddform.codeKeyAttrValue"
+ active-text="鏄�"
+ inactive-text="鍚�"
+ active-color="#13ce66"
+ inactive-color="#ff4949"
+ @change="switchChange">
+ </el-switch>
+ </el-form-item>
<el-form-item label="鐩镐技鏌ヨ瑙勫垯锛�" label-width="150px">
<el-input v-model="TreeAddform.codeResembleRuleOidName" autocomplete="off" style="width: 585px"
@focus="simFouce"></el-input>
@@ -63,19 +85,12 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode" :flag="'edit'"
+ <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
+ :flag="'edit'"
:loneTreeNewForm="TreeList" :nodeClickList="nodeClickList"
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
</el-dialog>
- <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata"
- :defaultExpandAll="false"
- :option="Treeoption"
- class="classifyTree"
- style="height: calc(100vh - 230px);"
- @node-click="nodeClick"
- >
- </avue-tree>
</div>
</basic-container>
</el-aside>
@@ -102,9 +117,9 @@
</template>
<template slot="menuLeft">
- <el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
- <el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
- <el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
+ <el-button plain size="small" type="primary" @click="FindeHanler" v-if="permissionList.FindStatus">鏌ヨ</el-button>
+ <el-button plain size="small" type="primary" @click="TemRefresh" v-if="permissionList.TemRefreshStatus">鍒锋柊</el-button>
+ <el-button plain size="small" type="primary" @click="CloneBtn" v-if="permissionList.CloneBtnStuatus">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
<div>
@@ -141,7 +156,7 @@
<avue-tree ref="cloneTree" v-model="TreeAvueform" v-loading="loading" :data="Treedata"
:defaultExpandAll="false"
:option="Treeoption"
- style="height: 50.5vh;margin-right: 10px"
+ style="height: 50.5vh;margin-right: 10px;width: 300px"
@node-click="ClonenodeClick"
>
</avue-tree>
@@ -233,7 +248,8 @@
:rowIndex="this.selectRow"></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
- <el-dialog :visible.sync="MasterdialogVisible" append-to-body title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�">
+ <el-dialog :before-close="masterEscHandler" :visible.sync="MasterdialogVisible" append-to-body
+ title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -248,7 +264,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="SelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="masterData" :option="masterOption" @row-click="masterSelect">
+ <avue-crud :data="masterData" :option="Option" @row-click="masterSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -261,12 +277,12 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="MasterHandlerClick">纭畾</el-button>
- <el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="masterEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
- <el-dialog :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�">
+ <el-dialog :before-close="KeyEscHandler" :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -281,7 +297,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="KeySelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="KeyData" :option="masterOption" @row-click="KeySelect">
+ <avue-crud :data="KeyData" :option="Option" @row-click="KeySelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -290,16 +306,18 @@
<div style="height: 30px">
<div
style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px ">
- 宸茶缃殑鍊间负:[{{ this.TreeAddform.codeKeyAttrRepeatOidName == '' ? '鏈缃��' : this.TreeAddform.codekeyattrrepeatoidName }}]
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeKeyAttrRepeatOidName == '' ? '鏈缃��' : this.TreeAddform.codekeyattrrepeatoidName
+ }}]
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="KeyHandlerClick">纭畾</el-button>
- <el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="KeyEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
- <el-dialog :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�">
+ <el-dialog :before-close="simEscHandler" :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -314,7 +332,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="SimSelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="simData" :option="masterOption" @row-click="simSelect">
+ <avue-crud :data="simData" :option="Option" @row-click="simSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -323,20 +341,22 @@
<div style="height: 30px">
<div
style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px ">
- 宸茶缃殑鍊间负:[{{ this.TreeAddform.codeResembleRuleOidName == '' ? '鏈缃��' : this.TreeAddform.codeResembleRuleOidName }}]
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeResembleRuleOidName == '' ? '鏈缃��' : this.TreeAddform.codeResembleRuleOidName
+ }}]
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="simHandlerClick">纭畾</el-button>
- <el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="simEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 涓氬姟绫诲瀷-->
- <el-dialog :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�">
+ <el-dialog :before-close="BtmEscHandler" :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
- v-for="item in SelectOption"
+ v-for="item in masterSelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -360,7 +380,7 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="btmHandlerClick">纭畾</el-button>
- <el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="BtmEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
@@ -394,13 +414,9 @@
} from "@/api/template/templateAttr";
import {defaultReferDataGrid, referDataGrid} from '@/api/MasterData/master'
import func from "@/util/func";
-
+import {mapGetters} from "vuex";
export default {
name: "classifyTrees.vue",
- //浣跨敤inject鎺ユ敹鍙傛暟
- //Treeoption宸︿晶鏍戞柊澧炶〃鍗曢」 Treedata宸︿晶鏍戣妭鐐� 閰嶇疆椤� crudTreeOption鍙充晶琛ㄦ牸閰嶇疆椤� crudTreeData鍙充晶琛ㄦ牸鏄剧ず鍐呭
- //Treeform鍙充晶琛ㄥ崟閰嶇疆椤�
- inject: ["crudTreeData"],
data() {
return {
masterRow: null,
@@ -453,6 +469,34 @@
display: false
},
{
+ label: '涓氬姟绫诲瀷缂栧彿',
+ prop: 'id'
+ },
+ {
+ label: '涓氬姟绫诲瀷鍚嶇О',
+ prop: 'name'
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'description'
+ }
+ ]
+ },
+ Option: {
+ addBtn: false,
+ index: true,
+ columnBtn:false,
+ border: true,
+ menu: false,
+ height: 380,
+ column: [
+ {
+ label: '',
+ prop: 'radio',
+ width: 60,
+ display: false
+ },
+ {
label: '鑻辨枃鍚嶇О',
prop: 'id'
},
@@ -475,6 +519,16 @@
value: 'id',
label: '鑻辨枃鍚嶇О'
}
+ ],
+ masterSelectOption: [
+ {
+ value: 'id',
+ label: '涓氬姟绫诲瀷缂栧彿'
+ },
+ {
+ value: 'name',
+ label: '涓氬姟绫诲瀷鍚嶇О'
+ },
],
SelectValue: "id",
SelectFInd: "",
@@ -542,7 +596,9 @@
//缂栫爜瑙勫垯
codeRuleOidName: "",
//瀛樺偍鐨勪笟鍔＄被鍨�
- btmTypeName: ""
+ btmTypeName: "",
+ codeKeyAttrValue:false,
+ isParticipateCheck:0
},
rules: {
id: [
@@ -623,6 +679,7 @@
CloneSelect: [],
//鍏嬮殕妯℃澘option
ClonecrudTreeOption: {
+ columnBtn:false,
index: true,
border: true,
menu: false,
@@ -718,7 +775,6 @@
}
},
watch: {},
- //tab鏍忛粯璁ゆ槸琛ㄦ牸
mounted() {
this.type = this.tabOption.column[0];
this.getAttr();
@@ -733,10 +789,27 @@
}, true)
},
computed: {
+ ...mapGetters(["permission"]),
+ permissionList(){
+ return{
+ TreeAddStatus:this.vaildData(this.permission.classifyTree.tree_add,false),
+ TreeEditStatus:this.vaildData(this.permission.classifyTree.tree_edit,false),
+ TreeDelStatus:this.vaildData(this.permission.classifyTree.tree_delete,false),
+ flushedStatus:this.vaildData(this.permission.classifyTree.tree_break,false),
+ EnableStatus:this.vaildData(this.permission.classifyTree.tree_enable,false),
+ DeactivateStatus:this.vaildData(this.permission.classifyTree.tree_stop,false),
+ ImportExcelStatus:this.vaildData(this.permission.classifyTree.tree_import,false),
+ ExportExcelStatus:this.vaildData(this.permission.classifyTree.tree_export,false),
+ FindStatus:this.vaildData(this.permission.classifyTree.manage_search,false),
+ TemRefreshStatus:this.vaildData(this.permission.classifyTree.manage_break,false),
+ CloneBtnStuatus:this.vaildData(this.permission.classifyTree.manage_clone,false),
+ }
+ },
crudTreeOption() {
return {
index: true,
border: true,
+ columnBtn:false,
height: 180,
addBtn: this.Formlist.length <= 0 && this.nodeClickList != "",
editBtn: false,
@@ -790,9 +863,41 @@
}
},
created() {
-
},
methods: {
+ // switch
+ switchChange(){
+ this.TreeAddform.isParticipateCheck = this.TreeAddform.codeKeyAttrValue ? 1 : 0;
+ console.log(this.TreeAddform.isParticipateCheck)
+ },
+ //瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
+ BtmEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.BtmdialogVisible = false;
+ },
+ //鐩镐技椤瑰叧闂�
+ simEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.SimidialogVisible = false;
+ },
+ //鍏抽敭灞炴�у叧闂�
+ KeyEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.KeydialogVisible = false;
+ },
+ //缂栫爜瑙勫垯鍏抽棴
+ masterEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.MasterdialogVisible = false;
+ },
// 鍏抽棴寮圭獥
/** 瀵煎叆 */
ImportExcel() {
@@ -823,17 +928,9 @@
},
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
+ this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯纭畾
MasterHandlerClick() {
@@ -847,14 +944,17 @@
this.$set(this.TreeAddform, 'codeRuleOidName', this.masterName)
this.$set(this.TreeAddform, 'codeRuleOid', this.masterOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//缂栫爜鎺ュ彛
- MasterdefaultRend() {
+ MasterdefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'coderule',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Released'
+ 'conditionMap["lcstatus"]': 'Released',
+ 'limit':'-1',
+ ...masterParameter
}).then(res => {
this.masterData = res.data.records;
})
@@ -874,28 +974,23 @@
this.KeySelectLIst = []
this.$set(this.TreeAddform, 'codeKeyAttrRepeatOidName', this.KeyName)
this.$set(this.TreeAddform, 'codeKeyAttrRepeatOid', this.KeyOid)
+ this.masterRow=null;
}
},
//鍏抽敭灞炴�ф煡璇�
KeySelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.KeydefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.KeydefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
+ this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
- KeydefaultRend() {
+ KeydefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'codekeyattrrepeat',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Enabled'
+ 'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
+ ...masterParameter
}).then(res => {
this.KeyData = res.data.records;
})
@@ -924,21 +1019,14 @@
this.$set(this.TreeAddform, 'codeResembleRuleOidName', this.simName)
this.$set(this.TreeAddform, 'codeResembleRuleOid', this.simOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//鐩镐技椤规煡璇�
SimSelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.simdefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.simdefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
+ this.simdefaultRend(masterParameter)
},
// 鐩镐技椤瑰閫�
simSelect(row) {
@@ -948,11 +1036,13 @@
this.simOid = row.oid;
},
//鐩镐技椤归」鎺ュ彛
- simdefaultRend() {
+ simdefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'coderesemblerule',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Enabled'
+ 'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
+ ...masterParameter
}).then(res => {
this.simData = res.data.records;
})
@@ -969,18 +1059,20 @@
} else if (this.btmSelectList.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
} else {
+ this.$refs.myForm.clearValidate();
this.BtmdialogVisible = false;
this.btmSelectList = []
this.$set(this.TreeAddform, 'btmTypeName', this.btmName)
this.$set(this.TreeAddform, 'btmTypeId', this.btmOid)
this.$emit('MasterHandler', this.loneTreeNewForm)
+ this.masterRow=null;
}
},
//涓氬姟绫诲瀷鏌ヨ
BtmSelectFindeHandler() {
const masterParameter = {};
- masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
- this.btmdefaultRend(masterParameter);
+ masterParameter[`conditionMap['${this.SelectValue}']`] = this.SelectFInd;
+ this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
btmSelect(row) {
@@ -991,7 +1083,7 @@
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter) {
- referDataGrid({valueField: 'id', isMuti: 'false', ...masterParameter}).then(res => {
+ referDataGrid({valueField: 'id', isMuti: 'false','limit':'-1', ...masterParameter}).then(res => {
this.BtmData = res.data.data.records
})
},
@@ -1018,7 +1110,6 @@
})
//璋冪敤淇敼灞炴�у悕鏂规硶
this.ModifyProperties(this.CloneTreedata, 'name', 'label');
- console.log(this.CloneTreedata)
this.CloneTreedata = this.CloneTreedata.map(item => {
if (item.attributes.lcStatus === "Disabled") {
item.label += '銆愬仠鐢ㄣ��';
@@ -1074,7 +1165,6 @@
this.$message.warning('璇疯緭鍏ュ唴瀹癸紒');
} else {
const data = this.TreeAddform;
- // data.btmtypename= this.TreeList.btmtypename
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
TreeSave(data)
.then(() => {
@@ -1084,6 +1174,8 @@
});
Object.keys(this.TreeAddform).forEach(key => {
this.TreeAddform[key] = "";
+ this.TreeAddform.codeKeyAttrValue = false;
+ this.TreeAddform.isParticipateCheck = 0;
});
this.getAttr();
this.TreeAddFormVisible = false;
@@ -1172,7 +1264,10 @@
this.getAttr()
setTimeout(() => {
this.loading = false;
- this.nodeClickList = ""
+ this.$refs.tree.setCurrentKey(null);
+ this.nodeClickList = {}
+ this.TreeList = []
+ this.TreeFlagCode = true;
}, 600);
},
//鍚敤鍜屽仠鐢ㄩ兘鍏堝垽鏂姸鎬�
@@ -1241,11 +1336,9 @@
});
}
}
-
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- console.log(data);
//鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
this.TreeFlagCode = !data;
this.editTreeFLagCode = !data.parentId;
@@ -1276,6 +1369,10 @@
this.crudOid = ''
}
this.TreeList = res3.data.data;
+ if(!this.TreeList.isParticipateCheck){
+ this.$set(this.TreeList,"isParticipateCheck",0)
+ return
+ }
} catch (error) {
this.$message.error(error);
}
@@ -1467,9 +1564,6 @@
const {id, name} = row[0];
this.CloneModel = {id, name};
this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
- console.log('row', row)
- console.log('CloneSelect', this.CloneSelect)
- console.log('CloneModel', this.CloneModel)
},
//鍏嬮殕琛ㄥ崟鎻愪氦
Clonesubmit(row, done) {
@@ -1564,7 +1658,7 @@
}
.el-aside {
- height: calc(100% - 30px);
+ //height: calc(100% - 30px);
}
.el-main {
--
Gitblit v1.9.3