From 9ca73b463e490867e52182748d86c2a1a46e454d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 29 二月 2024 15:00:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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