From ded6e8d2312e139e8ce770c7f1d5830bf2db4af6 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期三, 19 七月 2023 11:39:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 38 ++++++++++++++++++++++++++------------ 1 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue index b57d4e4..265d4ee 100644 --- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue +++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue @@ -3,7 +3,7 @@ <el-container> <!-- 宸︿晶鑿滃崟--> <el-aside > - <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;"> + <basic-container style="overflow:hidden;"> <div> <div> <div style="display: flex; flex-direction: column;"> @@ -62,7 +62,7 @@ </el-dialog> <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false" :option="Treeoption" - style="height: 80.5vh;padding-top: 5px;padding-bottom: 30px" + style="height: calc(100vh - 230px);" @node-click="nodeClick" class="classifyTree" > @@ -71,7 +71,7 @@ </basic-container> </el-aside> <el-main> - <basic-container style="height: 85vh; max-height: 155vh; "> + <basic-container style="height: calc(100vh - 150px);"> <!-- 鍙充晶琛ㄦ牸--> <avue-tabs :option="tabOption" @change="handleChange"></avue-tabs> <span v-if="type.prop==='tab1'"> @@ -124,10 +124,10 @@ <div style="margin-bottom: 5px"><el-tag>涓婚搴撳垎绫�</el-tag></div> <!-- 鍏嬮殕妯℃澘鐨勬爲 娌跨敤棣栭〉鏍戠殑loading鍜宱ption锛屼絾鏄痙ata鍜寁-model缁戝畾鐨勬暟鎹垱寤轰竴涓柊鐨勫彉閲忥紝鍙﹀鐐瑰嚮鏂规硶涔熸槸閲嶆柊鑾峰彇鏉ユ搷浣滃厠闅嗘ā鏉跨殑鏁版嵁--> <avue-tree v-model="TreeAvueform" v-loading="loading" :data="Treedata" - :defaultExpandAll="false" - :option="Treeoption" - style="height: 50.5vh;margin-right: 10px" - @node-click="ClonenodeClick" + :defaultExpandAll="false" + :option="Treeoption" + style="height: 50.5vh;margin-right: 10px" + @node-click="ClonenodeClick" > </avue-tree> </el-aside> @@ -172,11 +172,12 @@ </template> <template #menu="{ size, row ,index}"> <el-button type="text" - v-if="row.lcStatus != 'Released'" + v-if="row.lcStatus == 'Editing'" icon="el-icon-edit-outline " - :size="size" - @click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button> + :size="size" + @click="$refs.textCrud.rowEdit(row)">缂栬緫</el-button> <el-button type="text" + v-if="row.lcStatus == 'Editing'" icon="el-icon-delete" :size="size" @click="$refs.textCrud.rowDel(row,index)">鍒犻櫎</el-button> @@ -211,7 +212,7 @@ </avue-crud> </basic-container> - <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro> + <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudLCStatus="this.crudLCStatus" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro> </span> <!-- 缂栫爜瑙勫垯--> <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body> @@ -414,6 +415,8 @@ addFlag:false, // 琛ㄦ牸褰撳墠琛宨d crudOid:"", + //褰撳墠閫変腑妯℃澘鐘舵�� + crudLCStatus:'', //琛ㄦ牸褰撳墠閫夋嫨鏁扮粍 crudArray:[], //妯℃澘灞炴�у睍绀哄唴瀹� @@ -922,8 +925,10 @@ //琛屽崟閫変簨浠� selectHandle(selection,row){ this.crudOid=row.oid; + this.crudLCStatus=row.lcStatus; this.crudArray=selection; - gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => { + console.log(selection,row) + gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => { this.ProData = res.data.data; }).catch(res => { this.$message.error(res) @@ -1389,6 +1394,15 @@ </script> <style lang="scss" scoped> +.el-container{ + height: 100%; +} +.el-aside { + height: calc(100% - 30px); +} +.el-main { + height: calc(100% - 30px); +} .el-form { display: flex; flex-wrap: wrap; /* 璁剧疆鍙崲琛岋紝浠ヤ究鍦ㄥ皬灞忓箷璁惧涓婁娇鐢ㄥ琛屽竷灞� */ -- Gitblit v1.9.3