From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   48 +++++++++++++++++++++++++++++-------------------
 1 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 23edc8f..d04ed50 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -19,10 +19,14 @@
       @getFormData="getFormData"
     ></FormTempalte>
 
-    <div class="tab_box" v-if="type !== 'detail' && dialogVisible">
-      <el-tabs v-model="activeName" type="card">
+    <div class="tab_box" v-if="type !== 'detail' && dialogVisible && (showCodeApply || showResembleQuery)">
+      <el-tabs v-model="activeName" type="border-card">
         <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
-          <CodeApply ref="CodeApply" v-bind="$attrs" @getCodeRuleOid="getCodeRuleOid"></CodeApply>
+          <CodeApply
+            ref="CodeApply"
+            v-bind="$attrs"
+            @getCodeRuleOid="getCodeRuleOid"
+          ></CodeApply>
         </el-tab-pane>
         <el-tab-pane
           label="鐩镐技椤规煡璇�"
@@ -35,17 +39,16 @@
             :hasResemble="this.hasResemble"
             :column="this.resembleTableColumn"
             :form="this.form"
-            :codeRuleOid="codeRuleOid"
           ></ResembleQuery>
         </el-tab-pane>
       </el-tabs>
     </div>
     <div class="avue-dialog__footer" v-if="type !== 'detail'">
       <el-button @click="close()">鍙� 娑�</el-button>
-      <el-button @click="close()" type="primary" :loading="submitBtnLoading"
+      <el-button @click="submit()" type="primary" :loading="submitBtnLoading"
         >纭� 瀹�</el-button
       >
-      <el-button @click="resembleQuerySubmit" type="primary" v-if="hasResemble"
+      <el-button @click="resembleQuerySubmit" type="primary" v-if="showResembleQuery"
         >鐩镐技鍍忔煡璇�</el-button
       >
     </div>
@@ -70,7 +73,7 @@
     },
     title: {
       type: String,
-      default: "琛ㄥ崟妯℃澘",
+      default: "缂栫爜鐢宠",
     },
     width: {
       type: String,
@@ -84,9 +87,7 @@
       hasResemble: false,
       resembleTableColumn: [],
       secVOList: [],
-      activeName: "resembleQuery",
-      codeRuleOid: '',
-      form: {}
+      form: {},
     };
   },
   created() {},
@@ -105,29 +106,31 @@
           return false;
         }
       } else {
-        if (this.hasResemble) {
-          return false;
-        }
+        return false;
       }
       return true;
     },
     showResembleQuery() {
       return this.hasResemble;
     },
+    activeName() {
+      return (
+        (this.showCodeApply && "codeApply") ||
+        (this.showResembleQuery && "resembleQuery")
+      );
+    },
   },
   methods: {
     openDialog() {
       this.$nextTick(() => {
-        this.$refs.FormTempalte.init()
-        this.$refs.CodeApply.getCodeRule()
-      })
+        this.$refs.FormTempalte.init();
+      });
     },
     close() {
       this.dialogVisible = false;
     },
     getCodeRuleOid(data) {
-      this.codeRuleOid = data.oid
-      this.secVOList = data.secVOList
+      this.secVOList = data.secVOList;
     },
     getFormTemplate(data) {
       this.hasResemble =
@@ -137,11 +140,18 @@
       this.resembleTableColumn = data.resembleTableVO.cols || [];
     },
     getFormData(form) {
-      this.form = form
+      this.form = form;
     },
     resembleQuerySubmit() {
       this.$refs.resembleQueryRef.resembleQuery(this.form);
     },
+    async submit() {
+      const formValidate = await this.$refs.FormTempalte.validate();
+      if (this.showCodeApply) {
+        const codeValidate = this.$refs.CodeApply.validate();
+        console.log(formValidate, codeValidate);
+      }
+    },
   },
 };
 </script>

--
Gitblit v1.10.0