From 45d6fb0c9846c1a8f55958ed8fc00ed909470610 Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 26 六月 2023 11:25:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 19297f2..0733ce0 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -8,6 +8,7 @@
v-loading="loading"
ref="form"
:style="{ minHeight: loading ? '300px' : '' }"
+ :key="updateIndex"
>
<template :slot="item.prop + 'Label'" v-for="item in slotColumnList">
<span>
@@ -26,8 +27,12 @@
<template :slot="item.prop + ''" v-for="item in slotColumnList">
<vciWebRefer
v-if="item.type == 'refer'"
- :value="item.value"
- :options="item.referConfig || {}"
+ :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>
</avue-form>
@@ -78,7 +83,7 @@
},
data() {
return {
- formIndex: 0,
+ updateIndex: 0,
form: {},
option: {
emptyBtn: false,
@@ -513,6 +518,7 @@
collapse: true,
column: [],
});
+ return;
}
if (
formItem.type === "combox" &&
@@ -555,7 +561,16 @@
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
- referConfig: formItem.referConfig,
+ referConfig:
+ formItem.type == "refer"
+ ? {
+ title: formItem.text,
+ showField: formItem.showField || formItem.field,
+ field: formItem.field,
+ placeholder: formItem.inputTip,
+ options: formItem.referConfig,
+ }
+ : {},
span: formItem.type === "textarea" ? 24 : this.trendsSpan,
rules: [
{
@@ -585,8 +600,10 @@
this.slotColumnList = slotColumnList;
this.$set(this.option, "column", column);
this.$set(this.option, "group", group);
- this.formIndex++;
- this.loading = false;
+ this.updateIndex++;
+ if (this.type === "add") {
+ this.loading = false;
+ }
this.geDictData(dictKeys);
this.getFormDetail();
},
@@ -625,7 +642,7 @@
handleResize() {
let windowWidth = document.body.clientWidth;
this.trendsSpan = 24 / Math.floor(windowWidth / 500);
- this.formIndex++;
+ this.updateIndex++;
},
// 鍓嶅悗缂�
preOrSufFixShow(type, val) {
@@ -676,8 +693,7 @@
// 琛ㄥ崟鏍￠獙
validate() {
return new Promise((resolve) => {
- this.$refs.form.validate((valid, done, msg) => {
- console.error(msg, valid);
+ this.$refs.form.validate((valid, done) => {
if (valid) {
done();
resolve(true);
@@ -689,15 +705,22 @@
},
// 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
getFormDetail() {
- if (this.type === 'add') return
if (this.type === "add") return;
- getFormDetail({ templateOid: this.templateOid, oid: '213D13D5-76D3-6B42-0932-705693F6B6E4' }).then(
+ 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;
}
);
},
+ setReferValue(data) {
+ if (data.field) {
+ this.form[data.field] = data.value || "";
+ this.form[data.showField] = data.text || "";
+ this.$emit("getFormData", this.form);
+ this.$emit("referConfigDataUpdate", data);
+ }
+ },
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
--
Gitblit v1.9.3