From 729db9dd93f8884a8f1f0b32a4462708f858ea9b Mon Sep 17 00:00:00 2001 From: ludc Date: 星期二, 13 六月 2023 20:05:53 +0800 Subject: [PATCH] 代码整合 --- Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 73 +++++++++++++----------------------- 1 files changed, 27 insertions(+), 46 deletions(-) diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue index 18b9d68..37c5899 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue @@ -26,8 +26,10 @@ <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]" + @setReferValue="setReferValue" ></vciWebRefer> </template> </avue-form> @@ -35,7 +37,7 @@ </template> <script> -import { getFormTemplate, getFormDetail } from "@/api/formTemplate"; +import { getFormDetail } from "@/api/formTemplate"; import { getDictionary } from "../../api/system/dict"; import vciWebRefer from "../refer/vciWebRefer.vue"; export default { @@ -497,33 +499,6 @@ this.handleResize(); }, methods: { - // 鍒濆鍖� - init(columnList) { - if (Array.isArray(columnList)) { - this.templateRender(columnList); - } else { - this.getFormTemplate(); - } - }, - // 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁 - getFormTemplate() { - getFormTemplate({ - templateOid: this.templateOid, - codeClassifyOid: this.codeClassifyOid, - }) - .then((res) => { - if (res.status === 200) { - this.templateRender(this.testItems); - // 娴嬭瘯鏁版嵁灞曠ず - // this.templateRender(res.data.formDefineVO.items); - this.$emit("getFormTemplateEnd", res.data); - } - }) - .catch((err) => { - this.loading = false; - console.log(err); - }); - }, // 娓叉煋琛ㄥ崟妯℃澘 templateRender(formItemList) { // 鏃犻渶鍒嗙粍鏁版嵁 @@ -582,10 +557,13 @@ display: !formItem.hidden, maxlength: formItem.maxlength, filterable: true, - referConfig: formItem.referConfig, - change: () => { - this.changeFun(formItem.displayExtension, formItem.prop); - }, + 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: [ { @@ -616,10 +594,11 @@ 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(); + this.getFormDetail(); }, // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃� resetFormConfig(formItem) { @@ -666,11 +645,6 @@ 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") { @@ -712,8 +686,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); @@ -725,13 +698,21 @@ }, // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁 getFormDetail() { - if (this.type === "add") return; + if (this.type === 'add') return getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then( (res) => { - 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); + } + } }, watch: { // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢 -- Gitblit v1.9.3