From b9e53cda1a2fdca60c5fd89076460c4469f1b4a0 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 08 八月 2023 14:30:03 +0800
Subject: [PATCH] 主题库添加分类已发现bug
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 1
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 116 +++++++++++++++++++++++++++++++++-------------------------
2 files changed, 66 insertions(+), 51 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 0607560..ed0186c 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -2016,7 +2016,6 @@
this.$set(this.attrSelectList[0], 'classifyInvokeText', data)
}
// this.injectHandleReset()
-
if (this.injectOption.classifyInvokeLevel !== 'min') {
this.injectOption.classifyInvokeLevel = this.injectOption.classifyNumber;
} else {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 08cea12..4030c0d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -233,7 +233,7 @@
:rowIndex="this.selectRow"></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
- <el-dialog :visible.sync="MasterdialogVisible" append-to-body title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�">
+ <el-dialog :visible.sync="MasterdialogVisible" append-to-body title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" :before-close="masterEscHandler">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -261,12 +261,12 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="MasterHandlerClick">纭畾</el-button>
- <el-button size="small" @click="MasterdialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="masterEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
- <el-dialog :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�">
+ <el-dialog :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" :before-close="KeyEscHandler">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -294,12 +294,12 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="KeyHandlerClick">纭畾</el-button>
- <el-button size="small" @click="KeydialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="KeyEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
- <el-dialog :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�">
+ <el-dialog :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" :before-close="simEscHandler">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -327,16 +327,16 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="simHandlerClick">纭畾</el-button>
- <el-button size="small" @click="SimidialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="simEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
<!-- 涓氬姟绫诲瀷-->
- <el-dialog :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�">
+ <el-dialog :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�" :before-close="BtmEscHandler">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
- v-for="item in SelectOption"
+ v-for="item in masterSelectOption"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -360,7 +360,7 @@
</div>
<div style="padding-top: 10px;display: flex; justify-content: flex-end;float: right;overflow: hidden">
<el-button size="small" type="primary" @click="btmHandlerClick">纭畾</el-button>
- <el-button size="small" @click="BtmdialogVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="BtmEscHandler">鍙栨秷</el-button>
</div>
</div>
</el-dialog>
@@ -453,11 +453,11 @@
display: false
},
{
- label: '鑻辨枃鍚嶇О',
+ label: '涓氬姟绫诲瀷缂栧彿',
prop: 'id'
},
{
- label: '涓枃鍚嶇О',
+ label: '涓氬姟绫诲瀷鍚嶇О',
prop: 'name'
},
{
@@ -475,6 +475,16 @@
value: 'id',
label: '鑻辨枃鍚嶇О'
}
+ ],
+ masterSelectOption:[
+ {
+ value: 'id',
+ label: '涓氬姟绫诲瀷缂栧彿'
+ },
+ {
+ value: 'name',
+ label: '涓氬姟绫诲瀷鍚嶇О'
+ },
],
SelectValue: "id",
SelectFInd: "",
@@ -793,6 +803,30 @@
},
methods: {
+ //瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
+ BtmEscHandler(){
+ this.SelectFInd='';
+ this.SelectValue='id';
+ this.BtmdialogVisible=false;
+ },
+ //鐩镐技椤瑰叧闂�
+ simEscHandler(){
+ this.SelectFInd='';
+ this.SelectValue='id';
+ this.SimidialogVisible=false;
+ },
+ //鍏抽敭灞炴�у叧闂�
+ KeyEscHandler(){
+ this.SelectFInd='';
+ this.SelectValue='id';
+ this.KeydialogVisible=false;
+ },
+ //缂栫爜瑙勫垯鍏抽棴
+ masterEscHandler(){
+ this.SelectFInd='';
+ this.SelectValue='id';
+ this.MasterdialogVisible=false;
+ },
// 鍏抽棴寮圭獥
/** 瀵煎叆 */
ImportExcel() {
@@ -823,17 +857,9 @@
},
//缂栫爜瑙勫垯鏌ヨ
SelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.MasterdefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.MasterdefaultRend(masterParameter)
},
//缂栫爜瑙勫垯纭畾
MasterHandlerClick() {
@@ -850,11 +876,12 @@
}
},
//缂栫爜鎺ュ彛
- MasterdefaultRend() {
+ MasterdefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'coderule',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Released'
+ 'conditionMap["lcstatus"]': 'Released',
+ ...masterParameter
}).then(res => {
this.masterData = res.data.records;
})
@@ -878,24 +905,17 @@
},
//鍏抽敭灞炴�ф煡璇�
KeySelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.KeydefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.KeydefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.KeydefaultRend(masterParameter)
},
//鍏抽敭灞炴�ф帴鍙�
- KeydefaultRend() {
+ KeydefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'codekeyattrrepeat',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Enabled'
+ 'conditionMap["lcstatus"]': 'Enabled',
+ ...masterParameter
}).then(res => {
this.KeyData = res.data.records;
})
@@ -928,17 +948,9 @@
},
//鐩镐技椤规煡璇�
SimSelectFindeHandler() {
- if (this.SelectValue == 'id') {
- const masterParameter = {
- 'conditionMap[id]': this.SelectFInd
- }
- this.simdefaultRend(masterParameter);
- } else if (this.SelectValue == 'name') {
- const masterParameter = {
- 'conditionMap[name]': this.SelectFInd
- }
- this.simdefaultRend(masterParameter)
- }
+ const masterParameter = {};
+ masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
+ this.simdefaultRend(masterParameter)
},
// 鐩镐技椤瑰閫�
simSelect(row) {
@@ -948,11 +960,12 @@
this.simOid = row.oid;
},
//鐩镐技椤归」鎺ュ彛
- simdefaultRend() {
+ simdefaultRend(masterParameter) {
defaultReferDataGrid({
referType: 'coderesemblerule',
isMuti: 'false',
- 'conditionMap["lcstatus"]': 'Enabled'
+ 'conditionMap["lcstatus"]': 'Enabled',
+ ...masterParameter
}).then(res => {
this.simData = res.data.records;
})
@@ -1590,3 +1603,6 @@
}
</style>
+/sa[pr
+[
+syulep
--
Gitblit v1.9.3