From df81835dd02eee62527997adf5a4ea2039b51fa4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 12:14:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/refer/vciWebRefer.vue |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 7aab2aa..66eebd6 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,8 +1,40 @@
 <template>
   <div v-if="display">
-    <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>
+    <vciWebReferTree
+      v-if="refertype=='tree'"
+      :key="key" ref="vciWebReferTree"
+      :data-key="key"
+      :disabled="disabled"
+      :referConfig="referConfig"
+      :text="text"
+      :title="title"
+      :value="value"
+      @setValue="setValue">
+    </vciWebReferTree>
+
+    <vciWebReferTable
+      v-else-if="refertype=='table'"
+      :key="key" :data-key="key"
+      :disabled="disabled"
+      :referConfig="referConfig"
+      :referType="referType"
+      :text="text"
+      :title="title"
+      :value="value"
+      @setValue="setValue">
+    </vciWebReferTable>
+
+    <vciWebReferDefalut
+      v-else
+      :key="key"
+      :data-key="key"
+      :disabled="disabled"
+      :referConfig="referConfig"
+      :referType="referType"
+      :text="text" :title="title"
+      :value="value"
+      @setValue="setValue">
+    </vciWebReferDefalut>
 
   </div>
 </template>
@@ -11,25 +43,25 @@
 import vciWebReferTree from "./vciWebReferTree.vue";
 import vciWebReferTable from "./vciWebReferTable.vue";
 import vciWebReferDefalut from "./vciWebReferDefalut.vue";
+
 export default {
   name: "vciWebRefer",
-  props: ["referConfig","value","text","disabled","display"],
+  props: ["referConfig", "value", "text", "disabled", "display", 'key', 'referType'],
   components: {vciWebReferTree, vciWebReferTable, vciWebReferDefalut},
   data() {
     return {
-      reterTypeLeavl:'213',
+      reterTypeLeavl: '213',
       refertype: this.referConfig.options.type,
-      emitData:{},
-      title:'',
-      display:this.display || true,
-      disabled:this.disabled || false
+      emitData: {},
+      title: '',
+      display: this.display || true,
+      disabled: this.disabled || false
     };
   },
   created() {
-    console.log('referer')
-    if (!this.referConfig.options) {
+    if (!this.referConfig.options && this.referConfig.options.isMuti == undefined) {
       this.referConfig.options = {
-        isMuti: false
+        isMuti: this.referConfig.options.muti || false
       }
     }
   },
@@ -37,21 +69,21 @@
     var title = this.referConfig.title || '';
     title = title.replace(":", "");
     title = title ? ('涓恒��' + title + '銆戦�夊彇鍊�') : ('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�');
-    this.title=title;
+    this.title = title;
   },
   methods: {
     setValue(value) {
       this.emitData = value;
     }
   },
-  watch:{
+  watch: {
     // 淇敼鍙嶉鍒扮埗缁勪欢
     emitData: {
       deep: true,
       immediate: true,
       handler(newV) {
-        this.text=newV.text;
-        this.value=newV.value;
+        this.text = newV.text;
+        this.value = newV.value;
         this.$emit("setReferValue", newV);
       }
     },

--
Gitblit v1.9.3