From 249ef0d4a5b5011927d1b73ad7e05284258ec11a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 九月 2023 11:07:58 +0800
Subject: [PATCH] 代码冲突，整合代码
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index ac2b1e4..3e341d5 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -129,7 +129,7 @@
},
created() {
- },
+ },
computed: {
localTrendsSpan() {
if (this.trendsSpan) {
@@ -166,12 +166,10 @@
if (this.eventList) {
this.eventFlag= this.eventList.some(item => {
if (item.classifyInvokeEditFlag === 'true') {
- console.log('even', item);
this.eventObject = item;
return true;
}
});
- // console.log('add',add)
}
// 鏃犻渶鍒嗙粍鏁版嵁
let column = [];
@@ -248,19 +246,19 @@
referConfig:
formItem.type == "refer"
? {
- title: formItem.text,
- showField: formItem.showField || formItem.field,
- field: formItem.field,
- fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
- placeholder: formItem.inputTip,
- options: formItem.referConfig
- }
+ title: formItem.text,
+ showField: formItem.showField || formItem.field,
+ field: formItem.field,
+ fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
+ placeholder: formItem.inputTip,
+ options: formItem.referConfig
+ }
: {},
span: formItem.span
? formItem.span
: formItem.type === "textarea"
- ? 24
- : this.localTrendsSpan,
+ ? 24
+ : this.localTrendsSpan,
rules: [
{
required: formItem.required,
@@ -279,9 +277,7 @@
value: "key",
},
};
- // console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
- // console.log('slotColumnList',slotColumnList)
if (group.length === 0) {
column.push(columnItem);
} else {
@@ -408,7 +404,7 @@
);
},
setReferValue(data) {
- // console.log(data)
+ debugger;
if (data.field) {
this.form[data.field] = data.value || "";
this.form[data.showField] = data.text || "";
--
Gitblit v1.9.3