From 298884aa668c7509ccd007ef4329aa0f242438f4 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 06 六月 2023 18:06:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 70 ++++++++++------------------------
1 files changed, 21 insertions(+), 49 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 9f4450d..396fd4d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -34,7 +34,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 +196,7 @@
tooltips: "璇疯緭鍏ユ暟瀛�",
type: "text",
unique: false,
- verify: "/[0-9]/",
+ verify: /^[0-9]+$/g,
},
{
comboxKey: null,
@@ -496,31 +496,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 +549,6 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: formItem.defaultValue,
- // tip: formItem.tooltips,
- // tipPlacement: "right",
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
display: !formItem.hidden,
@@ -625,7 +598,7 @@
this.formIndex++;
this.loading = false;
this.geDictData(dictKeys);
- this.getFormDetail()
+ this.getFormDetail();
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
@@ -672,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") {
@@ -716,26 +684,30 @@
});
},
// 琛ㄥ崟鏍￠獙
- 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");
+ }
+ );
+ },
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
--
Gitblit v1.9.3