From 2025087a8dec8f2d301459b9d41c9ef00f6f9289 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 17:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index b1ed81c..2ed6a7c 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:[],
//妯℃澘灞炴�у睍绀哄唴瀹�
@@ -749,7 +752,6 @@
this.$set(this.TreeAddform,'codeRuleOidName',this.masterName)
this.$set(this.TreeAddform,'codeRuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
}
},
//缂栫爜鎺ュ彛
@@ -777,7 +779,6 @@
this.KeySelectLIst=[]
this.$set(this.TreeAddform,'codeKeyAttrRepeatOidName',this.KeyName)
this.$set(this.TreeAddform,'codeKeyAttrRepeatOid',this.KeyOid)
- console.log(this.TreeAddform)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -856,7 +857,6 @@
this.simSelectList=row;
this.simName=row[0].name;
this.simOid=row[0].oid;
- console.log('oid',this.oid)
},
//鐩镐技椤归」鎺ュ彛
simdefaultRend(){
@@ -914,7 +914,6 @@
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- // console.log(res)
this.BtmData=res.data.data.records
})
},
@@ -925,8 +924,9 @@
//琛屽崟閫変簨浠�
selectHandle(selection,row){
this.crudOid=row.oid;
+ this.crudLCStatus=row.lcStatus;
this.crudArray=selection;
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': row.oid}).then(res => {
this.ProData = res.data.data;
}).catch(res => {
this.$message.error(res)
@@ -973,7 +973,6 @@
const data = this.TreeAddform;
// data.btmtypename= this.TreeList.btmtypename
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
- console.log("data", data);
TreeSave(data)
.then(() => {
this.$message({
@@ -1058,7 +1057,6 @@
});
} else {
this.TreeEditFormVisible = true;
- console.log(this.TreeList)
}
},
//鏍戝埛鏂�
@@ -1149,7 +1147,6 @@
this.codeClassifyOid = item.codeclassifyoid
return item.codeclassifyoid == this.nodeClickList.oid
}
- console.log('Formlist',this.Formlist)
})
}).catch(res => {
this.$message.error(res)
@@ -1242,7 +1239,6 @@
});
})
}
- console.log('123',this.codeClassifyOid)
},
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
@@ -1396,6 +1392,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