From d419a8944981bc3235392a57c84d241e6c47335a Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 19 六月 2023 16:33:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index c8e5b43..42912d0 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -29,6 +29,8 @@
:referConfig="item.referConfig || {}"
:value="form[item.referConfig.field] || item.value"
:text="form[item.referConfig.showField]"
+ :disabled="item.disabled"
+ :display="item.display"
@setReferValue="setReferValue"
></vciWebRefer>
</template>
@@ -515,6 +517,7 @@
collapse: true,
column: [],
});
+ return
}
if (
formItem.type === "combox" &&
@@ -558,7 +561,7 @@
maxlength: formItem.maxlength,
filterable: true,
referConfig:formItem.type=='refer'?{
- title:formItem.text,
+ title:formItem.text ,
showField:formItem.showField || formItem.field,
field: formItem.field,
placeholder: formItem.inputTip,
@@ -594,7 +597,7 @@
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.formIndex++;
- if (this.type === 'add') {
+ if (this.type === 'add' || this.type === 'preview') {
this.loading = false;
}
this.geDictData(dictKeys);
@@ -650,11 +653,11 @@
if (type === "truefalse") {
return [
{
- key: false,
+ key: 'false',
value: "鍚�",
},
{
- key: true,
+ key: 'true',
value: "鏄�",
},
];
@@ -698,7 +701,7 @@
},
// 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
getFormDetail() {
- if (this.type === 'add') return
+ if (this.type === 'add' || this.type === 'preview') return
getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
(res) => {
this.form = Object.assign(this.form, res.data.data[0])
--
Gitblit v1.9.3