From e6e375997692ac712eb43ca76b16752f6a9a1c67 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 23 八月 2023 00:00:41 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS-WEB/src/views/code/code.vue | 69 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 0aa01d7..c297664 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -835,6 +835,7 @@
import fixedValueOption from "@/const/code/fixedValueMgrDialog";
import {mapGetters} from "vuex";
import {getByRoleUserList} from "@/api/system/user";
+ import func from "@/util/func";
export default {
data() {
@@ -1810,28 +1811,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() {
@@ -2616,7 +2622,7 @@
/** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
changeSectypeFormItems(row){
//console.log(row);
- if(this.enumParam.secTypeList.length==0){
+ if(func.isEmpty(this.enumParam.secTypeList) || this.enumParam.secTypeList.length==0){
this.loadCodeSecType();
}
if(row != null){
@@ -2752,14 +2758,18 @@
},
/** 鏋氫妇鍜屽彲杈撳彲閫夊唴瀹规煡璇� */
loadCodeSecType(){
- this.enumParam.secTypeList = this.getLocalStorageEnum("codeSecType");
+ let enumList = this.getLocalStorageEnum("codeSecType");
+ this.enumParam.secTypeList = enumList.length>0 ? enumList:[];
+ console.log(this.enumParam.secTypeList);
this.loadCodeSecLength();
},
loadCodeSecLength(){
- this.enumParam.codeSecLengthType = this.getLocalStorageEnum("codeSecLength");
+ let enumList = this.getLocalStorageEnum("codeSecLength");
+ this.enumParam.codeSecLengthType = enumList.length>0 ? enumList:[];
},
loadCodeFillType(){
- this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType");
+ let enumList = this.getLocalStorageEnum("codeFillType");
+ this.enumParam.codeFillType = enumList.length>0 ? enumList:[];
},
loadCodeFillSeparator(){
let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
@@ -2771,13 +2781,16 @@
}
},
loadCodeLevelType(){
- this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType");
+ let enumList = this.getLocalStorageEnum("codeLevelType");
+ this.enumParam.codeLevelType = enumList.length>0 ? enumList:[];
},
loadCodeCutType(){
- this.enumParam.codeCutType = this.getLocalStorageEnum("codeCutType");
+ let enumList = this.getLocalStorageEnum("codeCutType");
+ this.enumParam.codeCutType = enumList.length>0 ? enumList:[];
},
loadCodeGetValueType(){
- this.enumParam.codeGetValueType = this.getLocalStorageEnum("codeGetValueType");
+ let enumList = this.getLocalStorageEnum("codeGetValueType");
+ this.enumParam.codeGetValueType = enumList.length>0 ? enumList:[];
},
}
--
Gitblit v1.9.3