From 1056fae380cb28ffc610d8f1de461bf9f5aec559 Mon Sep 17 00:00:00 2001 From: wangting <675591594@qq.com> Date: 星期五, 08 九月 2023 15:55:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 1 + Source/UBCS-WEB/src/views/docking/loge.vue | 4 ++-- Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue index d8657d0..610ff04 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue @@ -263,6 +263,7 @@ }, // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃� resetFormConfig(formItem) { + // console.log(this.selfColumnConfig) for (const configType in this.selfColumnConfig) { if (Object.hasOwnProperty.call(this.selfColumnConfig, configType)) { const element = this.selfColumnConfig[configType]; diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue index a549dd1..e188160 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue @@ -161,6 +161,7 @@ if(this.options.displayTable){ //璇存槑鏄娇鐢ㄥ钩鍙扮殑琛ㄦ牸 getTableDefinedUrl({btmType:(this.options.referBo||this.options.referType),code:this.options.displayTable,isMuti:this.isMuti},this.tableDefinedUrl).then(result => { + console.log('result',result) if(result.success){ var queryScheme = result.querySchema; if(!validatenull(queryScheme) && validatenull(this.options.queryScheme)){ diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue index 4653329..574dfaa 100644 --- a/Source/UBCS-WEB/src/views/docking/loge.vue +++ b/Source/UBCS-WEB/src/views/docking/loge.vue @@ -96,7 +96,7 @@ }, { label: '绫诲瀷', - prop: 'type', + prop: 'typeText', search: true, sortable:true, width: 150 @@ -129,7 +129,7 @@ width: 160 }, { - label: '鏄惁鎺ㄩ�佹垚鍔�', + label: '鏄惁鎴愬姛', prop: 'interfaceStatus', search: true, sortable:true, -- Gitblit v1.9.3