From b73921626fee3a9918f91436f56e755790dcd544 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 九月 2023 20:17:54 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/views/code/code.vue | 11 +++++------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 4 +++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index fdf2ce5..697ae5e 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -944,8 +944,6 @@
:key="item.itemValue"
:label="item.itemName"
:value="item.itemValue"
- label="宸﹁ˉ浣�"
- value="codeattrsec"
>
</el-option>
</el-select>
@@ -1230,8 +1228,7 @@
<el-form-item
:label-width="rightFormLabelWidth"
label="缂栫爜琛ヤ綅鏂瑰紡:"
- required
- >
+ required>
<el-select
v-model="form.codeFillType"
:disabled="basicSecOnlyRead"
@@ -1458,6 +1455,7 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
+import logeVue from '../docking/loge.vue';
export default {
data() {
@@ -3481,8 +3479,7 @@
serialStart:
row != null && row.serialStart != "" ? row.serialStart : 1, //娴佹按鍙疯捣濮嬪��
serialStep: row != null && row.serialStep != "" ? row.serialStep : 1, //娴佹按鐨勬闀�
- codeFillType:
- row != null && row.codeFillType != ""
+ codeFillType: row != null && row.codeFillType != ""
? row.codeFillType
: "code_fill_left", //缂栫爜琛ヤ綅鏂瑰紡
// codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
@@ -3505,6 +3502,8 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
+ console.log(this.form);
+ console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
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 19fb609..9f583c8 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
@@ -560,7 +560,9 @@
} else {
//璇存槑鏄嚜琛岄厤缃殑
//鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
+ String orDefault = orderDTO.getData().getOrDefault(attrId, "");
+ value = Func.isBlank(orDefault) ? orderDTO.getData()
+ .getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault;
}
return value;
}
--
Gitblit v1.9.3