From 371a5adff4a62563ae7b240514d3037a0962359a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 04 七月 2023 18:45:59 +0800
Subject: [PATCH] 编码规则bug
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 8 ++--
Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue | 18 ++++----
Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue | 87 ++++++++++++++++++++++++++++++++++++-------
3 files changed, 86 insertions(+), 27 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 6cafeb2..57a2719 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -3,10 +3,10 @@
<div class="testbox">
<div>
<el-button plain size="small" type="primary" @click="addvisible = true"
- >澧炲姞
+ >澧炲姞
</el-button>
<el-button plain size="small" type="primary" @click="editHandler"
- >缂栬緫
+ >缂栬緫
</el-button>
<el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
<el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
@@ -15,22 +15,22 @@
<el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
<el-button plain size="small" type="primary">鍒犻櫎</el-button>
<el-button plain size="small" type="primary" @click="setHandler"
- >鍙戝竷</el-button
+ >鍙戝竷</el-button
>
<el-button plain size="small" type="primary" @click="DataChange"
- >鏁版嵁鏇存敼</el-button
+ >鏁版嵁鏇存敼</el-button
>
<el-button plain size="small" type="primary" @click="huishouHandler"
- >鍥炴敹</el-button
+ >鍥炴敹</el-button
>
<el-button plain size="small" type="primary" @click="openD"
- >瀵煎嚭
+ >瀵煎嚭
</el-button>
<el-button plain size="small" type="primary" @click="findHandler"
- >鏌ヨ
+ >鏌ヨ
</el-button>
<el-button plain size="small" type="primary" @click="similarHandler"
- >鐩镐技椤规煡璇�</el-button
+ >鐩镐技椤规煡璇�</el-button
>
<el-button plain size="small" type="primary">鍒锋柊</el-button>
<el-input
@@ -249,7 +249,7 @@
this.doLayout();
},
watch: {
- tableHeadDataFateher:{
+ tableHeadDataFateher:{
handler(newval,oldval){
this.options=newval.tableDefineVO.seniorQueryColumns
}
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue b/Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
index ffa58b5..9b013db 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>
@@ -24,6 +41,8 @@
props: ['loneTreeNewForm','flag'],
data() {
return {
+ KeyData:[],
+ simData:[],
name:"",
oid:"",
masterInput:'',
@@ -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,8 @@
}
},
created() {
- this.defaultRend()
+ this.MasterdefaultRend()
+ this.KeydefaultRend()
},
methods: {
submits(form,done){
@@ -197,24 +221,34 @@
this.$message.success('璇锋煡鐪嬫帶鍒跺彴');
console.log(err)
},
+ //缂栫爜瑙勫垯澶辩劍
CodeFoucus(){
- this.dialogVisible=true;
- console.log(this.dialogVisible)
+ this.MasterdialogVisible=true;
},
+ //缂栫爜瑙勫垯纭畾
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',
@@ -225,12 +259,37 @@
})
},
- 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;
+ },
+ //鍏抽敭灞炴�х‘瀹�
+ 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;
+
+ })
+ },
+ // 鐩镐技椤瑰け鐒�
+ simFouce(){
+ this.SimidialogVisible=true;
+ },
+ //鐩镐技椤圭‘瀹�
+ simHandlerClick(){
+
}
}
}
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 6ab294c..8331068 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -7,8 +7,10 @@
<div>
<div style="display: flex;justify-content: space-around">
<el-button plain size="small" type="primary" @click="TreeAdd">娣诲姞</el-button>
- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>
- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>
+ <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
+ <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
+<!-- <el-button plain size="small" type="primary" @click="ExportExcel">瀵煎嚭</el-button>-->
+<!-- <el-button plain size="small" type="primary" @click="ImportExcel">瀵煎叆</el-button>-->
<el-button plain size="small" type="primary" @click="flushed">鍒锋柊</el-button>
</div>
<div style="display: flex;justify-content: space-around;margin-top: 5px;margin-bottom: 5px">
@@ -79,8 +81,6 @@
<template slot="menuLeft">
<el-button plain size="small" type="primary" @click="FindeHanler">鏌ヨ</el-button>
<el-button plain size="small" type="primary" @click="TemRefresh">鍒锋柊</el-button>
- <el-button plain size="small" type="primary" @click="TreeEdit">淇敼</el-button>
- <el-button plain size="small" type="primary" @click="TreeDel">鍒犻櫎</el-button>
<el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
<el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
<el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
--
Gitblit v1.9.3