From ded6e8d2312e139e8ce770c7f1d5830bf2db4af6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 11:39:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 193 +++++++++++++++++++++++++-----------------------
1 files changed, 101 insertions(+), 92 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 5eb3f23..87bf1ca 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -2,7 +2,7 @@
<div>
<avue-form v-model="loneTreeNewForm" :option="option" v-if="flag == 'renonly'">
</avue-form>
- <avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
+ <avue-form v-model="loneTreeNewForm" :option="this.options" @submit="submits" v-else-if="flag == 'edit'">
</avue-form>
<div>
<!-- 缂栫爜瑙勫垯-->
@@ -94,7 +94,7 @@
</template>
<avue-crud :data="BtmData" :option="masterOption" @select="btmSelect"></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.loneTreeNewForm.btmtypename}}]</div>
+ <div style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px " >宸茶缃殑鍊间负:[{{this.loneTreeNewForm.btmTypeName}}]</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden" >
<el-button type="primary" size="small" @click="btmHandlerClick">纭畾</el-button>
<el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
@@ -122,6 +122,7 @@
simOid:"",
btmName:"",
btmOid:"",
+ btmId:"",
masterInput:'',
MasterSearchSelects:"",
masterData:[],
@@ -226,7 +227,7 @@
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
disabled: true,
rules: [{
@@ -237,7 +238,7 @@
},
{
label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
+ prop:"codeRuleOidName",
labelWidth:128,
disabled: true,
},
@@ -255,70 +256,7 @@
},
]
},
- options: {
- column: [
- {
- label: '涓婚搴�/鍒嗙被缂栧彿',
- prop: 'id',
- labelWidth:128,
- rules: [{
- required: true,
- message: "涓婚搴�/鍒嗙被缂栧彿",
- trigger: "blur"
- }]
- },
- {
- label: '涓婚搴�/鍒嗙被鍚嶇О',
- prop: 'name',
- labelWidth:128,
- rules: [{
- required: true,
- message: "涓婚搴�/鍒嗙被鍚嶇О",
- trigger: "blur"
- }]
- },
- {
- label:"鎻忚堪",
- prop:"description",
- labelWidth:128,
- },
- {
- label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
- labelWidth:128,
- focus:this.btmFoucus,
- readonly: true,
- display:false,
- rules: [{
- required: true,
- message: "瀛樺偍鐨勪笟鍔＄被鍨�",
- trigger: "blur"
- }]
- },
- {
- label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
- labelWidth:128,
- focus:this.CodeFoucus,
- readonly: true,
- },
- {
- label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
- labelWidth:128,
- focus:this.Keyfouce,
- readonly: true,
- },
- {
- label:"鐩镐技鏌ヨ瑙勫垯",
- prop:"codeResembleRuleOidName",
- labelWidth:128,
- focus: this.simFouce,
- readonly: true,
- },
- ]
- },
FormList: {},
masterSelectList:[],
KeySelectLIst:[],
@@ -326,28 +264,103 @@
btmSelectList:[]
}
},
- watch:{
- nodeClickList:{
- handler(newval,oldval){
- console.log('newVal',newval,oldval)
- },
- deep:true,
- immediate:true
+ computed:{
+ options(){
+ return{
+ column: [
+ {
+ label: '涓婚搴�/鍒嗙被缂栧彿',
+ prop: 'id',
+ labelWidth:128,
+ rules: [{
+ required: true,
+ message: "涓婚搴�/鍒嗙被缂栧彿",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: '涓婚搴�/鍒嗙被鍚嶇О',
+ prop: 'name',
+ labelWidth:128,
+ rules: [{
+ required: true,
+ message: "涓婚搴�/鍒嗙被鍚嶇О",
+ trigger: "blur"
+ }]
+ },
+ {
+ label:"鎻忚堪",
+ prop:"description",
+ labelWidth:128,
+ },
+ {
+ label: '瀛樺偍鐨勪笟鍔＄被鍨�',
+ prop: 'btmTypeName',
+ labelWidth:128,
+ focus:this.btmFoucus,
+ // readonly: true,
+ display:this.TreeFlag,
+ rules: [{
+ required: true,
+ message: "瀛樺偍鐨勪笟鍔＄被鍨�",
+ trigger: "blur"
+ }]
+ },
+ {
+ label:"缂栫爜瑙勫垯",
+ prop:"codeRuleOidName",
+ labelWidth:128,
+ focus:this.CodeFoucus,
+ readonly: true,
+ },
+ {
+ label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
+ prop:"codekeyattrrepeatoidName",
+ labelWidth:128,
+ focus:this.Keyfouce,
+ readonly: true,
+ },
+ {
+ label:"鐩镐技鏌ヨ瑙勫垯",
+ prop:"codeResembleRuleOidName",
+ labelWidth:128,
+ focus: this.simFouce,
+ readonly: true,
+ },
+
+ ]
+
+ }
}
+ },
+ watch:{
},
created() {
},
methods: {
submits(form,done){
- TreeEditSave(this.loneTreeNewForm).then(res=>{
- this.$message.success('淇敼鎴愬姛');
- this.Editclose()
- done()
- })
+ if(this.TreeFlag){
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
+ done()
+ })
+ }else {
+ this.loneTreeNewForm.btmTypeName='';
+ this.loneTreeNewForm.btmTypeId='';
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
+ done()
+ })
+ }
},
error(err) {
- this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
- console.log(err)
+ this.$message.success(err);
},
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler(){
@@ -381,10 +394,9 @@
}else {
this.MasterdialogVisible=false;
this.masterSelectList=[]
- this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
- this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
+ this.$set(this.loneTreeNewForm,'codeRuleOidName',this.masterName)
+ this.$set(this.loneTreeNewForm,'codeRuleOid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- // console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
@@ -392,7 +404,6 @@
this.masterSelectList=row;
this.masterName=row[0].name;
this.masterOid=row[0].oid;
- // console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
MasterdefaultRend(masterParameter){
@@ -422,7 +433,6 @@
this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -439,8 +449,8 @@
'conditionMap[name]':this.SelectFInd
}
this.KeydefaultRend(masterParameter)
- this.SelectValue=""
- this.SelectFInd=""
+ this.SelectValue="";
+ this.SelectFInd="";
}
},
//鍏抽敭灞炴�ф帴鍙�
@@ -501,7 +511,6 @@
this.simSelectList=row;
this.simName=row[0].name;
this.simOid=row[0].oid;
- console.log('oid',this.oid)
},
//鐩镐技椤归」鎺ュ彛
simdefaultRend(){
@@ -527,8 +536,8 @@
}else {
this.BtmdialogVisible=false;
this.btmSelectList=[]
- this.$set(this.loneTreeNewForm,'btmtypename',this.btmName ||this.btmOid)
- this.$set(this.loneTreeNewForm,'btmtypeid',this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeId',this.btmId)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
@@ -555,11 +564,11 @@
this.btmSelectList=row;
this.btmName=row[0].name;
this.btmOid=row[0].oid;
+ this.btmId=row[0].id;
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- // console.log(res)
this.BtmData=res.data.data.records
})
}
--
Gitblit v1.9.3