From d1b82bdc296e7bf882f50015a56c99b05b5ff9fd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 三月 2024 18:31:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 164 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 93 insertions(+), 71 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index c11e7a3..fd939dc 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -4,7 +4,7 @@
<!-- 宸︿晶鑿滃崟-->
<el-aside>
<basic-container>
- <div style="height: calc(100vh - 142px);!important;">
+ <div ref="TreeBox" style="height: calc(100vh - 144px);!important;">
<div class="headerCon" style="display: flex; flex-wrap: wrap;margin-bottom: 5px">
<el-button v-if="permissionList.TreeAddStatus" plain size="small" type="primary" @click="TreeAdd">娣诲姞
</el-button>
@@ -136,7 +136,7 @@
</basic-container>
</el-aside>
<el-main>
- <basic-container style="height: calc(100vh - 150px);">
+ <basic-container>
<!-- 鍙充晶琛ㄦ牸-->
<avue-tabs :option="tabOption" @change="handleChange"></avue-tabs>
<span v-if="type.prop==='tab1'">
@@ -164,31 +164,19 @@
@click="TemRefresh">鍒锋柊</el-button>
<el-button v-if="permissionList.CloneBtnStuatus" plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
<!-- 鏌ヨ瀵硅瘽妗�-->
- <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
- <div>
- <el-button size="small" type="primary" @click="AdvQueries">鏌ヨ</el-button>
- <el-button size="small" type="primary">閲嶇疆</el-button>
- </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">
- <el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
- @change="handleSelectChange(key)">
- <el-option label="妯℃澘缂栧彿" value="0"></el-option>
- <el-option label="妯℃澘鍚嶇О" value="1"></el-option>
- <el-option label="妯℃澘鎻忚堪" value="2"></el-option>
- <el-option label="鐗堟湰鍙�" value="3"></el-option>
- <el-option label="鐘舵��" value="4"></el-option>
- </el-select>
- <el-select v-model="condition[0]" placeholder="璇烽�夋嫨" style="width: 15%">
- <el-option label="鍖呭惈" value="0"></el-option>
- <el-option label="绛変簬" value="1"></el-option>
- </el-select>
- <el-input v-model="QueryArray[key]" style="width: 49%"></el-input>
- <span> <i class="el-icon-delete" style="font-size: 22px;margin-top:8px;margin-left: 10px"/></span>
+ <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ" width="30%" @close="searchReset">
+ <div style="text-align: center; margin-top: 5px;">
+ <el-select v-model="searchSelect" style="width: 35%">
+ <el-option v-for="item in crudFindTreeArray" :key="item.field" :label="item.title"
+ :value="item.queryField"></el-option>
+ </el-select>
+ <el-input v-model="SearchValue"
+ placeholder="璇疯緭鍏ュ叧閿瓧杩涜鏌ヨ" style="width: 45%; margin-left: 5px;"></el-input>
</div>
- </template>
- </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="advQueries">鏌ヨ</el-button>
+ <el-button type="danger" @click="searchReset">閲嶇疆</el-button>
+ </span>
</el-dialog>
<!-- 妯℃澘鍏嬮殕 -->
<el-dialog :before-close="cloneClose" :visible.sync="CloneVisible" append-to-body title="鍏嬮殕妯℃澘">
@@ -350,7 +338,6 @@
TreeSave,
TreeDel,
TreeCheckDel,
- TreeObjcet,
TreeEnable,
TreeDeactivate,
gridCodeClassifyTemplate,
@@ -379,6 +366,40 @@
name: "classifyTrees.vue",
data() {
return {
+ crudFindTreeArray: [
+ {
+ title: '妯℃澘缂栧彿',
+ field: 'id',
+ fieldType: 'text',
+ queryField: 'id'
+ },
+ {
+ title: '妯℃澘鍚嶇О',
+ field: 'name',
+ fieldType: 'text',
+ queryField: 'name'
+ },
+ {
+ title: '妯℃澘鎻忚堪',
+ field: 'description',
+ fieldType: 'text',
+ queryField: 'description'
+ },
+ {
+ title: '鐗堟湰鍙�',
+ field: 'revisionSeq',
+ fieldType: 'text',
+ queryField: 'revisionSeq'
+ },
+ {
+ title: '鐘舵��',
+ field: 'lcStatusText',
+ fieldType: 'text',
+ queryField: 'lcStatusText'
+ },
+ ],
+ searchSelect: 'id',
+ SearchValue: '',
allButtons: Boolean,
btnAuthList: [],
activeName: 'first',
@@ -513,7 +534,7 @@
Treedata: [],
CloneTreedata: [],
Treeoption: {
- height:'auto',
+ height: 'auto',
addBtn: false,
editBtn: false,
delBtn: false,
@@ -564,7 +585,7 @@
},
{
label: '鎻忚堪',
- prop: 'desc',
+ prop: 'description',
type: 'textarea',
span: 24
}
@@ -670,22 +691,31 @@
showEditBtn: false,
//浼犻�掔粰鍒嗙被鎺堟潈瀛愮粍浠跺璇濇鐨勫綋鍓嶉�変腑鐨勫垎绫昏妭鐐逛俊鎭�
classifyData: "",
+
}
},
watch: {},
mounted() {
- this.type = this.tabOption.column[0];
+ this.type = this.tabOption.column[0] || {label: '鍩烘湰淇℃伅', prop: 'tab1'};
this.getAttr();
- const treeEle = this.$refs.tree.$el
- treeEle.addEventListener('click', (e) => {
- if (e.target.nodeName !== 'SPAN') {
+ // const treeEle = this.$refs.tree.$el;
+ const TreeBox = this.$refs.TreeBox;
+ // console.log(this.$refs.TreeBox)
+ // treeEle.addEventListener('click', (e) => {
+ // console.log('2')
+ // if (e.target.nodeName !== 'SPAN') {
+ // this.$refs.tree.setCurrentKey(null);
+ // this.nodeClickList = {};
+ // this.TreeFlagCode = true;
+ // this.allButtons = false;
+ // }
+ // }, true)
+ TreeBox.addEventListener('click', (e) => {
+ if (e.target.nodeName !== 'SPAN' && e.target.nodeName !== 'BUTTON') {
this.$refs.tree.setCurrentKey(null);
this.nodeClickList = {};
this.TreeFlagCode = true;
this.allButtons = false;
- // this.$nextTick(()=>{
- // this.btnAuthList = [];
- // })
}
}, true)
},
@@ -769,7 +799,7 @@
codeClassifyOid: ''
}
}
- }
+ },
},
created() {
},
@@ -1108,7 +1138,6 @@
this.loading = false;
}
},
-
async Deactivate() {
if (Object.keys(this.nodeClickList).length < 1) {
this.$message.warning('璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�');
@@ -1153,7 +1182,7 @@
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- const response = this.findTheTopLevelNode(data,this.Treedata)
+ const response = this.findTheTopLevelNode(data, this.Treedata)
this.classifyData = response;
// console.log(response)
// console.log('response',response.attributes.id)
@@ -1171,10 +1200,9 @@
this.crudArray = []
try {
this.requestCount += 1;
- const [res1, res2, res3] = await Promise.all([
- TreeObjcet(data.oid),
+ const [res1, res2] = await Promise.all([
+ getObjectByOid(data.oid),
gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': data.oid}),
- getObjectByOid(data.oid)
]);
this.FlagObj = res1.data.data;
this.Formlist = res2.data.data.filter(item => {
@@ -1192,7 +1220,7 @@
this.ProData = [];
this.crudOid = ''
}
- this.TreeEditObj = res3.data.data;
+ this.TreeEditObj = res1.data.data;
if (this.TreeEditObj.isParticipateCheck === null || this.TreeEditObj.isParticipateCheck === undefined || this.TreeEditObj.isParticipateCheck === "") {
this.$set(this.TreeEditObj, "isParticipateCheck", 1)
return
@@ -1201,10 +1229,9 @@
this.$message.error(error);
}
},
-
// 閫掑綊鏌ユ壘椤跺眰鑺傜偣Id
- findTheTopLevelNode(data,TreeData){
- if(data.parentId === ""){
+ findTheTopLevelNode(data, TreeData) {
+ if (data.parentId === "") {
return data;
}
const parentNode = this.findParentNode(data.parentId, TreeData);
@@ -1213,7 +1240,7 @@
}
},
// 閫掑綊鏌ユ壘鍑烘潵澶氬眰鑺傜偣鐨勭埗鑺傜偣
- findParentNode(parentId, TreeData){
+ findParentNode(parentId, TreeData) {
for (const node of TreeData) {
if (node.oid === parentId) {
return node;
@@ -1278,34 +1305,28 @@
handleChange(column) {
this.type = column;
},
- AdvQueries() {
- this.FindFormVisible = false
- //濡傛灉鍏ㄩ儴涓虹┖ allEmpty涓簍rue
- const allEmpty = Object.values(this.QueryArray).every(value => !value);
- //濡傛灉鍏ㄩ儴涓虹┖锛岀偣鍑绘煡璇㈠嚭鐜版墍鏈夋暟鎹�
- if (allEmpty) {
- gridCodeClassifyTemplate().then(res => {
- this.Formlist = res.data.data
- })
+ advQueries() {
+ if (this.SearchValue === "") {
+ this.$message.warning('璇疯緭鍏ヨ鏌ヨ鐨勫唴瀹癸紒');
} else {
- //榛樿鏄瓑浜�
- gridCodeClassifyFindTemplate({'conditionMap[id]': this.QueryArray.id},
- {'conditionMap[name]': this.QueryArray.name},
- {'conditionMap[description]': this.QueryArray.description},
- {'conditionMap[revisionValue]': this.QueryArray.revisionValue},
- {'conditionMap[lcStatus]': this.QueryArray.lcStatus}
- ).then(res => {
- this.Formlist = res.data.data
- })
+ const condition = {
+ 'conditionMap[codeclassifyoid]': this.nodeClickList.oid,
+ [`conditionMap[${this.searchSelect}]`]: this.SearchValue
+ };
+ gridCodeClassifyFindTemplate(condition).then(res => {
+ if (res.data.data.length > 0) {
+ this.Formlist = res.data.data;
+ } else {
+ this.$message.error('鏆傛湭鏌ヨ鍒扮浉鍏虫ā鏉匡紒')
+ }
+ this.FindFormVisible = false;
+ });
}
},
- //妯℃澘绠＄悊娓叉煋
- CrudRend() {
- gridCodeClassifyTemplate({'conditionMap[codeclassifyoid]': this.nodeClickList.oid}).then(res => {
- this.Formlist = res.data.data
- })
+ searchReset() {
+ this.SearchValue = "";
+ this.searchSelect = 'id'
},
-
//妯℃澘绠＄悊琛ㄦ牸娣诲姞
CrudRowSave(row, done) {
if (this.nodeClickList.length <= 0) {
@@ -1550,6 +1571,7 @@
.headerCon > .el-button:nth-child(9) {
margin-left: 0;
}
+
///deep/.el-scrollbar__bar.is-vertical{
// width: 8px;
//}
--
Gitblit v1.9.3