From ebec4c80ed33c2736e8ef30b67b8914bd09b1b7e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 06 七月 2023 19:50:32 +0800
Subject: [PATCH] 主题库定义：参照 新增修改规则 模板属性行编辑弹窗bug
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 153 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 109 insertions(+), 44 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 0c3aa5b..1eb7dde 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -7,7 +7,7 @@
<!-- 鍏ㄥ睆缂栬緫-->
<el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">鍏ㄥ睆缂栬緫</el-button>
<!-- 楠岃瘉瑙勫垯-->
- <el-button icon="el-icon-info" size="small" @click="rulesVisibleHandle">楠岃瘉瑙勫垯</el-button>
+ <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
</el-button-group>
@@ -214,18 +214,22 @@
<avue-crud :data="businessData" :option="businessOption" @selection-change="businessSelect">
<template slot="menuLeft">
<div style="display: flex;">
- <el-select>
- <el-option>灞炴�ц嫳鏂囧悕绉�</el-option>
- <el-option>灞炴�т腑鏂囧悕绉�</el-option>
+ <el-select v-model="SelectValue" placeholder="璇烽�夋嫨" style="width: 150px !important;">
+ <el-option
+ v-for="item in SelectOption"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ style="width: 150px">
+ </el-option>
</el-select>
- <el-input style="width: 300px;margin-left: 20px"></el-input>
- <el-button size="small" style="margin-left: 10px">鏌ヨ</el-button>
+ <el-input style="width: 400px;margin-left: 20px" v-model="SelectFInd"></el-input>
+ <el-button size="small" style="margin-left: 10px" @click="AddFindHandler">鏌ヨ</el-button>
</div>
-
</template>
</avue-crud>
<div style="display: flex;justify-content: flex-end;margin-top: 15px">
- <el-button size="small" type="primary" @click="busineAddHandle">纭閫夋嫨</el-button>
+ <el-button size="small" type="primary" @click="busineAddHandle">淇濆瓨</el-button>
<el-button size="small" type="primary" @click="addVisible=false">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -258,6 +262,7 @@
:sortable="item.sortable"
:fixed="item.fixed"
align="center"
+ v-if="item.edit !='referName'"
>
<template slot-scope="{ row }">
<el-input v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )" v-model="row[item.prop]"
@@ -267,9 +272,9 @@
<el-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
<el-option
v-for="optionItem in item.data"
- :key="optionItem.dictValue"
- :label="optionItem.dictValue"
- :value="optionItem.dictValue">
+ :key="optionItem.key"
+ :label="optionItem.value"
+ :value="optionItem.key">
</el-option>
</el-select>
<el-switch
@@ -345,6 +350,21 @@
},
data() {
return {
+ //褰撳墠鍗曞厓鏍�
+ CurrentCell:'',
+ // 鏂板
+ SelectValue:"",
+ SelectFInd:"",
+ SelectOption:[
+ {
+ value: 'name',
+ label: '灞炴�т腑鏂囧悕绉�'
+ },
+ {
+ value: 'id',
+ label: '灞炴�ц嫳鏂囧悕绉�'
+ }
+ ],
//鍙傜収
referVisible:false,
crudArrayFlag:false,
@@ -1184,9 +1204,15 @@
},
{
label: "鍒嗙被娉ㄥ叆",
- prop: "classifyInvokeLevel",
+ prop: "classifyInvokeLevelName",
cell: false,
edit: 'refer'
+ },
+ {
+ label: "鍒嗙被娉ㄥ叆",
+ prop: "classifyInvokeLevel",
+ cell: false,
+ edit: 'referName',
},
{
label: "鏋氫妇娉ㄥ叆",
@@ -1323,31 +1349,50 @@
formAttr(row, column) {
console.log(row,column)
},
+ //鏂板鎼滅储
+ AddFindHandler(){
+ if(this.SelectValue == 'id'){
+ const masterParameter={
+ 'conditionMap[id]':this.SelectFInd
+ }
+ this.BuineAttrByBtm(masterParameter);
+ this.SelectValue=""
+ this.SelectFInd=""
+ }else if(this.SelectValue == 'name'){
+ const masterParameter={
+ 'conditionMap[name]':this.SelectFInd
+ }
+ this.BuineAttrByBtm(masterParameter)
+ this.SelectValue=""
+ this.SelectFInd=""
+ }
+ },
//鍙傜収閰嶇疆瀛愮粍浠�
echoReferConfig(val){
- console.log(val)
+ console.log('val--',val)
+ this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))
+
},
//鏃堕棿涓嬫媺鏍煎紡
DataChangeHandler(editConfig,index){
- if(!this.option.column[index].data){
- listByFlag(editConfig.extraParams).then(res=>{
- this.option.column[index].data=res.data;
- })
- }
+ listByFlag(editConfig.extraParams).then(res=>{
+ console.log(res);
+ this.option.column[index].data=res;
+ })
},
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
- if(this.attrSelectList.length==0){
- this.$message.warning('璇烽�夋嫨灞炴��');
- return false;
+ if (this.attrSelectList.length > 1) {
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ } else if (this.attrSelectList < 1) {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ } else if (this.attrSelectList.length === 1) {
+ this.attrVisible = true;
}
- this.attrVisible = true;
},
//灞炴�у垎缁勬彁浜�
attrHandle() {
- this.attrSelectList.forEach((item)=>{
- this.$set(item, 'attributeGroup', this.attrModel)
- })
+ this.$set(this.attrRow, 'attributeGroup', JSON.stringify(this.attrModel))
this.attrModel = ""
this.attrVisible = false
},
@@ -1417,7 +1462,11 @@
this.addVisible = true;
this.busineSelectList = []
this.busineAddList = [];
- AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
+ this.BuineAttrByBtm()
+ },
+ //涓氬姟绫诲瀷鏁版嵁
+ BuineAttrByBtm(masterParameter){
+ AttrByBtm({'conditionMap[oid]': this.crudOid,...masterParameter}).then(res => {
this.businessData = res.data.data;
})
},
@@ -1481,8 +1530,18 @@
this.editShows = column.property;
this.rowOid = row.oid;
console.log(row,column)
+ this.CurrentCell=row;
if(column.property == 'referConfig' ){
this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
+ this.$refs.referConfigFormDialog.onloadAttrData();
+ }else if(column.property == 'classifyInvokeLevelName'){
+ this.injectVisible=true;
+ }else if(column.property == 'componentRule'){
+ this.isShowformulaEdit = true;
+ }else if(column.property == 'enumString'){
+ this.enumVisible=true;
+ }else if(column.property == 'parentCode'){
+ this.CascadeVisible=true;
}
},
saveRows() {
@@ -1524,20 +1583,18 @@
if (this.enumRow.length < 1) {
this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
} else {
- this.$set(this.attrRow, 'enumString', this.enumRow);
- this.enumVisible = false;
+ if(this.CurrentCell){
+ this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.enumRow));
+ this.enumVisible = false;
+ }else {
+ this.$set(this.attrRow, 'enumString', JSON.stringify(this.enumRow));
+ this.enumVisible = false;
+ }
}
},
- // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null 锛屽嵆閫�鍑虹紪杈戠姸鎬�
+ // 灏嗘鍦ㄧ紪杈戠殑琛岀殑鐘舵�佸彉涓� null锛屽嵆閫�鍑虹紪杈戠姸鎬�
saveRow() {
this.editingRow = null;
- },
- rulesVisibleHandle(){
- if(this.attrSelectList.length==0){
- this.$message.warning('璇烽�夋嫨灞炴��');
- return false;
- }
- this.rulesVisible = true;
},
//瑙勫垯鏍￠獙锛屽弻鍑昏〃鍗曚簨浠�
handleRulesRowDBLClick(row) {
@@ -1550,9 +1607,6 @@
},
// 楠岃瘉瑙勫垯纭畾
rulesHandle() {
- this.attrSelectList.forEach((item)=>{
- this.$set(item, 'verifyRule', this.RulesForm.expressionText)
- })
this.rulesVisible = false
},
//楠岃瘉瑙勫垯妫�鏌�
@@ -1579,8 +1633,13 @@
"灞傜骇璁剧疆": this.injectOption.injectNum,
"鏄惁鍙慨鏀�": this.injectOption.change
}
- console.log(this.injectOption)
- this.$set(this.attrRow, 'classifyInvokeLevel', data);
+ if(this.CurrentCell){
+ this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
+ this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
+ }else {
+ this.$set(this.attrRow, 'classifyInvokeLevelName', data);
+ this.$set(this.attrRow, 'classifyInvokeLevel', JSON.stringify(this.injectOption));
+ }
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
@@ -1632,7 +1691,7 @@
} else if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
} else if (this.attrSelectList.length === 1) {
- this.isShowformulaEdit = true;
+ this.isShowformulaEdit=true
}
},
//鍏ㄥ睆缂栬緫
@@ -1650,8 +1709,14 @@
this.attrFlagChiledren = false;
this.attrEditVisible = false;
},
+ //缁勫悎瑙勫垯纭畾
updataFormlaContent(val) {
- this.$set(this.attrRow, 'componentRule', val)
+ if(this.CurrentCell){
+ this.$set(this.CurrentCell, 'componentRule', JSON.stringify(val))
+ }else {
+ this.$set(this.attrRow, 'componentRule', JSON.stringify(val))
+ }
+
},
// 鎺掑簭
sortChange(val) {
@@ -1671,7 +1736,7 @@
}
</script>
-<style scoped lang="scss">
+<style scoped lang="scss" >
/deep/ .el-button {
margin: 0 10px 10px 0;
}
--
Gitblit v1.9.3