From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突
---
Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 86dce48..3aaf6fe 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="搴忓彿"
@@ -55,6 +62,10 @@
type: String,
default: "",
},
+ codeRuleOid: {
+ type: String,
+ default: "",
+ },
type: {
type: String,
default: "add",
@@ -63,14 +74,9 @@
type: Object,
default: () => ({}),
},
- codeRuleOid: {
- type: String,
- default: "",
- },
},
data() {
return {
- tableVisible: true,
formTemplateVisible: false,
activeName: "findlike",
tableData: [],
@@ -114,8 +120,6 @@
formItems: [],
};
},
- created() {},
- computed: {},
methods: {
// 鐩镐技椤规煡璇�
resembleQuery(form) {
@@ -127,10 +131,9 @@
codeClassifyOid: this.codeClassifyOid,
codeRuleOid: this.codeRuleOid,
templateOid: this.templateOid,
- data: formValue
+ data: formValue,
};
params = Object.assign(params, defaultValue);
- this.tableVisible = true;
findLike(params).then((res) => {
this.loading = false;
this.tableData = res.data.data || [];
--
Gitblit v1.10.0