From 7518dc7b954f88f546b50277419e798e65ca9dcd Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 05 六月 2023 18:20:48 +0800
Subject: [PATCH] 整合组件
---
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 45 ++--
Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue | 14 +
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 57 +++-
Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue | 427 +++++++++++++++++++++++++++++++++++++++++-
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 6
Source/UBCS-WEB/vue.config.js | 13 +
6 files changed, 504 insertions(+), 58 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
index 8b84cca..e6f1f5b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
@@ -1,7 +1,6 @@
<template>
<FormTempalte
ref="FormTempalte"
- :visible="visible"
:selfColumnType="selfColumnType"
:selfColumnConfig="selfColumnConfig"
:columnList="columnList"
@@ -10,14 +9,13 @@
<script>
import { getCodeRule } from "@/api/formTemplate.js";
-import FormTempalte from "./FormTempalte.vue";
export default {
name: "CodeApply",
- components: { FormTempalte },
+ components: { FormTempalte: () => import('./FormTempalte.vue') },
props: {
visible: {
type: Boolean,
- default: false
+ default: false,
},
codeClassifyOid: {
type: String,
@@ -59,7 +57,406 @@
},
},
},
- columnList: [],
+ columnList: [
+ {
+ btmname: "codebasicsec",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codeDateFormatStr: "",
+ codeFillFlag: "",
+ codeFillLength: "",
+ codeFillLimit: 0,
+ codeFillSeparator: "",
+ codeFillType: "",
+ codeFillTypeText: "",
+ codeGetValueType: "",
+ codeGetValueTypeText: "",
+ codeLevelType: "",
+ codeLevelTypeText: "",
+ codeLevelValue: 0,
+ codeSecLength: "10",
+ codeSecLengthType: "code_sec_length_variable",
+ codeSecLengthTypeText: "",
+ componentCodeFlag: "false",
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:23:33.000",
+ creator: "1",
+ customCodeSerialClass: "",
+ data: null,
+ description: "",
+ displayFlag: "false",
+ filterSql: "",
+ firstR: "1",
+ firstV: "1",
+ fixedValueVOList: [
+ {
+ btmname: "codefixedvalue",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codefixedsecoid: "5591ED23-D218-8B84-9789-1E5EB21A49B9",
+ codefixedsecoidName: null,
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:47:45.000",
+ creator: "1",
+ data: null,
+ description: "",
+ firstR: "1",
+ firstV: "1",
+ id: "002",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:47:45.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ name: "",
+ nameOid: "B8BB82F0-9B9E-3E7C-4324-62F13A64B369",
+ oid: "375AE030-DCB2-B116-1C71-DA1AB971E249",
+ ordernum: 0,
+ owner: "1",
+ revisionOid: "9BF1CABA-EB6D-0B80-0938-D4DC779D5AF0",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ ts: "2023-06-02 10:47:45.635",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ {
+ btmname: "codefixedvalue",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codefixedsecoid: "5591ED23-D218-8B84-9789-1E5EB21A49B9",
+ codefixedsecoidName: null,
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:47:42.000",
+ creator: "1",
+ data: null,
+ description: "",
+ firstR: "1",
+ firstV: "1",
+ id: "001",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:47:42.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ name: "",
+ nameOid: "804FA254-1158-C355-9CE2-7CA444955AFC",
+ oid: "821F6250-C763-FB0E-92F5-A9C07F1B951C",
+ ordernum: 0,
+ owner: "1",
+ revisionOid: "6CF50C9D-2606-948A-03B1-26158627CE33",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ ts: "2023-06-02 10:47:42.527",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ ],
+ getValueClass: "",
+ id: "0001",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:23:33.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ matchClassifyValueFlag: "",
+ name: "鍥哄畾鐮佹",
+ nameOid: "C01CA64B-8358-D3A7-D38D-9DE7A5D748C8",
+ nullableFlag: "false",
+ oid: "5591ED23-D218-8B84-9789-1E5EB21A49B9",
+ orderNum: 1,
+ owner: "1",
+ parentClassifySecOid: "",
+ parentClassifySecText: "",
+ pkCodeRule: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+ referAttributeId: "",
+ referAttributeName: "",
+ referBtmId: "",
+ referBtmName: "",
+ referCodeClassifyOid: "",
+ referCodeClassifyOidName: "",
+ referConfig: "",
+ referValueInfo: "",
+ revisionOid: "EE7A9BC0-FEF3-061B-A750-132121D86D83",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ sectype: "codefixedsec",
+ sectypeText: "鍥哄畾鐮佹",
+ serialDependFlag: "false",
+ serialDependOrder: 0,
+ serialStart: "",
+ serialStep: 0,
+ ts: "2023-06-02 10:23:33.733",
+ valueCutLength: 0,
+ valueCutType: "code_cut_none",
+ valueCutTypeText: "涓嶆埅鍙�",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ {
+ btmname: "codebasicsec",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codeDateFormatStr: "",
+ codeFillFlag: "",
+ codeFillLength: "",
+ codeFillLimit: 0,
+ codeFillSeparator: "0",
+ codeFillType: "code_fill_right",
+ codeFillTypeText: "",
+ codeGetValueType: "",
+ codeGetValueTypeText: "",
+ codeLevelType: "",
+ codeLevelTypeText: "",
+ codeLevelValue: 0,
+ codeSecLength: "10",
+ codeSecLengthType: "",
+ codeSecLengthTypeText: "",
+ componentCodeFlag: "false",
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:24:07.000",
+ creator: "1",
+ customCodeSerialClass: "",
+ data: null,
+ description: "鍙彉鐮佹",
+ displayFlag: "false",
+ filterSql: "",
+ firstR: "1",
+ firstV: "1",
+ fixedValueVOList: null,
+ getValueClass: "",
+ id: "0002",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:24:07.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ matchClassifyValueFlag: "",
+ name: "鍙彉鐮佹",
+ nameOid: "02AED8DD-C40D-7E00-C88A-3DB65A3027A4",
+ nullableFlag: "false",
+ oid: "A4508759-4213-2F07-04ED-A8C224303F44",
+ orderNum: 2,
+ owner: "1",
+ parentClassifySecOid: "",
+ parentClassifySecText: "",
+ pkCodeRule: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+ referAttributeId: "",
+ referAttributeName: "",
+ referBtmId: "",
+ referBtmName: "",
+ referCodeClassifyOid: "",
+ referCodeClassifyOidName: "",
+ referConfig: "",
+ referValueInfo: "",
+ revisionOid: "E4C77B6E-13AE-55EB-4147-64B4526BFEE4",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ sectype: "codevariablesec",
+ sectypeText: "鍙彉鐮佹",
+ serialDependFlag: "false",
+ serialDependOrder: 0,
+ serialStart: "",
+ serialStep: 0,
+ ts: "2023-06-02 10:24:07.804",
+ valueCutLength: 0,
+ valueCutType: "",
+ valueCutTypeText: "",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ {
+ btmname: "codebasicsec",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codeDateFormatStr: "",
+ codeFillFlag: "",
+ codeFillLength: "",
+ codeFillLimit: 0,
+ codeFillSeparator: "",
+ codeFillType: "",
+ codeFillTypeText: "",
+ codeGetValueType: "",
+ codeGetValueTypeText: "",
+ codeLevelType: "",
+ codeLevelTypeText: "",
+ codeLevelValue: 0,
+ codeSecLength: "10",
+ codeSecLengthType: "code_sec_length_static",
+ codeSecLengthTypeText: "",
+ componentCodeFlag: "false",
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:25:07.000",
+ creator: "1",
+ customCodeSerialClass: "",
+ data: null,
+ description: "鍒嗙被鐮佹瀛�",
+ displayFlag: "false",
+ filterSql: "",
+ firstR: "1",
+ firstV: "1",
+ fixedValueVOList: [
+ {
+ btmname: "codefixedvalue",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codefixedsecoid: "8FD660BF-BA04-AB4F-8076-B5C43845621B",
+ codefixedsecoidName: null,
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:43:44.000",
+ creator: "1",
+ data: null,
+ description: "",
+ firstR: "1",
+ firstV: "1",
+ id: "000101",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:43:44.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ name: "",
+ nameOid: "D135277F-E638-EB02-CEF1-AD99B889CA94",
+ oid: "F7FEFFB7-0832-8CAF-2965-50757D01B878",
+ ordernum: 0,
+ owner: "1",
+ revisionOid: "AF362124-06FD-F209-442F-8A13842CEB40",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ ts: "2023-06-02 10:43:44.838",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ {
+ btmname: "codefixedvalue",
+ checkInBy: "",
+ checkInTime: null,
+ checkOutBy: "",
+ checkOutTime: null,
+ codefixedsecoid: "8FD660BF-BA04-AB4F-8076-B5C43845621B",
+ codefixedsecoidName: null,
+ copyFromVersion: "",
+ createTime: "2023-06-02 10:43:49.000",
+ creator: "1",
+ data: null,
+ description: "",
+ firstR: "1",
+ firstV: "1",
+ id: "000102",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:43:49.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ name: "",
+ nameOid: "4F0F0F48-6146-5E62-7E4C-C1ED5E7D788C",
+ oid: "F11E47E7-1360-5914-BA03-B6844E37AFB4",
+ ordernum: 0,
+ owner: "1",
+ revisionOid: "B4797510-7232-B6FF-077D-918F9B36D3C3",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ ts: "2023-06-02 10:43:49.254",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ ],
+ getValueClass: "",
+ id: "00031",
+ lastModifier: "1",
+ lastModifyTime: "2023-06-02 10:25:07.000",
+ lastR: "1",
+ lastV: "1",
+ lcStatus: "Exist",
+ lcStatusText: "瀛樺湪",
+ lctid: "defaultLC",
+ matchClassifyValueFlag: "",
+ name: "鍒嗙被鐮佹瀛�",
+ nameOid: "69BEE3EC-F560-1C41-F56B-107F5B43C051",
+ nullableFlag: "false",
+ oid: "8FD660BF-BA04-AB4F-8076-B5C43845621B",
+ orderNum: 4,
+ owner: "1",
+ parentClassifySecOid: "",
+ parentClassifySecText: "",
+ pkCodeRule: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+ referAttributeId: "",
+ referAttributeName: "",
+ referBtmId: "",
+ referBtmName: "",
+ referCodeClassifyOid: "",
+ referCodeClassifyOidName: "",
+ referConfig: "",
+ referValueInfo: "",
+ revisionOid: "EA98821E-60A0-1D18-4F70-96B0E0740B44",
+ revisionRule: "",
+ revisionSeq: 1,
+ revisionValue: "",
+ secretGrade: null,
+ secretGradeText: "",
+ sectype: "codefixedsec",
+ sectypeText: "鍥哄畾鐮佹",
+ serialDependFlag: "false",
+ serialDependOrder: 0,
+ serialStart: "",
+ serialStep: 0,
+ ts: "2023-06-02 10:25:07.764",
+ valueCutLength: 0,
+ valueCutType: "code_cut_none",
+ valueCutTypeText: "涓嶆埅鍙�",
+ versionRule: "0",
+ versionSeq: 1,
+ versionValue: "1",
+ },
+ ],
};
},
created() {
@@ -73,13 +470,14 @@
getCodeRule() {
getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
- this.defaultValue = res.data.data;
- this.columnList = res.data.data.secVOList || [];
- console.log(res.data.data.secVOList, 'res.data.data.secVOList');
- this.codeRuleOid = res.data.data.oid;
+ // this.defaultValue = res.data.data;
+ // this.columnList = res.data.data.secVOList || [];
+ // this.codeRuleOid = res.data.data.oid;
this.$nextTick(() => {
- this.$refs.FormTempalte.init(res.data.data.secVOList)
- })
+ // 娴嬭瘯鏁版嵁灞曠ず
+ // this.$refs.FormTempalte.init(res.data.data.secVOList);
+ this.$refs.FormTempalte.init(this.columnList);
+ });
}
});
},
@@ -114,11 +512,10 @@
}
},
async validate() {
- return await this.$refs.FormTempalte.validate()
- }
+ return await this.$refs.FormTempalte.validate();
+ },
},
- watch: {
- },
+ watch: {},
};
</script>
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index ec78c2f..18b9d68 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -197,7 +197,7 @@
tooltips: "璇疯緭鍏ユ暟瀛�",
type: "text",
unique: false,
- verify: "/[0-9]/",
+ verify: /^[0-9]+$/g,
},
{
comboxKey: null,
@@ -513,7 +513,9 @@
})
.then((res) => {
if (res.status === 200) {
- this.templateRender(res.data.formDefineVO.items);
+ this.templateRender(this.testItems);
+ // 娴嬭瘯鏁版嵁灞曠ず
+ // this.templateRender(res.data.formDefineVO.items);
this.$emit("getFormTemplateEnd", res.data);
}
})
@@ -575,14 +577,12 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: formItem.defaultValue,
- // tip: formItem.tooltips,
- // tipPlacement: "right",
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
- referConfig:formItem.referConfig,
+ referConfig: formItem.referConfig,
change: () => {
this.changeFun(formItem.displayExtension, formItem.prop);
},
@@ -618,7 +618,8 @@
this.formIndex++;
this.loading = false;
this.geDictData(dictKeys);
- this.getFormDetail()
+ // 娴嬭瘯鏁版嵁灞曠ず
+ // this.getFormDetail();
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
@@ -709,26 +710,28 @@
});
},
// 琛ㄥ崟鏍￠獙
- 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: this.rowOid }).then(
+ (res) => {
+ console.log(res, "res");
+ }
+ );
+ },
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
index 3aaf6fe..b5c685d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/ResembleQuery.vue
@@ -37,6 +37,7 @@
type="detail"
:visible.sync="formTemplateVisible"
:templateOid="this.resembleTemplateOid"
+ :rowOid="rowOid"
:codeClassifyOid="this.resembleCodeClassifyOid"
></FormTemplateDialog>
</div>
@@ -44,11 +45,10 @@
<script>
import { findLike } from "@/api/formTemplate.js";
-import FormTemplateDialog from "./index.vue";
export default {
name: "ResembleQuery",
- components: { FormTemplateDialog },
+ components: { FormTemplateDialog: () => import('./index.vue') },
props: {
column: {
type: Array,
@@ -79,10 +79,13 @@
return {
formTemplateVisible: false,
activeName: "findlike",
- tableData: [],
+ tableData: [
+ {id: '*****', materialclassifyText: '001', tuhao: 'tuhao', iod: '123123131312'}
+ ],
loading: false,
resembleTemplateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
resembleCodeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ rowOid: '',
defaultValue: {},
secVOList: [],
defaultKeys: [
@@ -136,12 +139,15 @@
params = Object.assign(params, defaultValue);
findLike(params).then((res) => {
this.loading = false;
- this.tableData = res.data.data || [];
+ // this.tableData = res.data.data || [];
});
},
openFormTemlpate(row) {
+ this.$forceUpdate()
+ console.log(row, 'row.oid');
this.codetemplateoid = row.codetemplateoid;
+ this.rowOid = row.oid
this.formTemplateVisible = true;
},
getDefaultValueAndFormValues(form) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index d04ed50..f99d7b4 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,14 +13,22 @@
v-bind="$attrs"
:visible="visible"
:type="type"
+ :rowOid="rowOid"
v-if="dialogVisible"
ref="FormTempalte"
@getFormTemplateEnd="getFormTemplate"
@getFormData="getFormData"
></FormTempalte>
- <div class="tab_box" v-if="type !== 'detail' && dialogVisible && (showCodeApply || showResembleQuery)">
- <el-tabs v-model="activeName" type="border-card">
+ <div
+ class="tab_box"
+ v-if="
+ type !== 'detail' &&
+ dialogVisible &&
+ (showCodeApply || showResembleQuery)
+ "
+ >
+ <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
<CodeApply
ref="CodeApply"
@@ -48,7 +56,10 @@
<el-button @click="submit()" type="primary" :loading="submitBtnLoading"
>纭� 瀹�</el-button
>
- <el-button @click="resembleQuerySubmit" type="primary" v-if="showResembleQuery"
+ <el-button
+ @click="resembleQuerySubmit"
+ type="primary"
+ v-if="showResembleQuery"
>鐩镐技鍍忔煡璇�</el-button
>
</div>
@@ -79,6 +90,7 @@
type: String,
default: "80%",
},
+ rowOid: ''
},
data() {
return {
@@ -88,6 +100,7 @@
resembleTableColumn: [],
secVOList: [],
form: {},
+ activeName: "",
};
},
created() {},
@@ -101,29 +114,25 @@
},
},
showCodeApply() {
- if (this.type === "add") {
- if (this.hasResemble && this.secVOList.length === 0) {
- return false;
- }
- } else {
- return false;
- }
+ // 娴嬭瘯鏁版嵁灞曠ず
+ // if (this.type === "add") {
+ // if (this.hasResemble && this.secVOList.length === 0) {
+ // return false;
+ // }
+ // } else {
+ // return false;
+ // }
return true;
},
showResembleQuery() {
return this.hasResemble;
- },
- activeName() {
- return (
- (this.showCodeApply && "codeApply") ||
- (this.showResembleQuery && "resembleQuery")
- );
},
},
methods: {
openDialog() {
this.$nextTick(() => {
this.$refs.FormTempalte.init();
+ this.$refs.CodeApply.getCodeRule();
});
},
close() {
@@ -138,6 +147,9 @@
data.resembleTableVO.cols &&
data.resembleTableVO.cols.length > 0;
this.resembleTableColumn = data.resembleTableVO.cols || [];
+ this.activeName =
+ (this.showCodeApply && "codeApply") ||
+ (this.showResembleQuery && "resembleQuery");
},
getFormData(form) {
this.form = form;
@@ -145,12 +157,21 @@
resembleQuerySubmit() {
this.$refs.resembleQueryRef.resembleQuery(this.form);
},
+ handleClick() {
+ if (this.activeName === 'resembleQuery') {
+ this.resembleQuerySubmit()
+ }
+ },
async submit() {
const formValidate = await this.$refs.FormTempalte.validate();
+ let codeValidate = true;
if (this.showCodeApply) {
- const codeValidate = this.$refs.CodeApply.validate();
- console.log(formValidate, codeValidate);
+ codeValidate = await this.$refs.CodeApply.validate();
}
+ this.$emit("submit", {
+ form: this.form,
+ flag: formValidate && codeValidate,
+ });
},
},
};
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index 1122205..c63bafa 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -10,6 +10,7 @@
:codeRuleOid="this.codeRuleOid"
:disabledProp="disabledProp"
:rowOid="rowOid"
+ @submit="submit"
></FormTemplateDialog>
<ResembleQueryDialog
:visible.sync="visible1"
@@ -40,5 +41,10 @@
rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
};
},
+ methods: {
+ submit(data) {
+ console.log(data);
+ }
+ }
};
</script>
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index fb16916..cf2a560 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,23 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
+<<<<<<< HEAD
// target: 'http://localhost:37000',
+=======
+<<<<<<< HEAD
+ // target: 'http://localhost:37000',
+ // target: 'http://192.168.1.63:37000',
+ //target: 'http://192.168.3.7:37000',
+ target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://192.168.1.51:37000/',
+=======
+ target: 'http://localhost:37000',
+ // target: 'http://192.168.1.63:37000',
+>>>>>>> dc41a85c4eadeae567973157f64c549d414f49ec
//target: 'http://192.168.3.7:37000',
target: 'http://dev.vci-tech.com:37000',
//target: 'http://192.168.1.51:37000/',
+>>>>>>> 9474fadca23df051af1789b2078aca9c3163a017
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3