From 15dc0b8f5dd4ec07fde303c3cc20e468f3b448d3 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 24 八月 2023 20:29:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/code/code.vue | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 4b4fadd..48459e6 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1827,28 +1827,33 @@
},
/** 鍙戝竷缂栫爜瑙勫垯 */
async enableOrDeactivatse(oid,update){
- // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
- this.releadDisabled = true;
- await checkLikeCodeRule(oid).then(res => {
- if(res.data.success){
- this.updateStatus(oid,update);
- }else{
- this.$confirm('test', '鎻愮ず', {
- distinguishCancelAndClose: true,
- confirmButtonText: '缁х画鍙戝竷',
- cancelButtonText: '鍙栨秷'
- }).then(() => {
- //this.updateStatus();
- })
- .catch(action => {
- this.$message({
- type: 'info',
- message: '鍙栨秷鍙戝竷!',
+ /*if(update==="release"){
+ // 閬垮厤鐢ㄦ埛閲嶅鐐瑰嚮鎸夐挳
+ this.releadDisabled = true;
+ await checkLikeCodeRule(oid).then(res => {
+ console.log(res)
+ if(res.data.success){
+ this.updateStatus(oid,update);
+ }else{
+ this.$confirm(res.data.msg, '鎻愮ず', {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '缁х画鍙戝竷',
+ cancelButtonText: '鍙栨秷'
+ }).then(() => {
+ //this.updateStatus();
})
- });
- }
- })
- this.releadDisabled = false;
+ .catch(action => {
+ this.$message({
+ type: 'info',
+ message: '鍙栨秷鍙戝竷!',
+ })
+ });
+ }
+ })
+ this.releadDisabled = false;
+ }else {*/
+ this.updateStatus(oid,update);
+ //}
},
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
--
Gitblit v1.9.3