From 1a3807e155537be25c5bc0440778ff1f83fe08cb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 19 六月 2023 14:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 2166a83..acb2ed6 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>
@@ -558,7 +560,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 +596,9 @@
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
this.formIndex++;
- this.loading = false;
+ if (this.type === 'add') {
+ this.loading = false;
+ }
this.geDictData(dictKeys);
this.getFormDetail();
},
@@ -642,11 +646,6 @@
if ((type === "text" && !isIcon) || (type === "icon" && isIcon)) {
return val;
}
- },
- changeFun(displayExtension, prop) {
- // executeCode({displayExtension, data: this.form}).then(res => {
- // this.form[prop] = res.data.data
- // })
},
// 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
getDataList(type, dicData) {
@@ -704,8 +703,8 @@
if (this.type === 'add') 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