From 7ff3f607595a30fc66924eb4b60ff00407afbbc2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 05 七月 2023 19:30:34 +0800
Subject: [PATCH] 代码整合
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 178 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 57 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 9048526..4741278 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -7,8 +7,10 @@
<div>
<div style="display: flex;justify-content: space-around">
<el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</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="ExportExcel">瀵煎嚭</el-button>-->
+<!-- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
<el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
</div>
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -49,7 +51,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 +67,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,16 +79,25 @@
@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>
<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="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
- <div style="display: inline-block"> <el-input v-model="FindText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small"
- @keyup.enter.native="EnterFind"></el-input></div>
+ <!-- <div style="display: inline-block">
+ <el-select v-model="searchTemplate.searchCondition" placeholder="璇烽�夋嫨" class="search-condition">
+ <el-option
+ v-for="item in searchTemplateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <el-input v-model="searchTemplate.findText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+ size="small"
+ @keyup.enter.native="EnterFind">
+ </el-input>
+ </div> -->
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
<div>
@@ -95,7 +106,7 @@
</div>
<div style="padding-left: 80px;margin-top: 15px;">
<template v-for="(value, key) in FindSelect">
- <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px">
+ <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
<el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
@change="handleSelectChange(key)">
<el-option label="妯℃澘缂栧彿" value="0"></el-option>
@@ -206,36 +217,45 @@
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"
+ // }
+ // ]
+ // },
+ // searchTemplateOptions: [
+ // {
+ // value: 'id',
+ // label: '妯℃澘缂栧彿'
+ // }, {
+ // value: 'name',
+ // label: '妯℃澘鍚嶇О'
+ // }
+ // ],
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
@@ -244,7 +264,11 @@
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
- FindText: "",
+ searchTemplate: {
+ searchCondition: 'id',
+ findText: "",
+ },
+
//楂樼骇鏌ヨ瀵硅瘽妗�
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
@@ -434,6 +458,41 @@
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){
@@ -441,7 +500,6 @@
this.crudArray=selection;
gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
this.ProData = res.data.data;
- console.log(this.ProData)
}).catch(res => {
this.$message.error(res)
})
@@ -565,7 +623,7 @@
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
} else {
- this.TreeEditFormVisible = true
+ this.TreeEditFormVisible = true;
}
},
//鏍戝埛鏂�
@@ -639,7 +697,6 @@
async nodeClick(data) {
//瀹氫箟涓�涓ā鏉垮睘鎬d锛屾暟鎹槸妯℃澘绠＄悊琛ㄦ牸閲岄潰鐨刼id
this.nodeClickList = data
- console.log(data.oid)
this.ProData=[]
try {
await TreeObjcet(data.oid).then(res => {
@@ -656,7 +713,7 @@
}
})
}).catch(res => {
- console.log(res)
+ this.$message.error(res)
})
// 鍩烘湰淇℃伅琛ㄥ崟鏁版嵁
await getObjectByOid(this.nodeClickList.oid).then(res => {
@@ -665,13 +722,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 != "") {
@@ -759,8 +815,7 @@
message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
});
} else {
- let codeClassifyOid = this.codeClassifyOid
- this.$set(row, "codeclassifyoid", codeClassifyOid)
+ this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
addSave(row).then(() => {
this.$message({
type: "success",
@@ -775,6 +830,7 @@
});
})
}
+ console.log('123',this.codeClassifyOid)
},
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
@@ -786,7 +842,7 @@
});
done()
}).catch(res => {
- console.log(res)
+ this.$message.error(res)
})
},
//妯℃澘绠＄悊鍒犻櫎
@@ -800,21 +856,20 @@
});
})
},
- //妯℃澘绠＄悊琛ㄦ牸鏌ヨ
- EnterFind() {
- console.log(this.Formlist)
- if (this.FindText == "") {
+ //妯℃澘绠＄悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
+ /*nterFind() {
+ if (this.findText == "") {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data
})
} else {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data.filter(item => {
- return item.name.includes(this.FindText)
+ return item.name.includes(this.findText)
})
})
}
- },
+ },*/
//鍏嬮殕妯℃澘鏌ヨ
CloneEnterFind(){
gridCodeClassifyTemplate().then(res => {
@@ -826,6 +881,14 @@
}
})
})
+ },
+ // 鏌ヨ
+ FindeHanler(){
+ if(this.nodeClickList != ""){
+ this.FindFormVisible=true
+ }else {
+ this.$message.warning('璇蜂粠鏍戜笂閫夋嫨涓�鏉℃暟鎹�')
+ }
},
//鍏嬮殕妯℃澘閫夋嫨纭畾
Clonehandler(){
@@ -918,4 +981,5 @@
.my-messageboxs {
width: 500px;
}
+
</style>
--
Gitblit v1.9.3