From d7e3c8a813f8f85c89c06782f1e36e8089ffc31b Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 09 一月 2025 11:42:06 +0800 Subject: [PATCH] 集成模块回车查询报错问题 --- Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue index 48a5f08..e59f156 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue @@ -1,5 +1,3 @@ -<!-- eslint-disable vue/valid-v-for --> -<!-- eslint-disable vue/require-v-for-key --> <template> <div> <avue-form @@ -27,6 +25,7 @@ <template v-for="item in slotColumnList" :slot="item.prop + ''"> <vciWebRefer v-if="item.type == 'refer'" :key="item.dataKey" + referType="master" :data-key="item.dataKey" :disabled="item.disabled" :display="item.display" @@ -240,12 +239,11 @@ let slotColumnList = []; formItemList.forEach((formItem) => { formItem = this.resetFormConfig(formItem); - // console.log(formItem) //灞炴�х爜娈佃鍒� if (formItem.secType === "codeattrsec") { this.attrList.push(formItem); } - //绯诲垪鍙疯鍒� + //鏇存敼鏂瑰紡 if (formItem.field === "codeStandardEditType") { if (this.status === "amend") { formItem.readOnly = true; @@ -260,6 +258,7 @@ }); return; } + if ( formItem.type === "combox" && formItem.comboxKey && @@ -325,7 +324,7 @@ type: this.columnType[formItem.type], dicData: this.getDataList(formItem.type, formItem.data), disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) || - (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), + ((formItem.name === "绯诲垪鍙�" && this.status && (formItem.field === "reviseSeries" && formItem.value == 'false') ? true : false)), prepend: this.preOrSufFixShow("text", formItem.prefix), append: this.preOrSufFixShow("text", formItem.suffix), prefixIcon: this.preOrSufFixShow("icon", formItem.prefix), @@ -437,7 +436,7 @@ type: this.columnType[formItem.type], dicData: this.getDataList(formItem.type, formItem.data), disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) || - (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), + (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), prepend: this.preOrSufFixShow("text", formItem.prefix), append: this.preOrSufFixShow("text", formItem.suffix), prefixIcon: this.preOrSufFixShow("icon", formItem.prefix), @@ -557,7 +556,7 @@ type: this.columnType[formItem.type], dicData: this.getDataList(formItem.type, formItem.data), disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) || - (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), + (this.status ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false), prepend: this.preOrSufFixShow("text", formItem.prefix), append: this.preOrSufFixShow("text", formItem.suffix), prefixIcon: this.preOrSufFixShow("icon", formItem.prefix), -- Gitblit v1.9.3