From 365fe312bcd6b8ae6954c148edfde3e1ff5b987e Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 03 十一月 2023 10:19:28 +0800
Subject: [PATCH] 版本规则-查看应用范围判空
---
Source/UBCS-WEB/src/views/code/code.vue | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 1d0c9dd..f9d2ddb 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1113,9 +1113,9 @@
>
<el-option
v-for="item in enumParam.codeFillSeparator"
- :key="item.itemValue"
- :label="item.itemName"
- :value="item.itemValue"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictValue"
>
</el-option>
</el-select>
@@ -1293,6 +1293,7 @@
saveCodeClassifyValueOrder,
} from "@/api/code/codeClassifyValue";
import { getDictionary } from "@/api/omd/enum";
+import { getDictionaryBiz } from "@/api/system/dictbiz";
import optionBasic from "@/const/code/codebasic";
import optionRule from "@/const/code/mdmrule";
import attrOption from "@/const/code/selectAttrOptionDialog";
@@ -1303,6 +1304,7 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
+import secTypeEnum from '@/enumpack/CodeSecTypeEnum';
export default {
data() {
@@ -1611,6 +1613,16 @@
this.$refs.crud.doLayout();
this.$refs.crudBasic.doLayout();
});
+ },
+ // 鐢熷懡閽╁瓙鍑芥暟
+ beforeDestroy() {
+ // 娓呴櫎鎸囧畾缂撳瓨
+ localStorage.removeItem('codeSecType');
+ localStorage.removeItem('codeSecLength');
+ localStorage.removeItem('codeFillType');
+ localStorage.removeItem('codeLevelType');
+ localStorage.removeItem('codeCutType');
+ localStorage.removeItem('codeGetValueType');
},
methods: {
@@ -2421,11 +2433,11 @@
.catch((error) => {
this.releadDisabled = false;
});
+ this.releadDisabled = false;
} else {
this.updateStatus(oid, update);
}
},
-
/** 鎵撳紑缂栫爜瑙勫垯鍏嬮殕瀵硅瘽妗�*/
openCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
@@ -2433,7 +2445,6 @@
}
this.cloneSettingBox = true;
},
-
/** 鎵撳紑浠庡叾浠栫紪鐮佽鍒欎腑鍏嬮殕鐮佹瀵硅瘽妗�*/
openOtherCodeRuleDialog() {
if (!this.tipsMessage(this.selectionList)) {
@@ -2665,13 +2676,13 @@
this.basicSecDialogTitle = "淇敼鐮佹淇℃伅";
this.showbtn = true;
this.basicSecOnlyRead = false;
- //涓篺orm缁戝畾鍊�
} else {
this.basicSecDialogTitle = "鏌ョ湅鐮佹淇℃伅";
this.showbtn = false;
this.basicSecOnlyRead = true;
}
//console.log(this.form);
+ //涓篺orm缁戝畾鍊�
this.changeSectypeFormItems(condition == "add" ? null : row);
this.addBasicCodeSettingBox = true;
},
@@ -2717,8 +2728,23 @@
// let referValueInfo = JSON.parse(this.form.referValueInfo);
// referValueInfo.referType = this.form.referBtmId;
}
-
- editSave(this.form).then(
+ let oldBasicSec = this.selectionBasicList.at(-1);
+ let secType = this.form.secType;
+ Vue.set(this.form, 'isClearValue', false);
+ if((oldBasicSec.secType == "codefixedsec" || oldBasicSec.secType === "codeclassifysec") && oldBasicSec.secType != secType){
+ await this.$confirm("鐮佹绫诲瀷鐢便��"+oldBasicSec.secTypeText+"銆戯紝淇敼涓�"+"銆�"+secTypeEnum.getTextByValue(secType)+"銆戯紝璇烽棶鏄惁闇�瑕佹竻绌哄叧鑱旂殑鐮佸�硷紵", "鎻愮ず", {
+ distinguishCancelAndClose: true,
+ closeOnClickModal: false,
+ confirmButtonText: "娓呯┖鐮佸��",
+ cancelButtonText: "淇濈暀鐮佸��",
+ }).then(() => {
+ // 娓呯┖鐮佸��
+ this.form.isClearValue = true;
+ }).catch(action => {
+ this.form.isClearValue = false;
+ });
+ }
+ await editSave(this.form).then(
() => {
this.$message({
type: "success",
@@ -2733,6 +2759,7 @@
}
);
}
+ // 鍙栨秷淇濆瓨鎸夐挳鍔犺浇鏁堟灉
this.isLoadingSecCodeAddBtn = false;
},
/** 鍥犱负elementui鐨勮〃鍗曟牎楠岃缃笉涓婃墍浠ラ噰鐢ㄥ垽鏂殑鏂瑰紡鏉ュ仛琛ㄥ崟妫�楠屾柟寮�*/
@@ -3377,16 +3404,17 @@
this.enumParam.codeFillType = this.getLocalStorageEnum("codeFillType") || [];
},
loadCodeFillSeparator() {
- let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
- if (enumCach == null) {
- getDictionary("codeFillSeparator").then((res) => {
- this.enumParam.codeFillSeparator = res.data.data;
- localStorage.setItem(
- "codeFillSeparator",
- JSON.stringify(res.data.data)
- );
- });
- }
+ //let enumCach = JSON.parse(localStorage.getItem("codeFillSeparator"));
+ //if (enumCach == null) {
+ getDictionaryBiz({code:"codeFillSeparator"}).then((res) => {
+ this.enumParam.codeFillSeparator = res.data.data;
+ //console.log(this.enumParam.codeFillSeparator);
+ localStorage.setItem(
+ "codeFillSeparator",
+ JSON.stringify(res.data.data)
+ );
+ });
+ //}
},
loadCodeLevelType() {
this.enumParam.codeLevelType = this.getLocalStorageEnum("codeLevelType") || [];
--
Gitblit v1.9.3