From 2a88f1118840323953d0fd28bdf03787bfd655de Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 05 九月 2023 08:48:32 +0800
Subject: [PATCH] 接口管理模块属性对象改成驼峰形式，定时推送测试
---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 106 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 70 insertions(+), 36 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index 4030c0d..5b22a87 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -63,7 +63,8 @@
</el-dialog>
<!-- 淇敼瀵硅瘽妗�-->
<el-dialog :visible.sync="TreeEditFormVisible" append-to-body title="淇敼鍒嗙被">
- <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode" :flag="'edit'"
+ <classifyTreeform ref="childForm" :Editclose=" ()=>{TreeEditFormVisible=false}" :TreeFlag="editTreeFLagCode"
+ :flag="'edit'"
:loneTreeNewForm="TreeList" :nodeClickList="nodeClickList"
:nodeList="nodeList" @MasterHandler="MasterHandler" @flushed="flushed"
@referTreeForm="referTreeForm"></classifyTreeform>
@@ -233,7 +234,8 @@
:rowIndex="this.selectRow"></templatePro>
</span>
<!-- 缂栫爜瑙勫垯-->
- <el-dialog :visible.sync="MasterdialogVisible" append-to-body title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�" :before-close="masterEscHandler">
+ <el-dialog :before-close="masterEscHandler" :visible.sync="MasterdialogVisible" append-to-body
+ title="涓恒�愮紪鐮佽鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -248,7 +250,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="SelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="masterData" :option="masterOption" @row-click="masterSelect">
+ <avue-crud :data="masterData" :option="Option" @row-click="masterSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -266,7 +268,7 @@
</div>
</el-dialog>
<!-- 鍏抽敭灞炴�ф煡璇㈣鍒�-->
- <el-dialog :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�" :before-close="KeyEscHandler">
+ <el-dialog :before-close="KeyEscHandler" :visible.sync="KeydialogVisible" append-to-body title="涓恒�愬叧閿睘鎬ф煡璇㈣鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -281,7 +283,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="KeySelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="KeyData" :option="masterOption" @row-click="KeySelect">
+ <avue-crud :data="KeyData" :option="Option" @row-click="KeySelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -290,7 +292,9 @@
<div style="height: 30px">
<div
style="display: inline-block;float: left;border: 1px solid #eeeeee;padding: 5px;margin-top: 5px;font-size: 14px ">
- 宸茶缃殑鍊间负:[{{ this.TreeAddform.codeKeyAttrRepeatOidName == '' ? '鏈缃��' : this.TreeAddform.codekeyattrrepeatoidName }}]
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeKeyAttrRepeatOidName == '' ? '鏈缃��' : this.TreeAddform.codekeyattrrepeatoidName
+ }}]
</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>
@@ -299,7 +303,7 @@
</div>
</el-dialog>
<!-- 鐩镐技椤规煡璇㈣鍒�-->
- <el-dialog :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�" :before-close="simEscHandler">
+ <el-dialog :before-close="simEscHandler" :visible.sync="SimidialogVisible" append-to-body title="涓恒�愮浉浼奸」鏌ヨ瑙勫垯銆戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px">
<el-option
@@ -314,7 +318,7 @@
<el-button plain size="small" style="margin-left: 20px" type="primary" @click="SimSelectFindeHandler">鏌ヨ
</el-button>
</template>
- <avue-crud :data="simData" :option="masterOption" @row-click="simSelect">
+ <avue-crud :data="simData" :option="Option" @row-click="simSelect">
<template slot="radio" slot-scope="{row}">
<el-radio v-model="masterRow" :label="row.$index" style="padding-left: 10px !important;">{{ '' }}
</el-radio>
@@ -323,7 +327,9 @@
<div style="height: 30px">
<div
style="display: inline-block;float: left;border: 1px solid #eee;padding: 5px;margin-top: 5px;font-size: 14px ">
- 宸茶缃殑鍊间负:[{{ this.TreeAddform.codeResembleRuleOidName == '' ? '鏈缃��' : this.TreeAddform.codeResembleRuleOidName }}]
+ 宸茶缃殑鍊间负:[{{
+ this.TreeAddform.codeResembleRuleOidName == '' ? '鏈缃��' : this.TreeAddform.codeResembleRuleOidName
+ }}]
</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>
@@ -332,7 +338,7 @@
</div>
</el-dialog>
<!-- 涓氬姟绫诲瀷-->
- <el-dialog :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�" :before-close="BtmEscHandler">
+ <el-dialog :before-close="BtmEscHandler" :visible.sync="BtmdialogVisible" append-to-body title="涓恒�愪笟鍔＄被鍨嬭鍒欍�戦�夊彇鍊�">
<template>
<el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 135px !important;">
<el-option
@@ -466,6 +472,33 @@
}
]
},
+ Option: {
+ addBtn: false,
+ index: true,
+ border: true,
+ menu: false,
+ height: 380,
+ column: [
+ {
+ label: '',
+ prop: 'radio',
+ width: 60,
+ display: false
+ },
+ {
+ label: '鑻辨枃鍚嶇О',
+ prop: 'id'
+ },
+ {
+ label: '涓枃鍚嶇О',
+ prop: 'name'
+ },
+ {
+ label: '鎻忚堪',
+ prop: 'description'
+ }
+ ]
+ },
SelectOption: [
{
value: 'name',
@@ -476,7 +509,7 @@
label: '鑻辨枃鍚嶇О'
}
],
- masterSelectOption:[
+ masterSelectOption: [
{
value: 'id',
label: '涓氬姟绫诲瀷缂栧彿'
@@ -804,28 +837,32 @@
},
methods: {
//瀛樺偍鐨勪笟鍔＄被鍨嬪叧闂�
- BtmEscHandler(){
- this.SelectFInd='';
- this.SelectValue='id';
- this.BtmdialogVisible=false;
+ BtmEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.BtmdialogVisible = false;
},
//鐩镐技椤瑰叧闂�
- simEscHandler(){
- this.SelectFInd='';
- this.SelectValue='id';
- this.SimidialogVisible=false;
+ simEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.SimidialogVisible = false;
},
//鍏抽敭灞炴�у叧闂�
- KeyEscHandler(){
- this.SelectFInd='';
- this.SelectValue='id';
- this.KeydialogVisible=false;
+ KeyEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.KeydialogVisible = false;
},
//缂栫爜瑙勫垯鍏抽棴
- masterEscHandler(){
- this.SelectFInd='';
- this.SelectValue='id';
- this.MasterdialogVisible=false;
+ masterEscHandler() {
+ this.SelectFInd = '';
+ this.SelectValue = 'id';
+ this.masterRow = null;
+ this.MasterdialogVisible = false;
},
// 鍏抽棴寮圭獥
/** 瀵煎叆 */
@@ -881,6 +918,7 @@
referType: 'coderule',
isMuti: 'false',
'conditionMap["lcstatus"]': 'Released',
+ 'limit':'-1',
...masterParameter
}).then(res => {
this.masterData = res.data.records;
@@ -915,6 +953,7 @@
referType: 'codekeyattrrepeat',
isMuti: 'false',
'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
...masterParameter
}).then(res => {
this.KeyData = res.data.records;
@@ -965,6 +1004,7 @@
referType: 'coderesemblerule',
isMuti: 'false',
'conditionMap["lcstatus"]': 'Enabled',
+ 'limit':'-1',
...masterParameter
}).then(res => {
this.simData = res.data.records;
@@ -982,6 +1022,7 @@
} else if (this.btmSelectList.length <= 0) {
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
} else {
+ this.$refs.myForm.clearValidate();
this.BtmdialogVisible = false;
this.btmSelectList = []
this.$set(this.TreeAddform, 'btmTypeName', this.btmName)
@@ -993,7 +1034,7 @@
BtmSelectFindeHandler() {
const masterParameter = {};
masterParameter[`conditionMap['${this.SelectValue}']`] = `*${this.SelectFInd}*`;
- this.btmdefaultRend(masterParameter);
+ this.btmdefaultRend(masterParameter);
},
//涓氬姟绫诲瀷澶氶��
btmSelect(row) {
@@ -1004,7 +1045,7 @@
},
//涓氬姟绫诲瀷鎺ュ彛
btmdefaultRend(masterParameter) {
- referDataGrid({valueField: 'id', isMuti: 'false', ...masterParameter}).then(res => {
+ referDataGrid({valueField: 'id', isMuti: 'false','limit':'-1', ...masterParameter}).then(res => {
this.BtmData = res.data.data.records
})
},
@@ -1031,7 +1072,6 @@
})
//璋冪敤淇敼灞炴�у悕鏂规硶
this.ModifyProperties(this.CloneTreedata, 'name', 'label');
- console.log(this.CloneTreedata)
this.CloneTreedata = this.CloneTreedata.map(item => {
if (item.attributes.lcStatus === "Disabled") {
item.label += '銆愬仠鐢ㄣ��';
@@ -1087,7 +1127,6 @@
this.$message.warning('璇疯緭鍏ュ唴瀹癸紒');
} else {
const data = this.TreeAddform;
- // data.btmtypename= this.TreeList.btmtypename
this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid);
TreeSave(data)
.then(() => {
@@ -1254,11 +1293,9 @@
});
}
}
-
},
//鏍戠偣鍑讳簨浠�
async nodeClick(data) {
- console.log(data);
//鎿嶄綔鏂板鍜屼慨鏀圭殑涓氬姟绫诲瀷闅愯棌
this.TreeFlagCode = !data;
this.editTreeFLagCode = !data.parentId;
@@ -1480,9 +1517,6 @@
const {id, name} = row[0];
this.CloneModel = {id, name};
this.CloneSelect[0].codeclassifyoid = this.nodeClickList.oid;
- console.log('row', row)
- console.log('CloneSelect', this.CloneSelect)
- console.log('CloneModel', this.CloneModel)
},
//鍏嬮殕琛ㄥ崟鎻愪氦
Clonesubmit(row, done) {
--
Gitblit v1.9.3