From 740caba0bd53bda276846028e9c620c23ffdb7ea Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 10 七月 2023 16:28:53 +0800 Subject: [PATCH] 主题库实施bug以及样式 --- Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 66 +++++++++++++++++++++++++------- Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 21 +++++----- Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 19 ++++++--- 3 files changed, 75 insertions(+), 31 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue index e73549b..faa8b02 100644 --- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue +++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue @@ -1,6 +1,6 @@ <template> <div> - <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag"> + <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app"> <el-button-group> <!--鏂板--> <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button> @@ -242,7 +242,7 @@ </div> <el-table :data="ProData" style="width: 100%" - height="280" + :height='attrEditVisible == false && attrFlagChiledren==false?400 :750' @cell-click="handleCellClicks" @select="selectHandle" @selection-change="selectionChange" @@ -936,11 +936,13 @@ column: [ { label: "灞炴�ц嫳鏂囧悕绉�", - prop: "id" + prop: "id", + width:110 }, { label: "灞炴�т腑鏂囧悕绉�", - prop: "name" + prop: "name", + width:110 }, { label: "闀垮害", @@ -1484,6 +1486,7 @@ //涓氬姟绫诲瀷閫夋嫨 businessSelect(selection, row) { this.busineSelectList = selection + console.log(selection) }, // 浠庝笟鍔$被鍨嬩腑閫夋嫨鏁版嵁寮圭獥 busineHandle() { @@ -1813,7 +1816,11 @@ </script> <style scoped lang="scss" > -/deep/ .el-button { - margin: 0 10px 10px 0; +///deep/ .el-button { +// margin: 0 10px 10px 0; +//} +.app el-button{ + z-index: 1; + margin: 0 10px 10px 0 !important; } </style> diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue index facc6d9..5eb3f23 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue @@ -110,7 +110,7 @@ import {TreeEditSave} from '@/api/template/templateAttr' export default { name: "classifyTreeform.vue", - props: ['loneTreeNewForm','flag','Editclose','TreeFlag'], + props: ['loneTreeNewForm','flag','Editclose','TreeFlag','nodeClickList'], data() { return { SelectFInd:"", @@ -288,7 +288,7 @@ labelWidth:128, focus:this.btmFoucus, readonly: true, - hide:this.TreeFlag, + display:false, rules: [{ required: true, message: "瀛樺偍鐨勪笟鍔$被鍨�", @@ -326,15 +326,16 @@ btmSelectList:[] } }, - created() { - }, watch:{ - // TreeFlag:{ - // handler(newval){ - // const falg=newval; - // this.findObject(this.) - // } - // } + nodeClickList:{ + handler(newval,oldval){ + console.log('newVal',newval,oldval) + }, + deep:true, + immediate:true + } + }, + created() { }, methods: { submits(form,done){ diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue index 106a39c..9512d4b 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue @@ -2,8 +2,9 @@ <template> <el-container> <!-- 宸︿晶鑿滃崟--> - <el-aside> - <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;"> + <el-aside > + <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;"@click.native="handleClickOutside" > + <div @click.native="handleClickOutside"> <div> <div style="display: flex;justify-content: space-around"> <el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button> @@ -51,7 +52,7 @@ </el-dialog> <!-- 淇敼瀵硅瘽妗�--> <el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被"> - <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlag"></classifyTreeform> + <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlag" ::nodeClickList="nodeClickList"></classifyTreeform> </el-dialog> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" @@ -60,6 +61,7 @@ @check-change="checkChange" > </avue-tree> + </div> </basic-container> </el-aside> <el-main> @@ -67,7 +69,7 @@ <!-- 鍙充晶琛ㄦ牸--> <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs> <span v-if="type.prop==='tab1'"> - <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform> + <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'" ></classifyTreeform> </span> <span v-else-if="type.prop==='tab2'"> <basic-container> @@ -117,7 +119,7 @@ <el-aside width="300px"> <div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div> <!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁--> - <avue-tree ref="tree" v-model="TreeAvueform" v-loading="loading" :data="Treedata" + <avue-tree v-model="TreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false" :option="Treeoption" style="height: 50.5vh;margin-right: 10px" @@ -286,7 +288,7 @@ </template> <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud> <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.btmtypename}}]</div> + <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.btmTypeName}}]</div> <div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" > <el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button> <el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button> @@ -540,11 +542,21 @@ column: [ { label: "妯℃澘缂栧彿", - prop: "id" + prop: "id", + rules: [{ + required: true, + message: "妯℃澘缂栧彿", + trigger: "blur" + }] }, { label: "妯℃澘鍚嶇О", prop: "name", + rules: [{ + required: true, + message: "妯℃澘鍚嶇О", + trigger: "blur" + }] }, { label: "妯℃澘鎻忚堪", @@ -628,11 +640,21 @@ column: [ { label: "妯℃澘缂栧彿", - prop: "id" + prop: "id", + rules: [{ + required: true, + message: "妯℃澘缂栧彿", + trigger: "blur" + }] }, { - label:"妯℃澘鍚嶇О", - prop:"name" + label: "妯℃澘鍚嶇О", + prop: "name", + rules: [{ + required: true, + message: "妯℃澘鍚嶇О", + trigger: "blur" + }] }, { label: "妯℃澘鎻忚堪", @@ -653,6 +675,18 @@ } }, methods: { + //鏍戣妭鐐瑰け鍘荤劍鐐� + handleClickOutside(event) { + const treeElement = this.$refs.tree.$el; + const targetElement = event.target; + if (!treeElement.contains(targetElement)) { + // 鍦ㄦ爲缁勪欢澶栭儴鐐瑰嚮锛屾竻绌洪�夋嫨鐘舵�� + // this.nodeClickList=[]; + // this.CloneTreeAvueform={} + console.log(this.nodeClickList ) + console.log(this.CloneTreeAvueform) + } + }, //缂栫爜瑙勫垯澶辩劍 CodeFoucus(){ this.MasterdialogVisible=true; @@ -829,8 +863,8 @@ }else { this.BtmdialogVisible=false; this.btmSelectList=[] - this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid) - this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid) + this.$set(this.TreeAddform,'btmTypeName',this.btmName) + this.$set(this.TreeAddform,'btmTypeId',this.btmOid) this.$emit('MasterHandler',this.loneTreeNewForm) } }, @@ -918,18 +952,20 @@ //鏍戣妭鐐规坊鍔犱簨浠� TreeAddHandler() { const data = this.TreeAddform; - data.btmTypeName= this.TreeList.btmtypename + // data.btmtypename= this.TreeList.btmtypename this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid); - // console.log("data", data); + console.log("data", data); TreeSave(data) .then(() => { this.$message({ type: "success", message: "娣诲姞鎴愬姛!", }); + Object.keys(this.TreeAddform).forEach(key => { + this.TreeAddform[key] = ""; + }); this.getAttr(); this.TreeAddFormVisible = false; - this.TreeAddform = ""; }) .catch((res) => { this.$message({ -- Gitblit v1.9.3