From cacfc13988369633b43e1f8fc3d233ef13ae7047 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 九月 2023 08:56:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 893ef94..19f4edc 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,6 +1,6 @@
<template>
<div v-if="display">
- <vciWebReferTree v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTree>
+ <vciWebReferTree ref="vciWebReferTree" v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTree>
<vciWebReferTable v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferTable>
<vciWebReferDefalut v-else @setValue="setValue" :value="value" :text="text" :title="title" :disabled="disabled" :referConfig="referConfig"></vciWebReferDefalut>
@@ -19,7 +19,9 @@
return {
refertype: this.referConfig.options.type,
emitData:{},
- title:''
+ title:'',
+ display:this.display || true,
+ disabled:this.disabled || false
};
},
created() {
@@ -30,7 +32,6 @@
}
},
mounted() {
- //console.log(this.referConfig.options);
var title = this.referConfig.title || '';
title = title.replace(":", "");
title = title ? ('涓恒��' + title + '銆戦�夊彇鍊�') : ('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�');
@@ -47,8 +48,10 @@
deep: true,
immediate: true,
handler(newV) {
+ this.text=newV.text;
+ this.value=newV.value;
this.$emit("setReferValue", newV);
- },
+ }
}
}
}
--
Gitblit v1.10.0