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 | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 894b3c0..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="搴忓彿"
@@ -25,21 +32,23 @@
</template>
</el-table-column>
</el-table>
- <FormTemplate
- ref="FormTemplate"
+ <FormTemplateDialog
+ ref="FormTemplateDialog"
type="detail"
:visible.sync="formTemplateVisible"
:templateOid="this.resembleTemplateOid"
:codeClassifyOid="this.resembleCodeClassifyOid"
- ></FormTemplate>
+ ></FormTemplateDialog>
</div>
</template>
<script>
import { findLike } from "@/api/formTemplate.js";
+import FormTemplateDialog from "./index.vue";
export default {
name: "ResembleQuery",
+ components: { FormTemplateDialog },
props: {
column: {
type: Array,
@@ -53,9 +62,9 @@
type: String,
default: "",
},
- hasResemble: {
- type: Boolean,
- default: false,
+ codeRuleOid: {
+ type: String,
+ default: "",
},
type: {
type: String,
@@ -65,14 +74,9 @@
type: Object,
default: () => ({}),
},
- codeRuleOid: {
- type: String,
- default: ''
- }
},
data() {
return {
- tableVisible: true,
formTemplateVisible: false,
activeName: "findlike",
tableData: [],
@@ -116,29 +120,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) {
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,17 +134,13 @@
data: formValue,
};
params = Object.assign(params, defaultValue);
- this.tableVisible = true;
findLike(params).then((res) => {
this.loading = false;
this.tableData = res.data.data || [];
});
},
-
+
openFormTemlpate(row) {
- this.$nextTick(() => {
- console.log(this.$refs.FormTemplate);
- });
this.codetemplateoid = row.codetemplateoid;
this.formTemplateVisible = true;
},
@@ -179,6 +163,5 @@
};
},
},
-
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.10.0