From 2d2dc7597ded8cdfcd054da95e62882ab4a40d9b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 03 八月 2023 18:15:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 3710c01..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,7 +52,7 @@
</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>
@@ -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,9 +354,10 @@
inject: ["crudTreeData"],
data() {
return {
+ masterRow:null,
AddLoading:false,
// 瀹氫箟涓�涓彉閲忔潵淇濆瓨鏍戣姹傜殑鏁伴噺
- requestCount:0,
+ requestCount:null,
//瀵煎叆鐘舵�佹
ThemeImportVisible:false,
selectRow:'',
@@ -389,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'
@@ -488,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' },
@@ -955,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){
@@ -1031,6 +1042,11 @@
loading.close();
}
},
+ //鏍戣妭鐐瑰彇娑堜簨浠�
+ TreeEscHandler(){
+ this.TreeAddform={};
+ this.TreeAddFormVisible=false
+ },
//鏍戣妭鐐规坊鍔犱簨浠�
TreeAddHandler() {
const data = this.TreeAddform;
@@ -1047,6 +1063,9 @@
});
this.getAttr();
this.TreeAddFormVisible = false;
+ //娣诲姞瀹屾垚鍚庡彸渚ф竻绌�
+ this.ProData=[];
+ this.Formlist=[];
})
.catch((res) => {
this.$message({
@@ -1326,7 +1345,7 @@
message: "娣诲姞鎴愬姛!"
});
done(row)
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
@@ -1338,7 +1357,7 @@
//妯℃澘绠＄悊淇敼
CrudRowUpdata(row,index,done) {
editSave(row).then(() => {
- this.CrudRend()
+ this.TemRefresh();
this.$message({
type: "success",
message: "鎿嶄綔鎴愬姛!"
@@ -1351,7 +1370,7 @@
//妯℃澘绠＄悊鍒犻櫎
CrudRowDel(row) {
deleteData(row).then(()=> {
- this.CrudRend()
+ this.TemRefresh();
}).catch(res => {
this.$message({
type: 'info',
--
Gitblit v1.9.3