From e914fb558e491e4cf09a9007fb1cc5c1a6358f43 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期四, 06 七月 2023 11:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 148 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 115 insertions(+), 33 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index a5dc3e3..593fc18 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -1,13 +1,14 @@
<template>
<div>
- <avue-form v-model="loneTreeNewForm" :option="option" @submit="submit" v-if="flag == 'renonly'">
+ <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>
<div>
-<!-- 涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�-->
- <el-dialog :visible.sync="MasterdialogVisible" title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" append-to-body>
- <avue-crud :data="masterData" :option="masterOption" @select="masterSelect"></avue-crud>
+
+<!-- 瀛樺偍涓氬姟绫诲瀷-->
+ <el-dialog :visible.sync="BtmdialogVisible" title="涓恒�愬瓨鍌ㄤ笟鍔＄被鍨嬨�戦�夊彇鍊�" append-to-body>
+ <avue-crud :data="BtmData" :option="btmOption" @select="btmSelect"></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="MasterdialogVisible=false">鍙栨秷</el-button>
@@ -15,7 +16,7 @@
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
<el-dialog :visible.sync="KeydialogVisible" title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" append-to-body>
- <avue-crud :data="KeyData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud :data="KeyData" :option="masterOption" @select="KeySelect"></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>
@@ -23,7 +24,7 @@
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
<el-dialog :visible.sync="SimidialogVisible" title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" append-to-body>
- <avue-crud :data="simData" :option="masterOption" @select="masterSelect"></avue-crud>
+ <avue-crud :data="simData" :option="masterOption" @select="simSelect"></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>
@@ -34,20 +35,49 @@
</template>
<script>
-import {defaultReferDataGrid} from '@/api/MasterData/master'
+import {defaultReferDataGrid,referDataGrid} from '@/api/MasterData/master'
import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
- props: ['loneTreeNewForm','flag'],
+ props: ['loneTreeNewForm','flag','Editclose'],
data() {
return {
- name:"",
- oid:"",
+ masterName:"",
+ masterOid:"",
+ KeyName:"",
+ KeyOid:"",
+ simName:"",
+ simOid:"",
+ btmName:"",
+ btmOid:"",
masterInput:'',
MasterSearchSelects:"",
masterData:[],
KeyData:[],
simData:[],
+ BtmData:[],
+ btmOption:{
+ addBtn:false,
+ index:true,
+ border:true,
+ selection:true,
+ menu:false,
+ height:380,
+ column:[
+ {
+ label:'涓氬姟绫诲瀷缂栧彿',
+ prop:'id'
+ },
+ {
+ label:'涓氬姟绫诲瀷鍚嶇О',
+ prop:'name'
+ },
+ {
+ label:'鎻忚堪',
+ prop:'description'
+ }
+ ]
+ },
masterOption:{
addBtn:false,
index:true,
@@ -73,6 +103,7 @@
MasterdialogVisible:false,
KeydialogVisible:false,
SimidialogVisible:false,
+ BtmdialogVisible:false,
form: {
name: "鍝堝搱",
sex: "鐢�"
@@ -172,6 +203,7 @@
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
prop: 'btmtypename',
labelWidth:128,
+ focus:this.btmFoucus,
rules: [{
required: true,
message: "瀛樺偍鐨勪笟鍔＄被鍨�",
@@ -200,20 +232,21 @@
]
},
FormList: {},
- masterSelectList:[]
+ masterSelectList:[],
+ KeySelectLIst:[],
+ simSelectList:[],
+ btmSelectList:[]
}
},
created() {
},
methods: {
submits(form,done){
- console.log(this.loneTreeNewForm)
TreeEditSave(this.loneTreeNewForm).then(res=>{
this.$message.success('淇敼鎴愬姛');
- }).catch(res=>{
- this.$message.error(res)
+ this.Editclose()
+ done()
})
- done()
},
error(err) {
this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
@@ -233,17 +266,17 @@
}else {
this.MasterdialogVisible=false;
this.masterSelectList=[]
- this.loneTreeNewForm.codeRuleOidName=this.name;
- this.loneTreeNewForm.codeRuleOid=this.oid;
- console.log(this.masterSelectList)
+ this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName)
+ this.$set(this.loneTreeNewForm,'coderuleOid',this.masterOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ console.log(this.loneTreeNewForm)
}
},
//缂栫爜澶氶��
masterSelect(row){
- console.log(row)
this.masterSelectList=row;
- this.name=row[0].name;
- this.oid=row[0].oid;
+ this.masterName=row[0].name;
+ this.masterOid=row[0].oid;
console.log('oid',this.oid)
},
//缂栫爜鎺ュ彛
@@ -253,10 +286,7 @@
isMuti:'false',
'conditionMap["lcstatus"]':'Released'
}).then(res=>{
- console.log('---',res)
this.masterData=res.data.records;
- console.log('masterData',this.masterData)
-
})
},
// 鍏抽敭灞炴�уけ鐒�
@@ -266,31 +296,86 @@
},
//鍏抽敭灞炴�х‘瀹�
KeyHandlerClick(){
- if(this.masterSelectList.length>1){
+ if(this.KeySelectLIst.length>1){
this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.masterSelectList.length<=0){
+ }else if(this.KeySelectLIst.length<=0){
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}else {
-
+ this.KeydialogVisible=false;
+ this.KeySelectLIst=[]
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
}
},
+ //鍏抽敭灞炴�ф帴鍙�
KeydefaultRend(){
defaultReferDataGrid({
referType:'codekeyattrrepeat',
isMuti:'false',
'conditionMap["lcstatus"]':'Enabled'
}).then(res=>{
- this.keyData=res.data.records;
- console.log('key',this.keyData)
+ 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()
},
//鐩镐技椤圭‘瀹�
simHandlerClick(){
-
+ if(this.simSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.simSelectList.length<=0){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+ }else {
+ this.SimidialogVisible=false;
+ this.simSelectList=[]
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOidName',this.simName)
+ this.$set(this.loneTreeNewForm,'codeResembleRuleOid',this.simOid)
+ this.$emit('MasterHandler',this.loneTreeNewForm)
+ }
+ },
+ // 鐩镐技椤瑰閫�
+ simSelect(row){
+ this.simSelectList=row;
+ this.simName=row[0].name;
+ this.simOid=row[0].oid;
+ console.log('oid',this.oid)
+ },
+ //鐩镐技椤归」鎺ュ彛
+ simdefaultRend(){
+ defaultReferDataGrid({
+ referType:'coderesemblerule',
+ isMuti:'false',
+ 'conditionMap["lcstatus"]':'Enabled'
+ }).then(res=>{
+ this.simData=res.data.records;
+ })
+ },
+ //涓氬姟绫诲瀷澶辩劍
+ btmFoucus(){
+ this.BtmdialogVisible=true;
+ this.btmdefaultRend()
+ },
+ // 涓氬姟绫诲瀷澶氶��
+ btmSelect(row){
+ this.btmSelectList=row;
+ this.btmName=row[0].name;
+ this.btmOid=row[0].oid;
+ },
+ //涓氬姟绫诲瀷鎺ュ彛
+ btmdefaultRend(){
+ referDataGrid({valueField:'id',isMuti:'false'}).then(res=>{
+ console.log(res)
+ })
}
}
}
@@ -299,6 +384,3 @@
<style scoped>
</style>
-
-<!--uiDataController/defaultReferDataGrid?referBo=coderule&isMuti=false&conditionMap%5B%22lcstatus%22%5D=Released-->
-<!--uiDataController/defaultReferDataGrid?conditionMap%5B%22lcstatus%22%5D=Released&referBo=coderule&isMuti=false&_=1687831291212-->
--
Gitblit v1.9.3