From 0316a18c450d79c356509f96767854f008e1a2a6 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 25 八月 2023 14:52:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 48459e6..4b9fec7 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,11 +1827,11 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid,update){
- /*if(update==="release"){
+ if(update==="release"){
// 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
this.releadDisabled = true;
await checkLikeCodeRule(oid).then(res => {
- console.log(res)
+ //console.log(res)
if(res.data.success){
this.updateStatus(oid,update);
}else{
@@ -1840,7 +1840,7 @@
confirmButtonText: '缁х画鍙戝竷',
cancelButtonText: '鍙栨秷'
}).then(() => {
- //this.updateStatus();
+ this.updateStatus(oid,update);
})
.catch(action => {
this.$message({
@@ -1851,9 +1851,9 @@
}
})
this.releadDisabled = false;
- }else {*/
+ }else {
this.updateStatus(oid,update);
- //}
+ }
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
--
Gitblit v1.9.3