From f049f0aa547252a76e9523dbf3a236803e7e4f1b Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 20 六月 2023 10:54:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index a19ce27..d8893cf 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,7 +1,10 @@
<template>
- <vciWebReferTree v-if="refertype=='tree'" @setValue="setValue" :value="value" :text="text" :title="title" :referConfig="referConfig"></vciWebReferTree>
- <vciWebReferTable v-else-if="refertype=='table'" @setValue="setValue" :value="value" :text="text" :title="title" :referConfig="referConfig"></vciWebReferTable>
- <vciWebReferDefalut v-else @setValue="setValue" :value="value" :text="text" :title="title" :referConfig="referConfig"></vciWebReferDefalut>
+ <div v-if="display">
+ <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>
+
+ </div>
</template>
<script>
@@ -10,7 +13,7 @@
import vciWebReferDefalut from "./vciWebReferDefalut.vue";
export default {
name: "vciWebRefer",
- props: ["referConfig","value","text"],
+ props: ["referConfig","value","text","disabled","display"],
components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
data() {
return {
@@ -24,7 +27,6 @@
var title = this.referConfig.title || '';
title = title.replace(":", "");
title = title ? ('涓恒��' + title + '銆戦�夊彇鍊�') : ('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�');
-
this.title=title;
},
methods: {
@@ -38,9 +40,6 @@
deep: true,
immediate: true,
handler(newV) {
- if(newV.isTreeMuti){
- //鏍戝弬鐓у閫夛紝text娌℃湁鍊硷紝鍦ㄨ繖閲屽鐞唗ext鐨勫��
- }
this.$emit("setReferValue", newV);
},
}
--
Gitblit v1.9.3