From d9522d959e8e31ca48e30aa23d4fe8c7d1992b6b Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 19 六月 2023 15:41:38 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 2166a83..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,9 @@
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.formIndex++;
- this.loading = false;
+ if (this.type === 'add' || this.type === 'preview') {
+ this.loading = false;
+ }
this.geDictData(dictKeys);
this.getFormDetail();
},
@@ -643,21 +648,16 @@
return val;
}
},
- changeFun(displayExtension, prop) {
- // executeCode({displayExtension, data: this.form}).then(res => {
- // this.form[prop] = res.data.data
- // })
- },
// 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
getDataList(type, dicData) {
if (type === "truefalse") {
return [
{
- key: false,
+ key: 'false',
value: "鍚�",
},
{
- key: true,
+ key: 'true',
value: "鏄�",
},
];
@@ -701,11 +701,11 @@
},
// 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
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.obj)
- console.log(res, "res");
+ this.form = Object.assign(this.form, res.data.data[0])
+ this.loading = false;
}
);
},
--
Gitblit v1.9.3