From d9f90c95fe3a9730d255c97daff9fecce1929288 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 10 七月 2023 11:10:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java | 2 --
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java | 1 +
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 33 ++++++++++++++++++---------------
3 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index b361ff8..c111117 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -270,7 +270,7 @@
@blur="saveRows"></el-input>
<el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
@blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
- <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' " @visible-change="DataChangeHandler($event,item.editConfig,index)">
+ <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' " @blur="selectChangeHandler(item.editConfig,index)">
<el-option
v-for="optionItem in item.data"
:key="optionItem.dictValue"
@@ -1360,7 +1360,11 @@
)
},
created() {
-
+ this.option.column.forEach((item,index) => {
+ if (item.edit == 'select') {
+ this.selectChangeHandler(item.editConfig,index)
+ }
+ })
},
methods: {
formAttr(row, column) {
@@ -1390,12 +1394,12 @@
this.$set(this.CurrentCell,'referConfig',JSON.stringify(val))
},
- //鏃堕棿涓嬫媺鏍煎紡
- DataChangeHandler($event,editConfig,index){
+ //鍙緭鍙�変笅鎷�
+ selectChangeHandler(editConfig,index){
let that=this;
- if(!$event){
+ /*if(that.option.column[index].data && that.option.column[index].data.length>=0){
return;
- }
+ }*/
listByFlag(editConfig.extraParams).then(res=>{
that.option.column[index].data=res.data.data;
})
@@ -1403,7 +1407,7 @@
//灞炴�у垎缁勬寜閽�
attrVisibleHandle() {
if (this.attrSelectList < 1) {
- this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬�')
+ this.$message.warning('璇烽�夋嫨妯℃澘灞炴��')
} else {
this.attrVisible = true;
console.log(this.attrSelectList)
@@ -1650,11 +1654,9 @@
},
//楠岃瘉瑙勫垯鎸夐挳
ruleAddHandler(){
- if(this.attrSelectList.length>1){
- this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
- }else if(this.attrSelectList.length<1){
- this.$message.warning('璇烽�夋嫨涓�鎻愭ā鏉垮睘鎬�')
- }else if(this.attrSelectList.length === 1){
+ if (this.attrSelectList < 1) {
+ this.$message.warning('璇烽�夋嫨妯℃澘灞炴��')
+ } else{
this.rulesVisible=true
}
@@ -1671,11 +1673,12 @@
},
// 楠岃瘉瑙勫垯纭畾
rulesHandle() {
- if(this.CurrentCell.length>0){
+ if(this.CurrentCell){
this.$set(this.CurrentCell,'verifyRule',this.RulesForm.expressionText)
}else {
- console.log(this.attrSelectList)
- this.$set(this.attrSelectList[0],'verifyRule',this.RulesForm.expressionText)
+ this.attrSelectList.forEach((item)=>{
+ this.$set(item,'verifyRule',this.RulesForm.expressionText)
+ })
this.rulesremove()
}
this.rulesVisible = false
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
index 9b73f3e..c3a01d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java
@@ -894,6 +894,7 @@
//璁剧疆btmtypeid鍜宯ame
CodeClassify codeClassifyDO = codeClassifyDOList.get(0);
codeClassifyTemplateDO.setBtmTypeId(codeClassifyDO.getBtmTypeId());
+ codeClassifyTemplateDO.setNameOid(VciBaseUtil.getPk());
codeClassifyTemplateDO.setBtmTypeName(codeClassifyDO.getBtmTypeName());
codeClassifyTemplateDO.setLcStatus(FRAMEWORK_RELEASE_EDITING);
codeClassifyTemplateDO.setTs(new Date());
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
index cb9f96d..086aeb0 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/BtmTypeAttributeWrapper.java
@@ -35,8 +35,6 @@
public BtmTypeAttributeVO entityVO(BtmTypeAttribute entity) {
BtmTypeAttributeVO vo = Objects.requireNonNull(BeanUtil.copy(entity, BtmTypeAttributeVO.class));
// 鍦ㄨ繖閲岃缃灇涓炬樉绀哄��
- vo.setPrecisionLength(vo.getPrecisionLength() == -1 ? null : vo.getPrecisionLength());
- vo.setScaleLength(vo.getScaleLength() == -1 ? null : vo.getPrecisionLength());
vo.setAttrDataTypeText(EnumCache.getValue("attributeType",vo.getAttrDataType()));
return vo;
}
--
Gitblit v1.9.3