From 1df722e049a36363ac9c0cc0658920d68f7b78ca Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 11 七月 2023 19:29:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/mixins/codeApply.js | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/mixins/codeApply.js b/Source/UBCS-WEB/src/mixins/codeApply.js
index 4ed57d6..ffe002e 100644
--- a/Source/UBCS-WEB/src/mixins/codeApply.js
+++ b/Source/UBCS-WEB/src/mixins/codeApply.js
@@ -41,10 +41,15 @@
codeApplyForm: {},
}
},
+ created() {
+ if (this.type === 'batchImportApply') {
+ this.getCodeRule()
+ }
+ },
methods: {
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
getCodeRule() {
- getCodeRule({ codeClassifyOid: this.localCodeClassifyOid }).then((res) => {
+ getCodeRule({ codeClassifyOid: this.localCodeClassifyOid || this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
const typeList = [
"codefixedsec",
@@ -59,8 +64,13 @@
if (this.localSecVOList.length > 0) {
this.showCodeApply = true
this.$nextTick(() => {
+ if (this.batchApplyCodeTableData) {
+ this.batchApplyCodeTableData[this.codeRuleOid]["localSecVOList"] = this.localSecVOList
+ }
this.$refs.CodeApply.templateRender(this.localSecVOList);
});
+ } else {
+ this.showCodeApply = false
}
}
@@ -68,7 +78,9 @@
},
getCodeApplyFormData(codeApplyForm) {
this.codeApplyForm = codeApplyForm;
- this.batchApplyCodeTableData[this.codeRuleOid]["codeApply"] = codeApplyForm
+ if (this.batchApplyCodeTableData) {
+ this.batchApplyCodeTableData[this.codeRuleOid]["codeApply"] = codeApplyForm
+ }
},
getType(item) {
console.log(item.secType, 'item.secType');
@@ -165,14 +177,14 @@
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
const { field } = data;
- this.secVOList = this.secVOList.map((item) => {
+ this.localSecVOList = this.localSecVOList.map((item) => {
if (item.parentClassifySecOid === field) {
this.$refs.CodeApply.form[item.oid] = undefined;
this.$refs.CodeApply.form[item.name] = undefined;
}
return item;
});
- this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$refs.CodeApply.templateRender(this.localSecVOList);
},
}
}
\ No newline at end of file
--
Gitblit v1.9.3