From f41d9021794b8e1e7b1fdfa0e0a53502297fa20c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 20 七月 2023 11:54:10 +0800
Subject: [PATCH] 主数据查询 主题库组合规则字符串

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |  118 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 5db4a8a..e41a812 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,7 +3,8 @@
     :visible.sync="dialogVisible"
     v-if="dialogVisible"
     v-dialogDrag
-    top="5vh"
+    top="-5vh"
+    class="avue-dialog avue-dialog--top"
     :title="title"
     :width="width"
     append-to-body
@@ -196,7 +197,7 @@
         "copyfromversion",
         "secretgrade",
       ],
-      codeRuleOid: ''
+      codeRuleOid: "",
     };
   },
   created() {},
@@ -236,7 +237,10 @@
             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
@@ -255,7 +259,7 @@
     getCodeRule() {
       getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
         if (res.data && res.data.code === 200) {
-          this.codeRuleOid = res.data.data.oid
+          this.codeRuleOid = res.data.data.oid;
           const typeList = [
             "codefixedsec",
             "codeclassifysec",
@@ -310,39 +314,22 @@
       if (!formValidate) return;
       let codeValidate = true;
       // 杩涜鐮佸�肩敵璇锋牎楠�
-      if (this.showCodeApply) {
-        codeValidate = await this.$refs.CodeApply.validate();
-        if (!codeValidate) {
-          this.activeName = "codeApply";
-          return false;
-        }
-      }
-      // 杩涜鐩镐技椤规煡璇�
-      const resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
-        this.form
-      );
-      if (resembleQueryList.length === 0) {
-        let resForm = {};
-        const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+      // if (this.showCodeApply) {
+      //   codeValidate = await this.$refs.CodeApply.validate();
+      //   if (!codeValidate) {
+      //     this.activeName = "codeApply";
+      //     return false;
+      //   }
+      // }
+      let resembleQueryList = [];
+      if (this.$refs.resembleQueryRef) {
+        // 杩涜鐩镐技椤规煡璇�
+        resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
           this.form
         );
-        resForm.data = formValue;
-        resForm = Object.assign({}, resForm, defaultValue);
-        resForm.secDTOList = [];
-        for (const key in this.codeApplyForm) {
-          if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
-            const value = this.codeApplyForm[key];
-            if (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(
+      }
+      if (resembleQueryList.length > 0) {
+        await this.$confirm(
           `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
           "闇�瑕佹偍纭",
           {
@@ -350,26 +337,51 @@
             cancelButtonText: "鍙栨秷",
             type: "warning",
           }
-        )
-          .then(() => {
-            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(() => {});
+        );
       }
+      // 鎺掗櫎涓�浜涘瓧娈�
+      const noData = [
+        "jiliangdwname",
+        "materialtypeText",
+        "morengongysname",
+        "$caigouwl",
+        "$xiaoshouwl",
+        "$shifoupihaoguanli",
+        "lcstatus_text",
+        "hesuanfenleiname",
+        "$kucunwl",
+        "oldcode",
+        "lastmodifier"
+      ];
+      let resForm = {};
+      const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+        this.form
+      );
+      noData.forEach((item) => {
+        this.$delete(formValue, item);
+      });
+      const keys = Object.keys(formValue);
+      debugger
+      keys.forEach((item, index) => {
+        keys.forEach((itm, idx) => {
+          if ((item === ('$' + itm)) && idx !== index) {
+            this.$delete(formValue, keys[index]);
+          }
+        })
+      });
+
+      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);
     },
     getDefaultValueAndFormValues(form) {
       let defaultValue = {};

--
Gitblit v1.9.3