From b7de729e7ae27044dcfa8e996218ff2b7ec1fae5 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 05 七月 2023 18:39:02 +0800
Subject: [PATCH] bug修改提交
---
Source/UBCS-WEB/src/components/Tree/classifyTrees.vue | 45 +++++++++++++++++-----
Source/UBCS-WEB/src/page/login/userlogin.vue | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 8 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java | 2 -
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 23 ++++++-----
5 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 0f470e3..99a82dc 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -30,7 +30,7 @@
<!-- 閲嶇疆-->
<el-button size="small" @click="reset">閲嶇疆</el-button>
<!-- 鍚屾鍒板叾浠栨ā鏉�-->
- <el-button size="small"@click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
+ <el-button size="small" @click="syncHandle">鍚屾鍒板叾浠栨ā鏉�</el-button>
<!-- 缂栫爜鐢宠棰勮-->
<el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
<!-- 楠岃瘉瑙勫垯-->
@@ -1215,14 +1215,10 @@
},
//涓氬姟绫诲瀷淇濆瓨
busineAddHandle() {
- if (this.busineSelectList.length > 1) {
- this.$message.warning('璇烽�夋嫨涓�鏉′笟鍔＄被鍨嬫暟鎹�')
- } else {
- this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
- this.$set(this.busineAddList, 'oid', '')
- this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
- this.addVisible = false;
- }
+ this.$set(this.busineAddList, 'classifytemplateoid', this.crudOid)
+ this.$set(this.busineAddList, 'oid', '')
+ this.ProData.push(JSON.parse(JSON.stringify(this.busineAddList)))
+ this.addVisible = false;
},
//涓氬姟绫诲瀷鍗曢��
businessSelect(selection, row) {
@@ -1363,7 +1359,14 @@
},
//鍒嗙被娉ㄥ叆淇濆瓨
injectAddHandle() {
- this.$set(this.attrRow, 'classifyInvokeLevel', this.injectOption);
+ let data = {
+ "娉ㄥ叆绫诲瀷": this.injectOption.type,
+ "娉ㄥ叆绫诲瀷鍚嶇О": this.injectOption.set,
+ "灞傜骇璁剧疆": this.injectOption.injectNum,
+ "鏄惁鍙慨鏀�": this.injectOption.change
+ }
+ console.log(this.injectOption)
+ this.$set(this.attrRow, 'classifyInvokeLevel', data);
this.injectVisible = false
},
//鍒嗙被娉ㄥ叆娓呯┖
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 8331068..4741278 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -84,9 +84,20 @@
<el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
<el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
<el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
- <div style="display: inline-block"> <el-input v-model="FindText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
- size="small"
- @keyup.enter.native="EnterFind"></el-input></div>
+ <!-- <div style="display: inline-block">
+ <el-select v-model="searchTemplate.searchCondition" placeholder="璇烽�夋嫨" class="search-condition">
+ <el-option
+ v-for="item in searchTemplateOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <el-input v-model="searchTemplate.findText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
+ size="small"
+ @keyup.enter.native="EnterFind">
+ </el-input>
+ </div> -->
<!-- 鏌ヨ瀵硅瘽妗�-->
<el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
<div>
@@ -95,7 +106,7 @@
</div>
<div style="padding-left: 80px;margin-top: 15px;">
<template v-for="(value, key) in FindSelect">
- <div style="display: flex;justify-content: space-around;width: 85%;margin-bottom: 15px">
+ <div style="display: flex; justify-content: space-around; width: 85%; margin-bottom: 15px">
<el-select v-model="FindSelect[key]" placeholder="璇烽�夋嫨" style="width: 28%"
@change="handleSelectChange(key)">
<el-option label="妯℃澘缂栧彿" value="0"></el-option>
@@ -236,6 +247,15 @@
// }
// ]
// },
+ // searchTemplateOptions: [
+ // {
+ // value: 'id',
+ // label: '妯℃澘缂栧彿'
+ // }, {
+ // value: 'name',
+ // label: '妯℃澘鍚嶇О'
+ // }
+ // ],
addFlag:false,
// 琛ㄦ牸褰撳墠琛宨d
crudOid:"",
@@ -244,7 +264,11 @@
//妯℃澘灞炴�у睍绀哄唴瀹�
ProData: [],
//鍥炶溅閿悳绱㈢粦瀹氬��
- FindText: "",
+ searchTemplate: {
+ searchCondition: 'id',
+ findText: "",
+ },
+
//楂樼骇鏌ヨ瀵硅瘽妗�
FindFormVisible: false,
//鍏嬮殕妯℃澘瀵硅瘽妗�
@@ -832,20 +856,20 @@
});
})
},
- //妯℃澘绠＄悊琛ㄦ牸鏌ヨ
- EnterFind() {
- if (this.FindText == "") {
+ //妯℃澘绠＄悊琛ㄦ牸鏌ヨ,鍙湁涓�鏉℃暟鎹病蹇呰鍋氭悳绱�
+ /*nterFind() {
+ if (this.findText == "") {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data
})
} else {
gridCodeClassifyTemplate().then(res => {
this.Formlist = res.data.data.filter(item => {
- return item.name.includes(this.FindText)
+ return item.name.includes(this.findText)
})
})
}
- },
+ },*/
//鍏嬮殕妯℃澘鏌ヨ
CloneEnterFind(){
gridCodeClassifyTemplate().then(res => {
@@ -957,4 +981,5 @@
.my-messageboxs {
width: 500px;
}
+
</style>
diff --git a/Source/UBCS-WEB/src/page/login/userlogin.vue b/Source/UBCS-WEB/src/page/login/userlogin.vue
index 5f721ab..a0f5b6a 100644
--- a/Source/UBCS-WEB/src/page/login/userlogin.vue
+++ b/Source/UBCS-WEB/src/page/login/userlogin.vue
@@ -155,7 +155,6 @@
this.$axios.get('/api/ubcs-system/tenant/tenant-map').then(res => {
if (res.data.code == 200) {
this.loginForm.tenantId = res.data.data[0].TENANT_ID;
- console.log(res.data.data);
this.loginForm.region = res.data.data
}
})
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
index bfb44bb..26821ce 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
@@ -56,6 +56,4 @@
-
-
}
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 db221da..d28dbae 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
@@ -3352,7 +3352,13 @@
//checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
- BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
+ if (allAttributeByBtmId.getCode() != 200) {
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
+ }
+ if (Func.isEmpty(allAttributeByBtmId.getData())) {
+ throw new VciBaseException("浼犲叆涓氬姟绫诲瀷鏈煡璇㈠埌鐩稿簲琛ㄥ崟锛岃妫�鏌ワ紒");
+ }
+ BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
/**
* 鍔犱笂鏌ヨ鏈�鏂扮増娆�
*/
--
Gitblit v1.9.3