From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 335 +++++++++++++++++++++----------------------------------
1 files changed, 126 insertions(+), 209 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index a908408..45f318e 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,23 +3,20 @@
:visible.sync="dialogVisible"
v-if="dialogVisible"
v-dialogDrag
- top="0vh"
+ top="5vh"
:title="title"
- class="avue-dialog avue-dialog--top"
:width="width"
append-to-body
@opened="openDialog"
>
- <FormTempalte
+ <FormTemplate
v-bind="$attrs"
- :visible="visible"
:type="type"
:rowOid="rowOid"
:templateOid="templateOid"
- ref="FormTempalte"
+ ref="FormTemplate"
@getFormData="getFormData"
- ></FormTempalte>
-
+ ></FormTemplate>
<div
class="tab_box"
v-if="
@@ -30,16 +27,16 @@
"
>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
- <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply">
- <FormTempalte
+ <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
+ <FormTemplate
v-bind="$attrs"
:type="type"
:selfColumnType="selfColumnType"
:selfColumnConfig="selfColumnConfig"
ref="CodeApply"
- @getFormData="getFormData"
+ @getFormData="getCodeApplyFormData"
@referConfigDataUpdate="referConfigDataUpdate"
- ></FormTempalte>
+ ></FormTemplate>
</el-tab-pane>
<el-tab-pane
label="鐩镐技椤规煡璇�"
@@ -58,28 +55,35 @@
</el-tab-pane>
</el-tabs>
</div>
- <div class="avue-dialog__footer" v-if="type !== 'detail'">
- <el-button @click="close()">鍙� 娑�</el-button>
- <el-button @click="submit()" type="primary" :loading="submitBtnLoading">{{
- submitText
- }}</el-button>
- <el-button
- @click="resembleQuerySubmit"
- type="primary"
- v-if="showResembleQuery"
- >鐩镐技鍍忔煡璇�</el-button
- >
- </div>
+ <template #footer>
+ <div class="" v-if="type !== 'detail'">
+ <el-button @click="close()" size="small">鍙� 娑�</el-button>
+ <el-button
+ @click="submit()"
+ type="primary"
+ :loading="submitBtnLoading"
+ size="small"
+ >{{ submitText }}</el-button
+ >
+ <el-button
+ @click="resembleQuerySubmit"
+ type="primary"
+ size="small"
+ v-if="showResembleQuery"
+ >鐩镐技鍍忔煡璇�</el-button
+ >
+ </div>
+ </template>
</el-dialog>
</template>
<script>
import { getCodeRule, getFormTemplate } from "@/api/formTemplate.js";
-import FormTempalte from "./FormTempalte";
+import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
export default {
name: "FormTemplateDialog",
- components: { ResembleQuery, FormTempalte },
+ components: { ResembleQuery, FormTemplate },
props: {
visible: {
type: Boolean,
@@ -119,9 +123,10 @@
resembleTableColumn: [],
secVOList: [],
form: {},
+ codeApplyForm: {},
activeName: "codeApply",
- showCodeApply: true,
- showResembleQuery: true,
+ showCodeApply: false,
+ showResembleQuery: false,
selfColumnType: {
codefixedsec: "combox",
codeclassifysec: "refer",
@@ -154,6 +159,38 @@
},
},
},
+ defaultKeys: [
+ "oid",
+ "id",
+ "name",
+ "description",
+ "revisionoid",
+ "nameoid",
+ "btmname",
+ "lastr",
+ "firstr",
+ "lastv",
+ "firstv",
+ "creator",
+ "createtime",
+ "lastModifier",
+ "lastmodifytime",
+ "revisionrule",
+ "revisionseq",
+ "revisionvalue",
+ "versionrule",
+ "versionseq",
+ "versionvalue",
+ "lcstatus",
+ "ts",
+ "owner",
+ "checkinby",
+ "checkintime",
+ "checkoutby",
+ "checkouttime",
+ "copyfromversion",
+ "secretgrade",
+ ],
};
},
created() {},
@@ -194,12 +231,13 @@
this.activeName = "resembleQuery";
this.showResembleQuery = true;
}
- this.$refs.FormTempalte.templateRender(res.data.formDefineVO.items);
+ this.$nextTick(() => {
+ this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items);
+ })
}
})
- .catch((err) => {
+ .catch(() => {
this.loading = false;
- console.log(err);
});
},
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
@@ -212,186 +250,26 @@
"codevariablesec",
"coderefersec",
];
-
- this.secVOList = [
- {
- 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-06 14:10:27.000",
- creator: "1",
- customCodeSerialClass: "",
- data: null,
- description: "",
- displayFlag: "false",
- filterSql: "",
- firstR: "1",
- firstV: "1",
- fixedValueVOList: null,
- getValueClass: "",
- id: "0001",
- lastModifier: "1",
- lastModifyTime: "2023-06-06 14:10:27.000",
- lastR: "1",
- lastV: "1",
- lcStatus: "Exist",
- lcStatusText: "瀛樺湪",
- lctid: "defaultLC",
- matchClassifyValueFlag: "false",
- name: "鍒嗙被鐮佹鐖�",
- nameOid: "C2998D32-E89E-6D41-0782-88E97E9EC65B",
- nullableFlag: "false",
- oid: "1668926002119708672",
- orderNum: 1,
- owner: "1",
- parentClassifySecOid: "",
- parentClassifySecText: "",
- pkCodeRule: "B4766355-E4E1-490A-833B-D5AB73E9B877",
- referAttributeId: "",
- referAttributeName: "",
- referBtmId: "",
- referBtmName: "",
- referCodeClassifyOid: "",
- referCodeClassifyOidName: "",
- referConfig: "",
- referValueInfo: "",
- revisionOid: "F0049108-6AAE-EAAD-BC76-E6714C2B8F2A",
- revisionRule: "",
- revisionSeq: 1,
- revisionValue: "",
- secretGrade: null,
- secretGradeText: "",
- sectype: "codeclassifysec",
- sectypeText: "鍒嗙被鐮佹",
- serialDependFlag: "false",
- serialDependOrder: 0,
- serialStart: "",
- serialStep: 0,
- ts: "2023-06-06 14:10:27.716",
- 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_variable",
- codeSecLengthTypeText: "",
- componentCodeFlag: "false",
- copyFromVersion: "",
- createTime: "2023-06-06 14:10:50.000",
- creator: "1",
- customCodeSerialClass: "",
- data: null,
- description: "",
- displayFlag: "false",
- filterSql: "",
- firstR: "1",
- firstV: "1",
- fixedValueVOList: null,
- getValueClass: "",
- id: "000101",
- lastModifier: "1",
- lastModifyTime: "2023-06-06 14:10:50.000",
- lastR: "1",
- lastV: "1",
- lcStatus: "Exist",
- lcStatusText: "瀛樺湪",
- lctid: "defaultLC",
- matchClassifyValueFlag: "false",
- name: "鍒嗙被鐮佹瀛�",
- nameOid: "1FDB20E3-9F68-A5B0-D097-2142EA054F9B",
- nullableFlag: "false",
- oid: "00AD9FE0-A31D-7962-10DF-DC6115EF80A5",
- orderNum: 2,
- owner: "1",
- parentClassifySecOid: "1668926002119708672",
- parentClassifySecText: "鍒嗙被鐮佹",
- pkCodeRule: "B4766355-E4E1-490A-833B-D5AB73E9B877",
- referAttributeId: "",
- referAttributeName: "",
- referBtmId: "",
- referBtmName: "",
- referCodeClassifyOid: "",
- referCodeClassifyOidName: "",
- referConfig: "",
- referValueInfo: "",
- revisionOid: "95183EF9-C9AD-2941-1C99-9E9024330D40",
- revisionRule: "",
- revisionSeq: 1,
- revisionValue: "",
- secretGrade: null,
- secretGradeText: "",
- sectype: "codeclassifysec",
- sectypeText: "鍒嗙被鐮佹",
- serialDependFlag: "false",
- serialDependOrder: 0,
- serialStart: "",
- serialStep: 0,
- ts: "2023-06-06 14:10:50.084",
- valueCutLength: 0,
- valueCutType: "",
- valueCutTypeText: "",
- versionRule: "0",
- versionSeq: 1,
- versionValue: "1",
- },
- ];
- // this.secVOList = (res.data.data.secVOList || []).filter((item) =>
- // typeList.includes(item)
- // );
- this.$nextTick(() => {
+ this.secVOList = (res.data.data.secVOList || []).filter((item) =>
+ typeList.includes(item.secType)
+ );
if (this.secVOList.length > 0 && this.type === "add") {
this.showCodeApply = true;
this.activeName = "codeApply";
- this.$refs.CodeApply.templateRender(this.secVOList);
+ this.$nextTick(() => {
+ this.$refs.CodeApply.templateRender(this.secVOList);
+ })
} else {
this.showCodeApply = false;
}
- });
}
});
},
getFormData(form) {
this.form = form;
+ },
+ getCodeApplyFormData(codeApplyForm) {
+ this.codeApplyForm = codeApplyForm;
},
// 鍙傜収缁勪欢鏁版嵁鍙樻洿
referConfigDataUpdate(data) {
@@ -401,8 +279,9 @@
this.$refs.CodeApply.form[item.oid] = undefined;
this.$refs.CodeApply.form[item.name] = undefined;
}
+ return item;
});
- this.$refs.CodeApply.templateRender();
+ this.$refs.CodeApply.templateRender(this.secVOList);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -415,12 +294,13 @@
},
async submit() {
// 杩涜琛ㄥ崟鏍￠獙
- const formValidate = await this.$refs.FormTempalte.validate();
+ const formValidate = await this.$refs.FormTemplate.validate();
if (!formValidate) return;
let codeValidate = true;
// 杩涜鐮佸�肩敵璇锋牎楠�
if (this.showCodeApply) {
- codeValidate = await this.$refs.codeApply.validate();
+ codeValidate = await this.$refs.CodeApply.validate();
+ console.log(9999);
if (!codeValidate) return;
}
// 杩涜鐩镐技椤规煡璇�
@@ -428,7 +308,22 @@
this.form
);
if (resembleQueryList.length === 0) {
- this.$emit("submit", this.form);
+ let resForm = {};
+ const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+ this.form
+ );
+ resForm.data = formValue;
+ resForm = Object.assign({}, resForm, defaultValue);
+ resForm.secDTOList = [];
+ for (const key in this.codeApplyForm) {
+ if (Object.hasOwnProperty.call(this.codeApplyForm, key)) {
+ const value = this.codeApplyForm[key];
+ if (value) {
+ resForm.secDTOList.push({ [key]: value });
+ }
+ }
+ }
+ this.$emit("submit", resForm);
} else {
this.$confirm(
`璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
@@ -445,12 +340,30 @@
.catch(() => {});
}
},
+ getDefaultValueAndFormValues(form) {
+ let defaultValue = {};
+ let formValue = {};
+ for (const key in form) {
+ if (Object.hasOwnProperty.call(form, key)) {
+ const element = form[key];
+ if (this.defaultKeys.includes(key)) {
+ defaultValue[key] = element;
+ } else {
+ formValue[key] = element;
+ }
+ }
+ }
+ return {
+ defaultValue,
+ formValue,
+ };
+ },
getType(item) {
- return this.selfColumnType[item.sectype];
+ return this.selfColumnType[item.secType];
},
getReferConfig(item) {
let params = {};
- if (item.sectype == "codeclassifysec") {
+ if (item.secType == "codeclassifysec") {
params = {
isMuti: false,
type: "grid",
@@ -489,16 +402,20 @@
url: "api/ubcs-code/ubcs-code/mdmEngineController/listCodeClassifyValueBySecOid",
extraParams: {
classifySecOid: item.oid,
- parentClassifyValueOid: "",
+ parentClassifyValueOid: item.parentClassifySecOid
+ ? this.codeApplyForm[item.parentClassifySecOid]
+ : "",
},
};
+ } else if (item.secType == "coderefersec") {
+ params = JSON.parse(item.referValueInfo);
}
- return item.referConfig || params;
+ return params;
},
getDisabled(item) {
- if (item.sectype === "codeclassifysec") {
+ if (item.secType === "codeclassifysec") {
if (item.parentClassifySecOid) {
- if (!this.form[item.parentClassifySecOid]) {
+ if (!this.codeApplyForm[item.parentClassifySecOid]) {
return true;
} else {
return false;
--
Gitblit v1.9.3