From c39b7d9707836066c59a91781aaa25a84b82df47 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 04 十二月 2023 17:00:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue | 22 +++++++++-------------
1 files changed, 9 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 4e3101f..2896334 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigDialog.vue
@@ -24,7 +24,6 @@
components: {referConfigFormDialog, referConfigCrudDialog},
data() {
return {
-
};
},
watch:{
@@ -34,26 +33,24 @@
}else{
this.openTipsChooseOrCust();
}
- }
+
+ },
},
methods: {
- echoReferConfig(value) {
- this.emitData = value;
- },
// 褰撳墠宸插瓨鍦ㄧ紪杈戣繃鐨勫弬鐓ч厤缃紝鎵�浠ョ洿鎺ユ墦寮�鍙傜収閰嶇疆鐣岄潰
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)
}
@@ -87,11 +84,10 @@
echoReferConfig(content){
this.$emit('setReferConfigValue', content) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
},
-
},
}
</script>
<style>
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3