From 375041c3d6d2ecb2228dcaa3cbefa079da40a8dd Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 24 八月 2023 15:10:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
index 201b054..8d0fa1e 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -27,19 +27,13 @@
};
},
watch:{
- display:{
- handler(newval,oldval){
- console.log('newval',newval)
- console.log('oldval',oldval)
- }
- },
referConfigOption (){
- console.log(111)
if(func.notEmpty(this.referConfigOption.referConfig) || func.notEmpty(this.referConfigOption.referBtmId)){
this.openReconfigInterFace(this.referConfigOption);
}else{
this.openTipsChooseOrCust();
}
+
},
},
methods: {
@@ -50,16 +44,16 @@
openReconfigInterFace(preReferConfigForm){
const form = preReferConfigForm;
let data = {
- referTypeName: form.referBtmName,
- referType: form.referBtmId,
+ referTypeName: form.referBtmName || '',
+ referType: form.referBtmId || '',
}
if(this.referConfigOption.referConfig){
// 缂栬緫鐮佹鏃秗eferConfig鍙兘浼氬湪涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庢敼鍙�
let referConfigValue =JSON.parse(form.referConfig);
- if(referConfigValue.referType != form.referBtmId){
- referConfigValue.referType = form.referBtmId || '';
- referConfigValue.referTypeName = form.referBtmName || form.referBtmId;
- this.referConfigOption.referConfig = JSON.stringify(referConfigValue);
+ if(referConfigValue.referType != form.referBtmId && data.referType){
+ referConfigValue.referType = form.referBtmId || '';
+ referConfigValue.referTypeName = form.referBtmName || form.referBtmId;
+ this.referConfigOption.referConfig = JSON.stringify(referConfigValue);
}
this.$set(data,"referConfig",this.referConfigOption.referConfig)
}
--
Gitblit v1.9.3