From be1abfb614840ba9f74b693b21fe0ca12bdf18ea Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 08 九月 2023 20:07:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/FormTemplate/index.vue | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue index cefd61a..2f714ce 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue @@ -142,7 +142,7 @@ coderefersec: "refer",//寮曠敤鐮佹 codeattrsec: "text", codelevelsec: "text", - codedatesec: "date" + codedatesec: "text" }, selfColumnConfig: { function: { @@ -263,9 +263,10 @@ }, // 鑾峰彇鐮佸�肩敵璇锋暟鎹� getCodeRule() { - getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => { + let that = this; + getCodeRule({ codeClassifyOid: that.codeClassifyOid }).then((res) => { if (res.data && res.data.code === 200) { - this.codeRuleOid = res.data.data.oid; + that.codeRuleOid = res.data.data.oid; const typeList = [ //灞炴�х爜娈� 鍙 "codeattrsec", @@ -283,20 +284,20 @@ "codelevelsec", //娴佹按鐮佹 闅愯棌 ]; - this.secVOList = (res.data.data.secVOList || []).filter((item) => + that.secVOList = (res.data.data.secVOList || []).filter((item) => typeList.includes(item.secType) ); - if (this.secVOList.length > 0 && this.type === "add") { - this.showCodeApply = true; - this.activeName = "codeApply"; - this.$nextTick(() => { - this.$refs.CodeApply.templateRender(this.secVOList); + if (that.secVOList.length > 0 && that.type === "add") { + that.showCodeApply = true; + that.activeName = "codeApply"; + that.$nextTick(() => { + that.$refs.CodeApply.templateRender(that.secVOList); }); } else { - this.showCodeApply = false; + that.showCodeApply = false; } } - // console.log(' this.secVOList',this.secVOList) + // console.log(' this.secVOList',that.secVOList) // console.log(' res.data.data.secVOList',res.data.data.secVOList) }); }, @@ -382,7 +383,6 @@ this.$delete(formValue, item); }); const keys = Object.keys(formValue); - debugger keys.forEach((item, index) => { keys.forEach((itm, idx) => { if ((item === ('$' + itm)) && idx !== index) { @@ -475,6 +475,8 @@ } else if (item.secType == "coderefersec") { //寮曠敤鐮佹 params = JSON.parse(item.referValueInfo); + // console.log('item',item) + console.log('params',params) } return params; }, @@ -492,6 +494,7 @@ isRequired(item) { return item.nullableFlag != "true"; }, + //榛樿鍊� getOptionList(item) { if ( Array.isArray(item.fixedValueVOList) && -- Gitblit v1.9.3