From a78216b8655bbfd4d70577d21729e9741eb021d5 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期三, 05 七月 2023 17:25:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 218 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index e0a2f86..a5dc3e3 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -1,15 +1,78 @@
<template>
- <avue-form v-model="TreeNewForm" :option="option" @submit="submit">
- </avue-form>
-
+ <div>
+ <avue-form v-model="loneTreeNewForm" :option="option" @submit="submit" 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>
+ <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>
+ </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>
+ </div>
</template>
<script>
+import {defaultReferDataGrid} from '@/api/MasterData/master'
+import {TreeEditSave} from '@/api/template/templateAttr'
export default {
name: "classifyTreeform.vue",
- props: ["TreeNewForm"],
+ props: ['loneTreeNewForm','flag'],
data() {
return {
+ name:"",
+ oid:"",
+ masterInput:'',
+ MasterSearchSelects:"",
+ masterData:[],
+ KeyData:[],
+ simData:[],
+ masterOption:{
+ addBtn:false,
+ index:true,
+ border:true,
+ selection:true,
+ menu:false,
+ height:380,
+ column:[
+ {
+ label:'鑻辨枃鍚嶇О',
+ prop:'id'
+ },
+ {
+ label:'涓枃鍚嶇О',
+ prop:'name'
+ },
+ {
+ label:'鎻忚堪',
+ prop:'description'
+ }
+ ]
+ },
+ MasterdialogVisible:false,
+ KeydialogVisible:false,
+ SimidialogVisible:false,
form: {
name: "鍝堝搱",
sex: "鐢�"
@@ -22,7 +85,7 @@
{
label: '涓婚搴�/鍒嗙被缂栧彿',
prop: 'btmtypeid',
- labelWidth:128,
+ labelWidth:135,
readonly: true,
rules: [{
required: true,
@@ -34,7 +97,7 @@
label: '涓婚搴�/鍒嗙被鍚嶇О',
prop: 'name',
readonly: true,
- labelWidth:128,
+ labelWidth:135,
rules: [{
required: true,
message: "涓婚搴�/鍒嗙被鍚嶇О",
@@ -45,6 +108,7 @@
label:"鎻忚堪",
prop:"description",
labelWidth:128,
+ readonly: true,
},
{
label: '瀛樺偍鐨勪笟鍔＄被鍨�',
@@ -61,30 +125,172 @@
label:"缂栫爜瑙勫垯",
prop:"coderuleoidName",
labelWidth:128,
+ readonly: true,
},
{
label:"鍏抽敭灞炴�ф煡璇㈣鍒�",
prop:"codekeyattrrepeatoidName",
labelWidth:128,
+ readonly: true,
},
{
label:"鐩镐技鏌ヨ瑙勫垯",
prop:"codeResembleRuleOidName",
labelWidth:128,
+ readonly: true,
},
]
},
- FormList: {}
+ 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,
+ 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:[]
}
},
+ created() {
+ },
methods: {
- submit(form, done) {
- this.$message.success(JSON.stringify(form));
+ submits(form,done){
+ console.log(this.loneTreeNewForm)
+ TreeEditSave(this.loneTreeNewForm).then(res=>{
+ this.$message.success('淇敼鎴愬姛');
+ }).catch(res=>{
+ this.$message.error(res)
+ })
done()
},
error(err) {
this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
console.log(err)
+ },
+ //缂栫爜瑙勫垯澶辩劍
+ CodeFoucus(){
+ 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.MasterdialogVisible=false;
+ this.masterSelectList=[]
+ this.loneTreeNewForm.codeRuleOidName=this.name;
+ this.loneTreeNewForm.codeRuleOid=this.oid;
+ console.log(this.masterSelectList)
+ }
+ },
+ //缂栫爜澶氶��
+ 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',
+ 'conditionMap["lcstatus"]':'Released'
+ }).then(res=>{
+ console.log('---',res)
+ this.masterData=res.data.records;
+ console.log('masterData',this.masterData)
+
+ })
+ },
+ // 鍏抽敭灞炴�уけ鐒�
+ 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(){
+
}
}
}
@@ -93,3 +299,6 @@
<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