From ee7d7c29b8d95f0adab3bd9d93fdb1af51565a2d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 03 八月 2023 20:54:48 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 73 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index f0d7364..54d9a47 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -24,7 +24,7 @@
</div>
</div>
<!-- 鏍戣妭鐐规坊鍔犲璇濇-->
- <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" append-to-body
+ <el-dialog :title="this.TreeFlag ? '娣诲姞鍒嗙被' :'娣诲姞涓婚搴�'" :before-close="TreeEscHandler" :visible.sync="TreeAddFormVisible" v-loading="AddLoading" append-to-body
style="width: 1700px;margin: auto">
<el-form :model="TreeAddform" :rules="rules">
<el-form-item :label="this.TreeFlag ? '鍒嗙被缂栧彿锛�' :'涓婚搴撶紪鍙凤細'" label-width="150px" style="display: inline-block" prop="id">
@@ -52,13 +52,13 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="TreeAddFormVisible = false">鍙� 娑�</el-button>
+ <el-button @click="TreeEscHandler">鍙� 娑�</el-button>
<el-button type="primary" @click="TreeAddHandler">纭� 瀹�</el-button>
</div>
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="TreeFlagCode" :nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
+ <classifyTreeform ref="childForm" :loneTreeNewForm="TreeList" :nodeList="nodeList" :flag="'edit'" @MasterHandler="MasterHandler" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode" :nodeClickList="nodeClickList" @referTreeForm="referTreeForm" @flushed="flushed"></classifyTreeform>
</el-dialog>
<avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="CloneTreedata" :defaultExpandAll="false"
:option="Treeoption"
@@ -303,7 +303,11 @@
<el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
<el-button size="small" type="primary" plain @click="BtmSelectFindeHandler" style="margin-left: 20px">鏌ヨ</el-button>
</template>
- <avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></avue-crud>
+ <avue-crud :data="BtmData" :option="masterOption" @row-click="btmSelect">
+ <template slot="radio" slot-scope="{row}">
+ <el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{''}}</el-radio>
+ </template>
+ </avue-crud>
<div style="height: 30px">
<div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.TreeAddform.btmTypeName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
@@ -350,15 +354,18 @@
inject: ["crudTreeData"],
data() {
return {
+ masterRow:null,
AddLoading:false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
- requestCount:0,
+ requestCount:null,
//瀵煎叆鐘舵�佹
ThemeImportVisible:false,
selectRow:'',
selectList:[],
//鏍戣妭鐐规樉绀洪殣钘�
- TreeFlagCode:false,
+ TreeFlagCode:true,
+ //淇敼鑺傜偣鏄剧ず闅愯棌
+ editTreeFLagCode:false,
//缂栫爜瑙勫垯
MasterdialogVisible:false,
masterData:[],
@@ -387,10 +394,15 @@
addBtn:false,
index:true,
border:true,
- selection:true,
menu:false,
height:380,
column:[
+ {
+ label: '',
+ prop: 'radio',
+ width: 60,
+ display: false
+ },
{
label:'鑻辨枃鍚嶇О',
prop:'id'
@@ -486,10 +498,10 @@
},
rules: {
id: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
+ { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
],
name:[
- { required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur' },
+ { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur' },
],
btmTypeName:[
{ required: true, message: '璇烽�夋嫨涓氬姟绫诲瀷', trigger: 'blur' },
@@ -676,7 +688,7 @@
this.$refs.tree.setCurrentKey(null)
this.nodeClickList = {}
this.TreeList=[]
- this.TreeFlagCode=false;
+ this.TreeFlagCode=true;
}
}, true)
},
@@ -953,9 +965,10 @@
},
//涓氬姟绫诲瀷澶氶��
btmSelect(row){
+ this.masterRow=row.$index;
this.btmSelectList=row;
- this.btmName=row[0].name;
- this.btmOid=row[0].id;
+ this.btmName=row.name;
+ this.btmOid=row.id;
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
@@ -986,8 +999,16 @@
})
//璋冪敤淇敼灞炴�у悕鏂规硶
this.ModifyProperties(this.CloneTreedata, 'name', 'label');
+ console.log(this.CloneTreedata)
+ this.CloneTreedata = this.CloneTreedata.map(item => {
+ if (item.attributes.lcStatus === "Disabled") {
+ item.label += '銆愬仠鐢ㄣ��';
+ }
+ return item;
+ });
}).catch(res => {
this.$message.error(res)
+
})
},
//瀹氫箟涓�涓慨鏀规暟鎹睘鎬у悕鐨勬柟娉�
@@ -1011,9 +1032,8 @@
background: 'rgba(0, 0, 0, 0.3)'
});
try {
- if (this.nodeClickList !== "") {
- this.TreeFlag = true;
- }
+ //鏂板琛ㄥご鍚嶇О
+ this.TreeFlag=!this.nodeClickList
await new Promise(resolve => setTimeout(resolve, 500));
this.TreeAddFormVisible = true;
loading.close();
@@ -1021,6 +1041,11 @@
this.$message.error(error);
loading.close();
}
+ },
+ //鏍戣妭鐐瑰彇娑堜簨浠�
+ TreeEscHandler(){
+ this.TreeAddform={};
+ this.TreeAddFormVisible=false
},
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
@@ -1038,6 +1063,9 @@
});
this.getAttr();
this.TreeAddFormVisible = false;
+ //娣诲姞瀹屾垚鍚庡彸渚ф竻绌�
+ this.ProData=[];
+ this.Formlist=[];
})
.catch((res) => {
this.$message({
@@ -1193,11 +1221,9 @@
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
console.log(data);
- if (data.parentId === "") {
- this.TreeFlagCode = true;
- }else {
- this.TreeFlagCode =false;
- }
+ //鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
+ this.TreeFlagCode = !data;
+ this.editTreeFLagCode = !data.parentId;
this.nodeClickList = data;
this.selectRow = 0;
try {
@@ -1221,6 +1247,7 @@
await this.gridCode();
} else {
this.ProData = [];
+ this.crudOid=''
}
this.TreeList = res3.data.data;
} catch (error) {
@@ -1318,7 +1345,7 @@
message: "娣诲姞鎴愬姛!"
});
done(row)
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
@@ -1330,7 +1357,7 @@
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
editSave(row).then(() => {
- this.CrudRend()
+ this.TemRefresh();
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1343,7 +1370,7 @@
//妯℃澘绠＄悊鍒犻櫎
CrudRowDel(row) {
deleteData(row).then(()=> {
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
--
Gitblit v1.9.3