From 5c487e8208311bfd93a904bfdae2cfab0e9b2cd7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 07 六月 2023 18:10:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 77 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 9f4450d..6afac39 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -27,6 +27,9 @@
<vciWebRefer
v-if="item.type == 'refer'"
:referConfig="item.referConfig || {}"
+ :value="form[item.referConfig.field] || item.value"
+ :text="form[item.referConfig.showField]"
+ @setReferValue="setReferValue"
></vciWebRefer>
</template>
</avue-form>
@@ -34,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 {
@@ -196,7 +199,7 @@
tooltips: "璇疯緭鍏ユ暟瀛�",
type: "text",
unique: false,
- verify: "/[0-9]/",
+ verify: /^[0-9]+$/g,
},
{
comboxKey: null,
@@ -496,31 +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(res.data.formDefineVO.items);
- this.$emit("getFormTemplateEnd", res.data);
- }
- })
- .catch((err) => {
- this.loading = false;
- console.log(err);
- });
- },
// 娓叉煋琛ㄥ崟妯℃澘
templateRender(formItemList) {
// 鏃犻渶鍒嗙粍鏁版嵁
@@ -574,8 +552,6 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: formItem.defaultValue,
- // tip: formItem.tooltips,
- // tipPlacement: "right",
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
display: !formItem.hidden,
@@ -586,9 +562,7 @@
showField:formItem.showField || formItem.field,
field: formItem.field,
placeholder: formItem.inputTip,
- options:formItem.referConfig,
- value:'',
- text:''
+ options:formItem.referConfig
}:{},
change: () => {
this.changeFun(formItem.displayExtension, formItem.prop);
@@ -625,7 +599,7 @@
this.formIndex++;
this.loading = false;
this.geDictData(dictKeys);
- this.getFormDetail()
+ this.getFormDetail();
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
@@ -716,25 +690,36 @@
});
},
// 琛ㄥ崟鏍￠獙
- validate() {
+ validate() {
return new Promise((resolve) => {
this.$refs.form.validate((valid, done, msg) => {
- console.error(msg, valid)
- if (valid) {
- resolve(true)
- } else {
- resolve(false);
- }
+ console.error(msg, valid);
+ if (valid) {
+ done();
+ resolve(true);
+ } else {
+ resolve(false);
+ }
+ });
});
- })
-
},
- // 鑾峰彇琛ㄥ崟鏁版嵁
+ // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
getFormDetail() {
if (this.type === 'add') return
- getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(res => {
- console.log(res, 'res');
- })
+ if (this.type === "add") return;
+ getFormDetail({ templateOid: this.templateOid, oid: '213D13D5-76D3-6B42-0932-705693F6B6E4' }).then(
+ (res) => {
+ this.form = Object.assign(this.form, res.obj)
+ console.log(res, "res");
+ }
+ );
+ },
+ 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