From d5bafa63b4dcc7ad6840560134dd41f38ded1390 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 30 六月 2023 18:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 140 +++++++++++++++++++++++++++++-----------------
1 files changed, 89 insertions(+), 51 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 13cd051..a95f7dd 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -49,7 +49,7 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -65,7 +65,7 @@
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
- <classifyTreeform ref="childForm" :TreeNewForm="TreeList" :nodeList="nodeList"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'renonly'"></classifyTreeform>
</span>
<span v-else-if="type.prop==='tab2'">
<basic-container>
@@ -77,7 +77,7 @@
@select="selectHandle"
>
<template slot="menuLeft">
- <el-button plain size="small" type="primary" @click="FindFormVisible = true;">鏌ヨ</el-button>
+ <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="TreeEdit">淇敼</el-button>
<el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
@@ -169,7 +169,7 @@
</avue-crud>
</basic-container>
- <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist"></templatePro>
+ <templatePro :ProData="this.ProData" :crudOid="this.crudOid" :crudArray="this.crudArray" :Formlist="this.Formlist" :codeClassifyOid="this.codeClassifyOid"></templatePro>
</span>
</basic-container>
</el-main>
@@ -206,36 +206,36 @@
inject: [, "crudTreeData"],
data() {
return {
- //琛ㄦ牸option閰嶇疆椤�
- crudTreeOption: {
- index: true,
- border: true,
- height:180,
- selection:true,
- addBtn:this.addFlag,
- column: [
- {
- label: "妯℃澘缂栧彿",
- prop: "id"
- },
- {
- label:"妯℃澘鍚嶇О",
- prop:"name"
- },
- {
- label: "妯℃澘鎻忚堪",
- prop:"description"
- },
- {
- label:"鐗堟湰鍙�",
- prop:"revisionSeq"
- },
- {
- label:"鐘舵��",
- prop:"lcStatusText"
- }
- ]
- },
+ // //琛ㄦ牸option閰嶇疆椤�
+ // crudTreeOption: {
+ // index: true,
+ // border: true,
+ // height:180,
+ // selection:true,
+ // addBtn:this.addFlag,
+ // column: [
+ // {
+ // label: "妯℃澘缂栧彿",
+ // prop: "id"
+ // },
+ // {
+ // label:"妯℃澘鍚嶇О",
+ // prop:"name"
+ // },
+ // {
+ // label: "妯℃澘鎻忚堪",
+ // prop:"description"
+ // },
+ // {
+ // label:"鐗堟湰鍙�",
+ // prop:"revisionSeq"
+ // },
+ // {
+ // label:"鐘舵��",
+ // prop:"lcStatusText"
+ // }
+ // ]
+ // },
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
@@ -434,11 +434,51 @@
this.type = this.tabOption.column[0];
this.getAttr();
},
+ computed:{
+ crudTreeOption(){
+ return{
+ index: true,
+ border: true,
+ height:180,
+ selection:true,
+ addBtn:this.Formlist.length<=0 && this.nodeClickList != "",
+ column: [
+ {
+ label: "妯℃澘缂栧彿",
+ prop: "id"
+ },
+ {
+ label:"妯℃澘鍚嶇О",
+ prop:"name"
+ },
+ {
+ label: "妯℃澘鎻忚堪",
+ prop:"description"
+ },
+ {
+ label:"鐗堟湰鍙�",
+ prop:"revisionSeq",
+ display:false
+ },
+ {
+ label:"鐘舵��",
+ prop:"lcStatusText",
+ display:false
+ }
+ ]
+ }
+ }
+ },
methods: {
//琛屽崟閫変簨浠�
selectHandle(selection,row){
- this.crudOid=row.oid
- this.crudArray=selection
+ this.crudOid=row.oid;
+ this.crudArray=selection;
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.ProData = res.data.data;
+ }).catch(res => {
+ this.$message.error(res)
+ })
},
//鍒嗙被鏍戞暟鎹鐞�
getAttr() {
@@ -559,7 +599,7 @@
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
} else {
- this.TreeEditFormVisible = true
+ this.TreeEditFormVisible = true;
}
},
//鏍戝埛鏂�
@@ -633,7 +673,7 @@
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
this.nodeClickList = data
- console.log(data.oid)
+ this.ProData=[]
try {
await TreeObjcet(data.oid).then(res => {
this.FlagObj = res.data.data
@@ -648,16 +688,8 @@
return item.codeclassifyoid == this.nodeClickList.oid
}
})
- if(this.Formlist.length >0){
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
- this.ProData = res.data.data;
- console.log(this.ProData)
- }).catch(res => {
- this.$message.error(res)
- })
- }
}).catch(res => {
- console.log(res)
+ this.$message.error(res)
})
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
await getObjectByOid(this.nodeClickList.oid).then(res => {
@@ -666,13 +698,12 @@
this.$message.error(res)
})
} catch (error) {
- console.log(error)
+ this.$message.error(error)
}
},
//鍏嬮殕妯℃澘鏍戠殑鐐瑰嚮鍒囨崲鏁版嵁
async ClonenodeClick(data){
this.ClonenodeClickList=data;
- console.log("aaa",this.ClonenodeClickList.oid)
await gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}).then(res=>{
this.CloneFormlist = res.data.data.filter(item => {
if (item.codeclassifyoid != "") {
@@ -787,7 +818,7 @@
});
done()
}).catch(res => {
- console.log(res)
+ this.$message.error(res)
})
},
//妯℃澘绠＄悊鍒犻櫎
@@ -803,7 +834,6 @@
},
//妯℃澘绠＄悊琛ㄦ牸鏌ヨ
EnterFind() {
- console.log(this.Formlist)
if (this.FindText == "") {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data
@@ -828,6 +858,14 @@
})
})
},
+ // 鏌ヨ
+ FindeHanler(){
+ if(this.nodeClickList != ""){
+ this.FindFormVisible=true
+ }else {
+ this.$message.warning('璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�')
+ }
+ },
//鍏嬮殕妯℃澘閫夋嫨纭畾
Clonehandler(){
if(this.CloneSelect.length <= 0){
--
Gitblit v1.9.3