From 518f6efefe510f45176076261f49e0fa1bc40a07 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 25 八月 2023 11:06:42 +0800
Subject: [PATCH] 处理basemodel,bean里面遇到字段相同且map里面数据为空,则使用bean里面的值
---
Source/UBCS-WEB/src/views/code/code.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 70f2194..7f576e2 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -845,7 +845,7 @@
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import {getByRoleUserList} from "@/api/system/user";
- import func from "@/util/func";
+ import func from "@/util/func";
export default {
data() {
@@ -890,7 +890,7 @@
visible:false,
},
-
+
/*浣跨敤鑼冨洿瀵硅瘽妗嗘樉绀烘帶鍒�*/
codeRangeSettingBox: false,
useRangeData: [],
@@ -1827,7 +1827,7 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid,update){
- if(update==="release"){
+ /*if(update==="release"){
// 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
this.releadDisabled = true;
await checkLikeCodeRule(oid).then(res => {
@@ -1851,9 +1851,9 @@
}
})
this.releadDisabled = false;
- }else {
+ }else {*/
this.updateStatus(oid,update);
- }
+ //}
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
--
Gitblit v1.9.3