From 93e2df19d543dbf2cd806ab205efd20be9f71111 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 06 六月 2023 16:48:00 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue | 426 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 413 insertions(+), 13 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue b/Source/UBCS-WEB/src/components/FormTemplate/CodeApply.vue
index 242fbac..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);
+ });
}
});
},
@@ -113,9 +511,11 @@
return [];
}
},
+ async validate() {
+ return await this.$refs.FormTempalte.validate();
+ },
},
- watch: {
- },
+ watch: {},
};
</script>
--
Gitblit v1.9.3