From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue | 82 ++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 894b3c0..fb1e119 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -1,7 +1,14 @@
<template>
<div>
- <el-table :data="tableData" v-loading="loading" height="250" :border="true">
+ <el-table
+ :data="tableData"
+ v-loading="loading"
+ height="250"
+ :border="true"
+ size="small"
+ >
<el-table-column
+ v-if="column.length > 0"
type="index"
width="60"
label="搴忓彿"
@@ -25,13 +32,15 @@
</template>
</el-table-column>
</el-table>
- <FormTemplate
- ref="FormTemplate"
+ <FormTemplateDialog
+ ref="FormTemplateDialog"
type="detail"
:visible.sync="formTemplateVisible"
- :templateOid="this.resembleTemplateOid"
+ :templateOid="resembleTemplateOid"
+ :rowOid="rowOid"
+ title="鏌ョ湅璇︾粏淇℃伅"
:codeClassifyOid="this.resembleCodeClassifyOid"
- ></FormTemplate>
+ ></FormTemplateDialog>
</div>
</template>
@@ -40,6 +49,7 @@
export default {
name: "ResembleQuery",
+ components: { FormTemplateDialog: () => import('./index.vue') },
props: {
column: {
type: Array,
@@ -53,32 +63,24 @@
type: String,
default: "",
},
- hasResemble: {
- type: Boolean,
- default: false,
+ codeRuleOid: {
+ type: String,
+ default: "",
},
type: {
type: String,
default: "add",
- },
- form: {
- type: Object,
- default: () => ({}),
- },
- codeRuleOid: {
- type: String,
- default: ''
}
},
data() {
return {
- tableVisible: true,
formTemplateVisible: false,
activeName: "findlike",
tableData: [],
loading: false,
- resembleTemplateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
- resembleCodeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ resembleTemplateOid: "",
+ resembleCodeClassifyOid: "",
+ rowOid: '',
defaultValue: {},
secVOList: [],
defaultKeys: [
@@ -116,29 +118,13 @@
formItems: [],
};
},
- created() {
- this.getCodeRule();
- },
- computed: {
- showCodeOrder() {
- if (this.type === "add") {
- if (this.secVOList.length == 0 && this.hasResemble) {
- return false;
- }
- } else {
- if (this.hasResemble) {
- return false;
- }
- }
- return true;
- },
- },
methods: {
// 鐩镐技椤规煡璇�
- resembleQuery(form) {
+ async resembleQuery(form) {
this.loading = true;
this.activeName = "findlike";
- const { defaultValue, formValue } = this.getDefaultValueAndFormValues(form);
+ const { defaultValue, formValue } =
+ this.getDefaultValueAndFormValues(form);
let params = {
codeClassifyOid: this.codeClassifyOid,
codeRuleOid: this.codeRuleOid,
@@ -146,18 +132,15 @@
data: formValue,
};
params = Object.assign(params, defaultValue);
- this.tableVisible = true;
- findLike(params).then((res) => {
- this.loading = false;
- this.tableData = res.data.data || [];
- });
+ this.tableData = (await findLike(params)).data.data || []
+ this.loading = false
+ return this.tableData
},
-
+
openFormTemlpate(row) {
- this.$nextTick(() => {
- console.log(this.$refs.FormTemplate);
- });
- this.codetemplateoid = row.codetemplateoid;
+ this.resembleTemplateOid = row.codetemplateoid
+ this.resembleCodeClassifyOid = row.codeClassifyOid
+ this.rowOid = row.oid
this.formTemplateVisible = true;
},
getDefaultValueAndFormValues(form) {
@@ -179,6 +162,5 @@
};
},
},
-
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3