From b9b031348b72b9997f44f790a613dcf00766fae0 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 19 六月 2023 17:53:00 +0800
Subject: [PATCH] 1、查询返回的数据类型错误。

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 407a36d..42912d0 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -27,6 +27,11 @@
         <vciWebRefer
           v-if="item.type == 'refer'"
           :referConfig="item.referConfig || {}"
+          :value="form[item.referConfig.field] || item.value"
+          :text="form[item.referConfig.showField]"
+          :disabled="item.disabled"
+          :display="item.display"
+          @setReferValue="setReferValue"
         ></vciWebRefer>
       </template>
     </avue-form>
@@ -512,6 +517,7 @@
             collapse: true,
             column: [],
           });
+          return
         }
         if (
           formItem.type === "combox" &&
@@ -555,13 +561,11 @@
           maxlength: formItem.maxlength,
           filterable: true,
           referConfig:formItem.type=='refer'?{
-            title:formItem.text,
+            title:formItem.text ,
             showField:formItem.showField || formItem.field,
             field: formItem.field,
             placeholder: formItem.inputTip,
-            options:formItem.referConfig,
-            value:'',
-            text:''
+            options:formItem.referConfig
           }:{},
           span: formItem.type === "textarea" ? 24 : this.trendsSpan,
           rules: [
@@ -593,7 +597,9 @@
       this.$set(this.option, "column", column);
       this.$set(this.option, "group", group);
       this.formIndex++;
-      this.loading = false;
+      if (this.type === 'add' || this.type === 'preview') {
+        this.loading = false;
+      }
       this.geDictData(dictKeys);
       this.getFormDetail();
     },
@@ -647,11 +653,11 @@
       if (type === "truefalse") {
         return [
           {
-            key: false,
+            key: 'false',
             value: "鍚�",
           },
           {
-            key: true,
+            key: 'true',
             value: "鏄�",
           },
         ];
@@ -683,8 +689,7 @@
     // 琛ㄥ崟鏍￠獙
     validate() {
       return new Promise((resolve) => {
-        this.$refs.form.validate((valid, done, msg) => {
-          console.error(msg, valid);
+        this.$refs.form.validate((valid, done) => {
           if (valid) {
             done();
             resolve(true);
@@ -696,14 +701,21 @@
     },
     // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
     getFormDetail() {
-      if (this.type === 'add') return
+      if (this.type === 'add' || this.type === 'preview') return
       getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
         (res) => {
-          this.form = Object.assign(this.form, res.obj)
-          console.log(res, "res");
+          this.form = Object.assign(this.form, res.data.data[0])
+          this.loading = false;
         }
       );
     },
+    setReferValue(data){
+      if(data.field){
+        this.form[data.field]=data.value || '';
+        this.form[data.showField]=data.text || '';
+        this.$emit("getFormData", this.form);
+      }
+    }
   },
   watch: {
     // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢

--
Gitblit v1.9.3