From ac7c4b4c9f2a56137431e9befa900ca792045bdb Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 11 七月 2023 18:11:40 +0800
Subject: [PATCH] 主数据 主题库 租户管理bug修复

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   71 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 45f318e..98665ec 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,6 +14,7 @@
       :type="type"
       :rowOid="rowOid"
       :templateOid="templateOid"
+      v-if="dialogVisible"
       ref="FormTemplate"
       @getFormData="getFormData"
     ></FormTemplate>
@@ -114,6 +115,10 @@
       type: String,
       default: "纭� 瀹�",
     },
+    setForm: {
+      type: Object,
+      default: () => ({}),
+    },
   },
   data() {
     return {
@@ -191,6 +196,7 @@
         "copyfromversion",
         "secretgrade",
       ],
+      codeRuleOid: ''
     };
   },
   created() {},
@@ -230,10 +236,18 @@
             if (this.hasResemble) {
               this.activeName = "resembleQuery";
               this.showResembleQuery = true;
+            } else {
+              this.showResembleQuery = false
             }
+            console.log(this.hasResemble, 'this.hasResemblethis.hasResemble');
             this.$nextTick(() => {
-              this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
-            })
+              this.$refs.FormTemplate.templateRender(
+                res.data.formDefineVO.items
+              );
+              if (Object.keys(this.setForm).length > 0) {
+                this.$refs.FormTemplate.form = this.setForm;
+              }
+            });
           }
         })
         .catch(() => {
@@ -244,6 +258,7 @@
     getCodeRule() {
       getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
         if (res.data && res.data.code === 200) {
+          this.codeRuleOid = res.data.data.oid
           const typeList = [
             "codefixedsec",
             "codeclassifysec",
@@ -253,15 +268,15 @@
           this.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
           );
-            if (this.secVOList.length > 0 && this.type === "add") {
-              this.showCodeApply = true;
-              this.activeName = "codeApply";
-              this.$nextTick(() => {
-                this.$refs.CodeApply.templateRender(this.secVOList);
-              })
-            } else {
-              this.showCodeApply = false;
-            }
+          if (this.secVOList.length > 0 && this.type === "add") {
+            this.showCodeApply = true;
+            this.activeName = "codeApply";
+            this.$nextTick(() => {
+              this.$refs.CodeApply.templateRender(this.secVOList);
+            });
+          } else {
+            this.showCodeApply = false;
+          }
         }
       });
     },
@@ -300,13 +315,18 @@
       // 杩涜鐮佸�肩敵璇锋牎楠�
       if (this.showCodeApply) {
         codeValidate = await this.$refs.CodeApply.validate();
-        console.log(9999);
-        if (!codeValidate) return;
+        if (!codeValidate) {
+          this.activeName = "codeApply";
+          return false;
+        }
       }
-      // 杩涜鐩镐技椤规煡璇�
-      const resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+      let resembleQueryList = []
+      if (this.$refs.resembleQueryRef) {
+        // 杩涜鐩镐技椤规煡璇�
+      resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
         this.form
       );
+      }
       if (resembleQueryList.length === 0) {
         let resForm = {};
         const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
@@ -319,10 +339,13 @@
           if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
             const value = this.codeApplyForm[key];
             if (value) {
-              resForm.secDTOList.push({ [key]: value });
+              resForm.secDTOList.push({ secOid: key, secValue: value });
             }
           }
         }
+        resForm.codeClassifyOid = this.codeClassifyOid;
+        resForm.codeRuleOid = this.codeRuleOid;
+        resForm.templateOid = this.templateOid;
         this.$emit("submit", resForm);
       } else {
         this.$confirm(
@@ -335,7 +358,21 @@
           }
         )
           .then(() => {
-            this.$emit("submit", this.form);
+            let resForm = {};
+            const { defaultValue, formValue } =
+              this.getDefaultValueAndFormValues(this.form);
+            resForm.data = formValue;
+            resForm = Object.assign({}, resForm, defaultValue);
+            resForm.secDTOList = this.secVOList.map(item => {
+              return {
+                secOid: item.oid,
+                secValue: this.codeApplyForm[item.oid],
+              }
+            });
+            resForm.codeClassifyOid = this.codeClassifyOid;
+            resForm.codeRuleOid = this.codeRuleOid;
+            resForm.templateOid = this.templateOid;
+            this.$emit("submit", resForm);
           })
           .catch(() => {});
       }

--
Gitblit v1.9.3