From 2871cb99e018f6bf9e2ef76a424a1429a7c818f0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 13 七月 2023 11:40:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 209 ++++++++++++++++++++++++++++++----------------------
1 files changed, 120 insertions(+), 89 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index 236b88e..236d931 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>
<!-- 缂栫爜瑙勫垯-->
@@ -78,15 +78,15 @@
</div>
</el-dialog>
<!-- 瀛樺偍鐨勪笟鍔＄被鍨�-->
- <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愪笟鍔＄被鍨嬨�戦�夊彇鍊�" append-to-body>
<template>
- <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
+ <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
v-for="item in SelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
- style="width: 150px">
+ style="width: 130px">
</el-option>
</el-select>
<el-input style="width: 260px;margin-left: 15px" placeholder="杈撳叆鍊煎悗杩涜妯＄硦鏌ヨ" v-model="SelectFInd"></el-input>
@@ -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>
@@ -110,7 +110,7 @@
import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
- props: ['loneTreeNewForm','flag','Editclose'],
+ props: ['loneTreeNewForm','flag','Editclose','TreeFlag','nodeClickList'],
data() {
return {
SelectFInd:"",
@@ -198,9 +198,9 @@
column: [
{
label: '涓婚搴�/鍒嗙被缂栧彿',
- prop: 'btmtypeid',
+ prop: 'id',
labelWidth:135,
- readonly: true,
+ disabled: true,
rules: [{
required: true,
message: "涓婚搴�/鍒嗙被缂栧彿",
@@ -210,7 +210,7 @@
{
label: '涓婚搴�/鍒嗙被鍚嶇О',
prop: 'name',
- readonly: true,
+ disabled: true,
labelWidth:135,
rules: [{
required: true,
@@ -222,13 +222,13 @@
label:"鎻忚堪",
prop:"description",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
- prop: 'btmtypename',
+ prop: 'btmTypeName',
labelWidth:128,
- readonly: true,
+ disabled: true,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -239,86 +239,113 @@
label:"缂栫爜瑙勫垯",
prop:"coderuleoidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
prop:"codekeyattrrepeatoidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
{
label:"鐩镐技鏌ヨ瑙勫垯",
prop:"codeResembleRuleOidName",
labelWidth:128,
- readonly: true,
+ disabled: true,
},
]
},
- options: {
- column: [
- {
- label: '涓婚搴�/鍒嗙被缂栧彿',
- prop: 'btmtypeid',
- 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,
- rules: [{
- required: true,
- message: "瀛樺偍鐨勪笟鍔＄被鍨�",
- trigger: "blur"
- }]
- },
- {
- label:"缂栫爜瑙勫垯",
- prop:"coderuleoidName",
- labelWidth:128,
- focus:this.CodeFoucus
- },
- {
- label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
- prop:"codekeyattrrepeatoidName",
- labelWidth:128,
- focus:this.Keyfouce
- },
- {
- label:"鐩镐技鏌ヨ瑙勫垯",
- prop:"codeResembleRuleOidName",
- labelWidth:128,
- focus: this.simFouce
- },
- ]
- },
FormList: {},
masterSelectList:[],
KeySelectLIst:[],
simSelectList:[],
btmSelectList:[]
+ }
+ },
+ 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:{
+ nodeClickList:{
+ handler(newval,oldval){
+ console.log('newVal',newval,oldval)
+ },
+ deep:true,
+ immediate:true
+ },
+ TreeFlag:{
+ handler(newval,oldval){
+ console.log('鏍戠姸鎬�',newval,oldval)
+ },
+ deep:true,
+ immediate:true
}
},
created() {
@@ -328,6 +355,8 @@
TreeEditSave(this.loneTreeNewForm).then(res=>{
this.$message.success('淇敼鎴愬姛');
this.Editclose()
+ this.$emit('referTreeForm');
+ this.$emit('flushed');
done()
})
},
@@ -368,9 +397,9 @@
this.MasterdialogVisible=false;
this.masterSelectList=[]
this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
- this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
+ this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
- console.log(this.loneTreeNewForm)
+ // console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
@@ -378,7 +407,7 @@
this.masterSelectList=row;
this.masterName=row[0].name;
this.masterOid=row[0].oid;
- console.log('oid',this.oid)
+ // console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
MasterdefaultRend(masterParameter){
@@ -391,7 +420,7 @@
this.masterData=res.data.records;
})
},
- // 鍏抽敭灞炴�уけ鐒�
+ //鍏抽敭灞炴�уけ鐒�
Keyfouce(){
this.KeydialogVisible=true;
this.KeydefaultRend()
@@ -405,9 +434,10 @@
}else {
this.KeydialogVisible=false;
this.KeySelectLIst=[]
- this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
- this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+ this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName)
+ this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
+ console.log(this.loneTreeNewForm)
}
},
//鍏抽敭灞炴�ф煡璇�
@@ -438,13 +468,13 @@
this.KeyData=res.data.records;
})
},
- // 鍏抽敭澶氶��
+ //鍏抽敭澶氶��
KeySelect(row){
this.KeySelectLIst=row;
this.KeyName=row[0].name;
this.KeyOid=row[0].oid;
},
- // 鐩镐技椤瑰け鐒�
+ //鐩镐技椤瑰け鐒�
simFouce(){
this.SimidialogVisible=true;
this.simdefaultRend()
@@ -481,7 +511,7 @@
this.SelectFInd=""
}
},
- // 鐩镐技椤瑰閫�
+ //鐩镐技椤瑰閫�
simSelect(row){
this.simSelectList=row;
this.simName=row[0].name;
@@ -503,17 +533,17 @@
this.BtmdialogVisible=true;
this.btmdefaultRend()
},
- // 涓氬姟绫诲瀷纭畾
+ //涓氬姟绫诲瀷纭畾
btmHandlerClick(){
if(this.btmSelectList.length>1){
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
}else if(this.btmSelectList.length<=0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
- this.SimidialogVisible=false;
- this.simSelectList=[]
- this.$set(this.loneTreeNewForm,'btmtypename',this.btmName)
- this.$set(this.loneTreeNewForm,'btmtypeoid',this.btmOid)
+ this.BtmdialogVisible=false;
+ this.btmSelectList=[]
+ this.$set(this.loneTreeNewForm,'btmTypeName',this.btmName ||this.btmOid)
+ this.$set(this.loneTreeNewForm,'btmTypeid',this.btmOid)
this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
@@ -535,7 +565,7 @@
this.SelectFInd=""
}
},
- // 涓氬姟绫诲瀷澶氶��
+ //涓氬姟绫诲瀷澶氶��
btmSelect(row){
this.btmSelectList=row;
this.btmName=row[0].name;
@@ -544,7 +574,8 @@
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter){
referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{
- console.log(res)
+ // console.log(res)
+ this.BtmData=res.data.data.records
})
}
}
--
Gitblit v1.9.3