From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index b5c685d..fb1e119 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -36,8 +36,9 @@
ref="FormTemplateDialog"
type="detail"
:visible.sync="formTemplateVisible"
- :templateOid="this.resembleTemplateOid"
+ :templateOid="resembleTemplateOid"
:rowOid="rowOid"
+ title="鏌ョ湅璇︾粏淇℃伅"
:codeClassifyOid="this.resembleCodeClassifyOid"
></FormTemplateDialog>
</div>
@@ -69,22 +70,16 @@
type: {
type: String,
default: "add",
- },
- form: {
- type: Object,
- default: () => ({}),
- },
+ }
},
data() {
return {
formTemplateVisible: false,
activeName: "findlike",
- tableData: [
- {id: '*****', materialclassifyText: '001', tuhao: 'tuhao', iod: '123123131312'}
- ],
+ tableData: [],
loading: false,
- resembleTemplateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
- resembleCodeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ resembleTemplateOid: "",
+ resembleCodeClassifyOid: "",
rowOid: '',
defaultValue: {},
secVOList: [],
@@ -125,7 +120,7 @@
},
methods: {
// 鐩镐技椤规煡璇�
- resembleQuery(form) {
+ async resembleQuery(form) {
this.loading = true;
this.activeName = "findlike";
const { defaultValue, formValue } =
@@ -137,16 +132,14 @@
data: formValue,
};
params = Object.assign(params, defaultValue);
- 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.$forceUpdate()
- console.log(row, 'row.oid');
- this.codetemplateoid = row.codetemplateoid;
+ this.resembleTemplateOid = row.codetemplateoid
+ this.resembleCodeClassifyOid = row.codeClassifyOid
this.rowOid = row.oid
this.formTemplateVisible = true;
},
--
Gitblit v1.9.3