From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。

---
 Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue |   45 ++++++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue
index 9741d14..b97f223 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQueryDialog.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { getFormTemplate } from "@/api/formTemplate";
+import { getFormTemplate, getFormDetail } from "@/api/formTemplate";
 import ResembleQuery from "./ResembleQuery";
 export default {
   name: "ResembleQueryDialog",
@@ -40,6 +40,7 @@
       type: String,
       default: "",
     },
+    rowOid: "",
     codeRuleOid: {
       type: String,
       default: "",
@@ -56,7 +57,8 @@
   data() {
     return {
       column: [],
-      loading: false
+      loading: false,
+      detailData: {},
     };
   },
   computed: {
@@ -71,23 +73,28 @@
   },
   methods: {
     openDialog() {
-      this.loading = true
-      getFormTemplate({
-        templateOid: this.templateOid,
-        codeClassifyOid: this.codeClassifyOid,
-      }).then((res) => {
-        this.loading = false
-        if (
-          res.data &&
-          res.data.resembleTableVO.cols &&
-          res.data.resembleTableVO.cols.length > 0
-        ) {
-          this.column = res.data.resembleTableVO.cols;
-          this.$refs.ResembleQuery.resembleQuery();
-        } else {
-          this.column = [];
-        }
-      });
+      this.loading = true;
+      getFormDetail({ templateOid: this.templateOid, oid: this.rowOid })
+        .then((res) => {
+          this.detailData = res.data.data[0] || {};
+          return getFormTemplate({
+            templateOid: this.templateOid,
+            codeClassifyOid: this.codeClassifyOid,
+          });
+        })
+        .then((res) => {
+          this.loading = false;
+          if (
+            res.data &&
+            res.data.resembleTableVO.cols &&
+            res.data.resembleTableVO.cols.length > 0
+          ) {
+            this.column = res.data.resembleTableVO.cols;
+            this.$refs.ResembleQuery.resembleQuery(this.detailData);
+          } else {
+            this.column = [];
+          }
+        });
     },
   },
 };

--
Gitblit v1.9.3