From a9ef002fbfe2207071d604f55b36bbb74204a7a0 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 九月 2023 14:33:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/loge.vue | 9 ++--
Source/UBCS-WEB/src/views/code/code.vue | 6 +-
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 8 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 2
Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue | 1
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 18 +++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 5 ++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 26 ++++++++++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 2
9 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index ce67db7..1f4e6a3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -135,8 +135,15 @@
let group = [];
let dictKeys = [];
let slotColumnList = [];
+ let value=''
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ if( formItem.type === "combox" && formItem.dicData){
+ value=formItem.dicData[0].key
+ }
+ // console.log('formItem',formItem)
+ // console.log('formItem.dicData[0].value',formItem.dicData[0].key)
+ // console.log('formItem.dicData[0].value',formItem.dicData[0].id)
if (formItem.type === "line") {
group.push({
label: formItem.text,
@@ -189,13 +196,14 @@
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
- valueFormat: formItem.dateFormate,
+ valueFormat:formItem.dateFormate,
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
- value: formItem.defaultValue,
+ value: value,
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
+ readonly:true,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
@@ -206,7 +214,6 @@
showField: formItem.showField || formItem.field,
field: formItem.field,
fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
-
placeholder: formItem.inputTip,
options: formItem.referConfig
}
@@ -234,6 +241,10 @@
value: "key",
},
};
+ // if(columnItem.type == "select"){
+ // columnItem.value=value
+ // }
+ // console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
if (group.length === 0) {
column.push(columnItem);
@@ -251,6 +262,7 @@
this.geDictData(dictKeys);
this.getFormDetail();
+
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 9f31ce4..8597543 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -244,7 +244,7 @@
} else {
this.showResembleQuery = false;
}
- console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
+ // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
@@ -277,6 +277,8 @@
"codeattrsec",
//鏃ユ湡鐮佹
"codedatesec",
+ //灞傜骇鐮佹
+ "codelevelsec",
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
@@ -291,8 +293,8 @@
this.showCodeApply = false;
}
}
- console.log(' this.secVOList',this.secVOList)
- console.log(' res.data.data.secVOList',res.data.data.secVOList)
+ // console.log(' this.secVOList',this.secVOList)
+ // console.log(' res.data.data.secVOList',res.data.data.secVOList)
});
},
getFormData(form) {
diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index dc1b16f..bce1993 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -47,6 +47,7 @@
:prop="item.prop" :show-overflow-tooltip="true"
:sortable="item.sortable"
:width="item.width"
+ v-if="item.tableDisplayFlag == 'true'"
align="center">
</el-table-column>
</el-table>
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 697ae5e..a3de81c 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1402,7 +1402,7 @@
</el-dialog>
</basic-container>
</template>
-
+
<script>
import {
gridCodeRule,
@@ -3660,7 +3660,7 @@
},
};
</script>
-
+
<style>
[class^="icon-"] {
font-size: 12px !important;
@@ -3803,4 +3803,4 @@
/* .code-total > .basic-container__card {
height: 100%;
} */
-</style>
\ No newline at end of file
+</style>
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index b672067..4653329 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -54,7 +54,7 @@
prop: "id",
search: true,
sortable:true,
- width:150
+ width:130
},
{
label: "鍥惧彿",
@@ -69,7 +69,8 @@
prop: 'classifyId',
search: true,
sortable:true,
- width: 230
+ overHidden:true,
+ width: 150
},
{
label: '鍒嗙被鍚嶇О',
@@ -77,14 +78,14 @@
search: true,
sortable:true,
overHidden: true,
- width: 150
+ width: 140
},
{
label: '闆嗘垚绯荤粺缂栧彿',
prop: 'systemCode',
search: true,
sortable:true,
- width: 150
+ width: 130
},
{
label: '闆嗘垚绯荤粺鍚嶇О',
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 0a38d9b..b498a08 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -41,7 +41,7 @@
* @param plCodeClassify
* @return
*/
- List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify);
+ List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify,@Param("tenantId") String tenantId);
/**
* 鏌ユ壘瀛愮被
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index f29205c..c1560e5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -45,6 +45,7 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,8 +85,8 @@
@Resource
private IBtmTypeClient btmTypeClient;
- @Value("${user-info.tenant-id}")
- private String tenantId;
+ @Resource
+ private NacosConfigCache nacosConfigCache;
/**
* 鏃ュ織
@@ -126,7 +127,12 @@
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
- return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
+ return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()));
}
/**
@@ -518,9 +524,19 @@
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
doList = codeClassifyMapper
- .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
+ .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId());
}else{
- doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId());
}
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
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 8b89e4e..721683a 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
@@ -951,7 +951,7 @@
return (BaseModel) valueWrapper.get();
} catch (Exception e) {
logger.error("鍒涘缓涓氬姟绫诲瀷瀵硅薄", e);
- throw new VciBaseException("initBtmError", new String[]{btmName});
+ throw new ServiceException("initBtmError:"+"涓氬姟绫诲瀷锛�"+btmName+":"+e.getMessage());
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index 7786a94..83d12c5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -46,6 +46,9 @@
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
select * from PL_CODE_CLASSIFY where is_deleted = 0
+ <if test="tenantId != null and tenantId != ''">
+ and tenant_id = #{tenantId}
+ </if>
</select>
<select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -362,7 +365,7 @@
</if>
<if test="tenantId != null and tenantId != ''">
- codeclassify0.tenant_id = #{tenantId}
+ and codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
--
Gitblit v1.9.3