From 36fff14de9bb4808d8dbf5c586baf331986e53a3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 31 十月 2023 22:56:22 +0800
Subject: [PATCH] 修改可输可选新增方法，完善部分漏改按钮code
---
Source/UBCS-WEB/src/api/system/dictbiz.js | 8 ++++
Source/UBCS-WEB/src/views/code/code.vue | 38 ++++++++++++------
Source/UBCS-WEB/src/views/flow/manager.vue | 2
Source/UBCS-WEB/src/views/system/dict.vue | 2
Source/UBCS-WEB/src/views/integration/systemInfo.vue | 2
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java | 21 ++++++++--
Source/UBCS-WEB/src/views/system/dictbiz.vue | 4 +-
7 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/system/dictbiz.js b/Source/UBCS-WEB/src/api/system/dictbiz.js
index 052f129..c407ea1 100644
--- a/Source/UBCS-WEB/src/api/system/dictbiz.js
+++ b/Source/UBCS-WEB/src/api/system/dictbiz.js
@@ -87,3 +87,11 @@
params,
})
}
+
+export const getDictionaryBiz = (params) => {
+ return request({
+ url: '/api/ubcs-system/dict-biz/dictionary',
+ method: 'get',
+ params,
+ })
+}
\ No newline at end of file
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index f397beb..f9d2ddb 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1113,9 +1113,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1293,6 +1293,7 @@
saveCodeClassifyValueOrder,
} from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
+import { getDictionaryBiz } from "@/api/system/dictbiz";
import optionBasic from "@/const/code/codebasic";
import optionRule from "@/const/code/mdmrule";
import attrOption from "@/const/code/selectAttrOptionDialog";
@@ -1612,6 +1613,16 @@
this.$refs.crud.doLayout();
this.$refs.crudBasic.doLayout();
});
+ },
+ // 鐢熷懡閽╁瓙鍑芥暟
+ beforeDestroy() {
+ // 娓呴櫎鎸囧畾缂撳瓨
+ localStorage.removeItem('codeSecType');
+ localStorage.removeItem('codeSecLength');
+ localStorage.removeItem('codeFillType');
+ localStorage.removeItem('codeLevelType');
+ localStorage.removeItem('codeCutType');
+ localStorage.removeItem('codeGetValueType');
},
methods: {
@@ -3393,16 +3404,17 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") || [];
},
loadCodeFillSeparator() {
- let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
- if (enumCach == null) {
- getDictionary("codeFillSeparator").then((res) => {
- this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem(
- "codeFillSeparator",
- JSON.stringify(res.data.data)
- );
- });
- }
+ //let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ //if (enumCach == null) {
+ getDictionaryBiz({code:"codeFillSeparator"}).then((res) => {
+ this.enumParam.codeFillSeparator = res.data.data;
+ //console.log(this.enumParam.codeFillSeparator);
+ localStorage.setItem(
+ "codeFillSeparator",
+ JSON.stringify(res.data.data)
+ );
+ });
+ //}
},
loadCodeLevelType() {
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") || [];
diff --git a/Source/UBCS-WEB/src/views/flow/manager.vue b/Source/UBCS-WEB/src/views/flow/manager.vue
index 7bfc622..de3a9e9 100644
--- a/Source/UBCS-WEB/src/views/flow/manager.vue
+++ b/Source/UBCS-WEB/src/views/flow/manager.vue
@@ -205,7 +205,7 @@
return {
state:this.vaildData(this.permission.flow_manager.flow_manager_state, false),
image:this.vaildData(this.permission.flow_manager.flow_manager_image, false),
- delBtn: this.vaildData(this.permission.flow_manager.flow_manager_remove, false),
+ delBtn: this.vaildData(this.permission.flow_manager.flow_manager_delete, false),
};
},
ids() {
diff --git a/Source/UBCS-WEB/src/views/integration/systemInfo.vue b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
index ebe2dfd..b3d2433 100644
--- a/Source/UBCS-WEB/src/views/integration/systemInfo.vue
+++ b/Source/UBCS-WEB/src/views/integration/systemInfo.vue
@@ -105,7 +105,7 @@
return {
addBtn: this.vaildData(this.permission.systemInfo.systemInfo_add, false),
editBtn: this.vaildData(this.permission.systemInfo.systemInfo_edit, false),
- delBtn: this.vaildData(this.permission.systemInfo.systemInfo_remove, false),
+ delBtn: this.vaildData(this.permission.systemInfo.systemInfo_delete, false),
empower: this.vaildData(this.permission.systemInfo.systemInfo_empower, false),
}
},
diff --git a/Source/UBCS-WEB/src/views/system/dict.vue b/Source/UBCS-WEB/src/views/system/dict.vue
index 3ee511a..1a0dc96 100644
--- a/Source/UBCS-WEB/src/views/system/dict.vue
+++ b/Source/UBCS-WEB/src/views/system/dict.vue
@@ -153,7 +153,7 @@
delBtn: this.vaildData(this.permission.dict.dict_delete, false),
editBtn: this.vaildData(this.permission.dict.dict_edit, false),
viewBtn: this.vaildData(this.permission.dict.dict_view, false),
- settingBtn: this.vaildData(this.permission.dict.dict_config,false),
+ settingBtn: this.vaildData(this.permission.dict.dict_setting,false),
addChildBtn: this.vaildData(this.permission.dict.dict_add_child,false),
};
},
diff --git a/Source/UBCS-WEB/src/views/system/dictbiz.vue b/Source/UBCS-WEB/src/views/system/dictbiz.vue
index 34030af..bb80cde 100644
--- a/Source/UBCS-WEB/src/views/system/dictbiz.vue
+++ b/Source/UBCS-WEB/src/views/system/dictbiz.vue
@@ -153,8 +153,8 @@
delBtn: this.vaildData(this.permission.dictbiz.dictbiz_delete, false),
editBtn: this.vaildData(this.permission.dictbiz.dictbiz_edit, false),
viewBtn: this.vaildData(this.permission.dictbiz.dictbiz_view, false),
- settingBtn: this.vaildData(this.permission.dictbiz.dictbiz_config, false),
- addChildBtn: this.vaildData(this.permission.dictbiz.dictbiz_add_child,false),
+ settingBtn: this.vaildData(this.permission.dictbiz.dictbiz_setting, false),
+ // addChildBtn: this.vaildData(this.permission.dictbiz.dictbiz_add_child,false),
};
},
ids() {
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
index 287785f..1d48f94 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictBizServiceImpl.java
@@ -120,16 +120,27 @@
@Override
public R checkOrInsert(DictBiz dictBiz) {
-
- LambdaQueryWrapper<DictBiz> lqw = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey()).eq(DictBiz::getDictValue, dictBiz.getDictValue());
- Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
+ LambdaQueryWrapper<DictBiz> wrapper = Wrappers.<DictBiz>query().lambda().eq(DictBiz::getCode, dictBiz.getCode()).eq(DictBiz::getDictKey, dictBiz.getDictKey()).eq(DictBiz::getDictValue, dictBiz.getDictValue());
+ // Long cnt = baseMapper.selectCount((Func.isEmpty(dictBiz.getId())) ? lqw : lqw.notIn(DictBiz::getId, dictBiz.getId()));
+ Long cnt = baseMapper.selectCount(wrapper);
if (cnt > 0L) {
return R.fail("瀛楀吀宸茬粡瀛樺湪锛�");
}
-
+ // 鏍规嵁code鍏堟煡璇㈡槸鍚﹀凡瀛樺湪璇ュ瓧鍏革紝瀛樺湪灏遍渶瑕佸皢褰撳墠瀛楀吀娣诲姞鍒拌code涓嬮潰
+ LambdaQueryWrapper<DictBiz> wrappers = Wrappers.<DictBiz>query()
+ .lambda().eq(DictBiz::getCode, dictBiz.getCode())
+ .eq(DictBiz::getParentId,BladeConstant.TOP_PARENT_ID)
+ .last("limit 1");
+ DictBiz dbDictBiz = baseMapper.selectOne(wrappers);
+ // 褰撳墠code宸插瓨鍦�,浣滀负褰撳墠鐖跺瓧鍏�
+ if(Func.isNotEmpty(dbDictBiz)){
+ dictBiz.setParentId(dbDictBiz.getId());
+ }
+ // 鏄惁涓洪《灞傚瓧鍏�
if (Func.isEmpty(dictBiz.getParentId())) {
dictBiz.setParentId(BladeConstant.TOP_PARENT_ID);
}
+ dictBiz.setIsSealed(0);
dictBiz.setIsDeleted(BladeConstant.DB_NOT_DELETED);
CacheUtil.clear(DICT_CACHE);
@@ -137,6 +148,6 @@
return R.success("鎿嶄綔鎴愬姛!");
}
return R.fail("鎿嶄綔澶辫触锛�");
-
}
+
}
--
Gitblit v1.9.3