From a2109930695034bc9fe3e2d38f97649b0d2d2a12 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 31 七月 2023 20:46:04 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 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..c072a8e 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: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
@@ -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