From 86a216010c436ea1f8ff9cd2789c3555f51d1b3f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 31 七月 2023 16:20:45 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue | 45 ++++++++++++----------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 14 +++---
Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue | 9 ++--
3 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 5fdbfbf..0e22d34 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -1,6 +1,7 @@
<template>
<div>
<div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag" class="app">
+
<el-button-group>
<!--鏂板-->
<el-button v-if="attrEditVisible == false && attrFlagChiledren==false && editOpenFlag && (!checkStatus || crudLCStatus=='Editing' )" size="small" type="primary" icon="el-icon-plus" plain @click="busineHandle">娣诲姞 {{ msg }}</el-button>
@@ -10,6 +11,16 @@
<el-button v-if="(!checkStatus || crudLCStatus=='Editing' )&& editOpenFlag" icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
+ </el-button-group>
+ <el-button-group>
+ <!-- 淇濆瓨-->
+ <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" type="success" plain @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
+ <!-- 棰勮鎺掑簭-->
+ <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
+ <!-- 鍒犻櫎-->
+ <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" size="small" @click="CrudRemove" icon="el-icon-delete">鍒犻櫎</el-button>
+ <!-- 閲嶇疆-->
+ <el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
</el-button-group>
<el-button-group>
<!--鏂板-->
@@ -22,17 +33,7 @@
<!-- 绾ц仈灞炴��-->
<el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" icon="el-icon-coin" size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
</el-button-group>
- <el-button-group>
- <!-- 棰勮鎺掑簭-->
- <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
- <!--鏂板-->
- <!-- 淇濆瓨-->
- <el-button v-if="(!checkStatus|| crudLCStatus=='Editing') && editOpenFlag" size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
- <!-- 鍒犻櫎-->
- <el-button v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag" size="small" @click="CrudRemove" icon="el-icon-delete">鍒犻櫎</el-button>
- <!-- 閲嶇疆-->
- <el-button size="small" @click="reset" icon="el-icon-refresh-right">閲嶇疆</el-button>
- </el-button-group>
+
<el-button-group>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
<el-button size="small"@click="syncHandle" icon="el-icon-share">鍚屾鍒板叾浠栨ā鏉�</el-button>
@@ -251,7 +252,7 @@
</div>
<el-table :data="ProData"
style="width: 100%"
- :height="this.editStyleFlag ? 450 : 900"
+ :height="!this.editStyleFlag ? 450 : 900"
@cell-click="handleCellClicks"
@select="selectHandle"
@selection-change="selectionChange"
@@ -276,8 +277,8 @@
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]"
- @blur="saveRows" ></el-input>
+ <el-input ref="inputRef" v-if="editingRows === row && editShows== item.prop && item.prop != 'codeDateFormat' && (item.edit == 'text' ||item.edit == 'refer' )" v-model="row[item.prop]"
+ @blur="saveRows" autofocus ></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' " @blur="selectChangeHandler(item.editConfig,index)">
@@ -410,7 +411,7 @@
data() {
return {
//鍏ㄥ睆缂栬緫楂樺害鐘舵��
- edittStyleFlag:false,
+ editStyleFlag:false,
loading:false,
referConfigText:"",
referConfigVisble:false,
@@ -508,7 +509,7 @@
desc: "褰撳墠鐢ㄦ埛鐨勫鍚�"
},
{
- formula: "#CURRENTUSER.SECRETGRADE#",
+ formula: "#CURRENTUSER.SECRETARIAT#",
desc: "褰撳墠鐢ㄦ埛瀵嗙骇"
},
{
@@ -1486,7 +1487,7 @@
//琛ㄦ牸鏁版嵁
CrudRend() {
if (this.crudOid != '') {
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid}).then(res => {
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.crudOid,limit:-1}).then(res => {
this.loading=true
setTimeout(() => {
this.ProData = res.data.data;
@@ -1540,7 +1541,6 @@
}
})
this.addVisible = false;
-
},
//涓氬姟绫诲瀷閫夋嫨
businessSelect(selection, row) {
@@ -1629,9 +1629,10 @@
this.rowOid = row.oid;
this.CurrentCell=row;
if(column.property == 'referConfig' ){
+ console.log( this.CurrentCell.referConfig)
this.referConfigVisble= true;
this.referConfigOption = {
- referConfig: this.referConfigText || '',
+ referConfig: this.CurrentCell.referConfig || '',
}
if(this.CurrentCell.referConfig == ''){
this.referConfigOption = {
@@ -1656,7 +1657,8 @@
}else if(column.property == 'parentCode'){
gridCodeClassifyTemplateAttr({
'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
- 'conditionMap[oid_notequal]': this.CurrentCell.oid
+ 'conditionMap[oid_notequal]': this.CurrentCell.oid,
+ limit:-1
}).then(res => {
console.log(res)
this.CascadeData = res.data.data;
@@ -1901,7 +1903,7 @@
if (this.crudArray.length < 1) {
this.$message.warning('璇烽�夋嫨涓�涓ā鏉�')
} else {
- this.editStyleFlag=!this.editStyleFlag;
+ this.editStyleFlag=true;
// this.editOpenFlag=true;
this.attrEditVisible = true;
this.attrFlag = true;
@@ -1912,6 +1914,7 @@
escEdit() {
this.attrFlagChiledren = false;
this.attrEditVisible = false;
+ this.editStyleFlag=false;
},
//缁勫悎瑙勫垯纭畾
updataFormlaContent(val) {
diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
index cad2aeb..750dcbf 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue
@@ -967,7 +967,7 @@
this.crudOid=row.oid;
this.crudLCStatus=row.lcStatus;
this.crudArray.push(row);
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid}).then(res => {
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,limit:-1}).then(res => {
this.ProData = res.data.data;
//鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
this.ProData = res.data.data.map((item) => {
@@ -1220,9 +1220,10 @@
})
console.log('form',this.Formlist)
if(this.Formlist.length >= 1){
- this.crudLCStatus=this.Formlist[0].lcStatus;
- this.crudArray.push(this.Formlist[0]);
- gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[0].oid}).then(res => {
+ this.crudLCStatus=this.Formlist[this.selectRow].lcStatus;
+ this.crudArray.push(this.Formlist[this.selectRow]);
+ this.crudOid=this.Formlist[this.selectRow].oid
+ gridCodeClassifyTemplateAttr({'conditionMap[classifyTemplateOid]': this.Formlist[this.selectRow].oid,limit:-1}).then(res => {
this.ProData = res.data.data;
console.log(this.ProData)
//鍒嗙被娉ㄥ叆鏁版嵁鏍煎紡
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 805f22c..719627b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -425,6 +425,8 @@
// //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
cbo.setOid(VciBaseUtil.getPk());
+ cbo.setRevisionOid(VciBaseUtil.getPk());
+ cbo.setNameOid(VciBaseUtil.getPk());
cbo.setCreateTime(new Date());
cbo.setLastModifyTime(new Date());
cbo.setCreator(AuthUtil.getUser().getUserName());
@@ -3383,7 +3385,7 @@
if (!listR.isSuccess() || listR.getData().size() == 0) {
throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
}
- String userName = String.valueOf(AuthUtil.getUser().getUserId());
+// String userName = String.valueOf(AuthUtil.getUser().getUserId());
BaseModel bo = new BaseModel();
// bo.setOid(VciBaseUtil.getPk());
// bo.setRevisionid(VciBaseUtil.getPk());
@@ -3393,17 +3395,15 @@
bo.setFirstR("1");
bo.setFirstV("1");
bo.setLastV("1");
- bo.setCreator(userName);
- bo.setCreateTime(new Date());
- bo.setLastModifier(userName);
- bo.setLastModifyTime(new Date());
bo.setRevisionRule(listR.getData().get(0).getRevisionRuleId());
- bo.setVersionRule(String.valueOf(listR.getData().get(0).getVersionRule()));
+ bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"0":listR.getData().get(0).getVersionRule());
if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
.selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
if(revisionRuleVO.getData().size() != 0 ){
bo.setRevisionValue(revisionRuleVO.getData().get(0).getStartCode());
+ }else{
+ bo.setRevisionValue("1");
}
}
bo.setRevisionSeq(1);
@@ -3417,7 +3417,7 @@
bo.setId("");
bo.setName("");
bo.setDescription("");
- bo.setOwner(userName);
+ bo.setOwner("1");
// bo.setCheckinby(userName);
bo.setCopyFromVersion("");
// this.initTypeAttributeValue(bo,btmTypeVO);
--
Gitblit v1.9.3