From d3239b6a098724db5a29b4f48ddad5f8a0402cea Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 05 七月 2023 15:35:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 88 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index ffa58b5..a5dc3e3 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -5,11 +5,28 @@
<avue-form v-model="loneTreeNewForm" :option="options" @submit="submits" v-else-if="flag == 'edit'">
</avue-form>
<div>
- <el-dialog :visible.sync="dialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
+<!-- 涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�-->
+ <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
<avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
<div style="padding-top: 10px;display: flex; justify-content: flex-end" >
<el-button type="primary" size="small" @click="MasterHandlerClick">纭畾</el-button>
- <el-button size="small" @click="dialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
+ <el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body>
+ <avue-crud :data="KeyData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
+ <el-button type="primary" size="small" @click="KeyHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
+ </div>
+ </el-dialog>
+ <!-- 鐩镐技椤规煡璇㈣鍒�-->
+ <el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
+ <avue-crud :data="simData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <div style="padding-top: 10px;display: flex; justify-content: flex-end" >
+ <el-button type="primary" size="small" @click="simHandlerClick">纭畾</el-button>
+ <el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
</div>
</el-dialog>
</div>
@@ -29,6 +46,8 @@
masterInput:'',
MasterSearchSelects:"",
masterData:[],
+ KeyData:[],
+ simData:[],
masterOption:{
addBtn:false,
index:true,
@@ -51,7 +70,9 @@
}
]
},
- dialogVisible:false,
+ MasterdialogVisible:false,
+ KeydialogVisible:false,
+ SimidialogVisible:false,
form: {
name: "鍝堝搱",
sex: "鐢�"
@@ -167,11 +188,13 @@
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
prop:"codekeyattrrepeatoidName",
labelWidth:128,
+ focus:this.Keyfouce
},
{
label:"鐩镐技鏌ヨ瑙勫垯",
prop:"codeResembleRuleOidName",
labelWidth:128,
+ focus: this.simFouce
},
]
@@ -181,7 +204,6 @@
}
},
created() {
- this.defaultRend()
},
methods: {
submits(form,done){
@@ -197,24 +219,35 @@
this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
console.log(err)
},
+ //缂栫爜瑙勫垯澶辩劍
CodeFoucus(){
- this.dialogVisible=true;
- console.log(this.dialogVisible)
+ this.MasterdialogVisible=true;
+ this.MasterdefaultRend()
},
+ //缂栫爜瑙勫垯纭畾
MasterHandlerClick(){
if(this.masterSelectList.length>1){
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
}else if(this.masterSelectList.length<=0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
- this.dialogVisible=false;
+ this.MasterdialogVisible=false;
this.masterSelectList=[]
this.loneTreeNewForm.codeRuleOidName=this.name;
this.loneTreeNewForm.codeRuleOid=this.oid;
console.log(this.masterSelectList)
}
},
- defaultRend(){
+ //缂栫爜澶氶��
+ masterSelect(row){
+ console.log(row)
+ this.masterSelectList=row;
+ this.name=row[0].name;
+ this.oid=row[0].oid;
+ console.log('oid',this.oid)
+ },
+ //缂栫爜鎺ュ彛
+ MasterdefaultRend(){
defaultReferDataGrid({
referType:'coderule',
isMuti:'false',
@@ -222,15 +255,42 @@
}).then(res=>{
console.log('---',res)
this.masterData=res.data.records;
+ console.log('masterData',this.masterData)
})
},
- masterSelect(row){
- console.log(row)
- this.masterSelectList=row;
- this.name=row[0].name;
- this.oid=row[0].oid;
- console.log('oid',this.oid)
+ // 鍏抽敭灞炴�уけ鐒�
+ Keyfouce(){
+ this.KeydialogVisible=true;
+ this.KeydefaultRend()
+ },
+ //鍏抽敭灞炴�х‘瀹�
+ KeyHandlerClick(){
+ if(this.masterSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.masterSelectList.length<=0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ }else {
+
+ }
+ },
+ KeydefaultRend(){
+ defaultReferDataGrid({
+ referType:'codekeyattrrepeat',
+ isMuti:'false',
+ 'conditionMap["lcstatus"]':'Enabled'
+ }).then(res=>{
+ this.keyData=res.data.records;
+ console.log('key',this.keyData)
+ })
+ },
+ // 鐩镐技椤瑰け鐒�
+ simFouce(){
+ this.SimidialogVisible=true;
+ },
+ //鐩镐技椤圭‘瀹�
+ simHandlerClick(){
+
}
}
}
--
Gitblit v1.9.3