From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index c093722..b575e34 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -639,7 +639,7 @@
span: 6,
type: 'switch',
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
label: '鍙傜収閰嶇疆缂栧彿',
prop: 'id',
tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
@@ -650,7 +650,7 @@
}],
span: 6,
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
label: '鍙傜収閰嶇疆鍚嶇О',
prop: 'name',
tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
@@ -919,7 +919,7 @@
},
// 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
isShowReferConfigForm (){
- if(this.isShowReferConfigForm){
+ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
this.onloadAttrData();
}
}
@@ -982,6 +982,7 @@
// console.log(val.referConfig);
if(func.notEmpty(val.referConfig)){
this.form = JSON.parse(val.referConfig);
+ this.form.isPersistence = this.form.isPersistence == 'true'||this.form.isPersistence ? true:false;
// 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
// this.referTypeIsReadOnly = true;
if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
@@ -1094,7 +1095,7 @@
];
}
// 寮�鍚寔涔呭寲鍙傜収閰嶇疆
- if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+ if(oldForm.isPersistence=='true' || oldForm.isPersistence){
submittDefaultForm = submittDefaultForm.concat(['id','name'])
}
submittDefaultForm = submittDefaultForm.concat(addArray);
--
Gitblit v1.9.3