From 09fff7d4449fe9fe9e8cd1ffca560ff57e22ed5a Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 06 六月 2023 17:52:34 +0800
Subject: [PATCH] 解决代码冲突
---
Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 3aaf6fe..b5c685d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -37,6 +37,7 @@
type="detail"
:visible.sync="formTemplateVisible"
:templateOid="this.resembleTemplateOid"
+ :rowOid="rowOid"
:codeClassifyOid="this.resembleCodeClassifyOid"
></FormTemplateDialog>
</div>
@@ -44,11 +45,10 @@
<script>
import { findLike } from "@/api/formTemplate.js";
-import FormTemplateDialog from "./index.vue";
export default {
name: "ResembleQuery",
- components: { FormTemplateDialog },
+ components: { FormTemplateDialog: () => import('./index.vue') },
props: {
column: {
type: Array,
@@ -79,10 +79,13 @@
return {
formTemplateVisible: false,
activeName: "findlike",
- tableData: [],
+ tableData: [
+ {id: '*****', materialclassifyText: '001', tuhao: 'tuhao', iod: '123123131312'}
+ ],
loading: false,
resembleTemplateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
resembleCodeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ rowOid: '',
defaultValue: {},
secVOList: [],
defaultKeys: [
@@ -136,12 +139,15 @@
params = Object.assign(params, defaultValue);
findLike(params).then((res) => {
this.loading = false;
- this.tableData = res.data.data || [];
+ // this.tableData = res.data.data || [];
});
},
openFormTemlpate(row) {
+ this.$forceUpdate()
+ console.log(row, 'row.oid');
this.codetemplateoid = row.codetemplateoid;
+ this.rowOid = row.oid
this.formTemplateVisible = true;
},
getDefaultValueAndFormValues(form) {
--
Gitblit v1.9.3