From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 490 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 443 insertions(+), 47 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 8a1c2d1..886ce91 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -1,25 +1,46 @@
<template>
<el-dialog
:visible.sync="dialogVisible"
+ v-if="dialogVisible"
v-dialogDrag
- top="0vh"
- :title="title"
+ top="-5vh"
class="avue-dialog avue-dialog--top"
+ :title="title"
:width="width"
append-to-body
+ @opened="openDialog"
>
- <FormTempalte
+ <FormTemplate
v-bind="$attrs"
- :dialogOpen="visible"
:type="type"
- @getFormTemplateEnd="getFormTemplate"
+ :TreeValue="TreeValue"
+ :rowOid="rowOid"
+ :eventList="eventList"
+ :templateOid="templateOid"
+ v-if="dialogVisible"
+ ref="FormTemplate"
@getFormData="getFormData"
- ></FormTempalte>
-
- <div class="tab_box">
- <el-tabs v-model="activeName" type="card">
+ ></FormTemplate>
+ <div
+ class="tab_box"
+ v-if="
+ type !== 'detail' &&
+ dialogVisible &&
+ (showCodeApply || showResembleQuery) &&
+ type !== 'preview'
+ "
+ >
+ <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
- <CodeApply v-bind="$attrs"></CodeApply>
+ <FormTemplate
+ v-bind="$attrs"
+ :type="type"
+ :selfColumnType="selfColumnType"
+ :selfColumnConfig="selfColumnConfig"
+ ref="CodeApply"
+ @getFormData="getCodeApplyFormData"
+ @referConfigDataUpdate="referConfigDataUpdate"
+ ></FormTemplate>
</el-tab-pane>
<el-tab-pane
label="鐩镐技椤规煡璇�"
@@ -31,34 +52,50 @@
ref="resembleQueryRef"
:hasResemble="this.hasResemble"
:column="this.resembleTableColumn"
+ :codeClassifyOid="codeClassifyOid"
:form="this.form"
+ :templateOid="templateOid"
></ResembleQuery>
</el-tab-pane>
</el-tabs>
</div>
- <div class="avue-dialog__footer" v-if="type !== 'detail'">
- <el-button @click="close()">鍙� 娑�</el-button>
- <el-button @click="close()" type="primary" :loading="submitBtnLoading"
- >纭� 瀹�</el-button
- >
- <el-button @click="resembleQuerySubmit" type="primary" v-if="hasResemble"
- >鐩镐技鍍忔煡璇�</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 FormTempalte from "./FormTempalte";
+import { getCodeRule, getFormTemplate } from "@/api/formTemplate.js";
+import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
-import CodeApply from "./CodeApply";
export default {
name: "FormTemplateDialog",
- components: { ResembleQuery, FormTempalte, CodeApply },
+ components: { ResembleQuery, FormTemplate },
props: {
visible: {
type: Boolean,
default: false,
+ },
+ TreeValue:{
+ type: String,
+ default: "",
},
type: {
type: String,
@@ -66,21 +103,114 @@
},
title: {
type: String,
- default: "琛ㄥ崟妯℃澘",
+ default: "缂栫爜鐢宠",
},
width: {
type: String,
default: "80%",
},
+ rowOid: "",
+ codeClassifyOid: {
+ type: String,
+ default: "",
+ },
+ templateOid: {
+ type: String,
+ default: "",
+ },
+ submitText: {
+ type: String,
+ default: "纭� 瀹�",
+ },
+ setForm: {
+ type: Object,
+ default: () => ({}),
+ },
},
data() {
return {
+ eventList:[],
+ //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+ codeValueApplyStatus:'',
loading: false,
submitBtnLoading: false,
hasResemble: false,
resembleTableColumn: [],
- activeName: "resembleQuery",
- form: {}
+ secVOList: [],
+ form: {},
+ codeApplyForm: {},
+ activeName: "codeApply",
+ showCodeApply: false,
+ showResembleQuery: false,
+ selfColumnType: {
+ codefixedsec: "combox",//鍥哄畾鐮佹
+ codeclassifysec: "refer",//鍒嗙被鐮佹
+ codevariablesec: "text",//鍙彉鐮佹
+ coderefersec: "refer",//寮曠敤鐮佹
+ codeattrsec: "text",
+ codelevelsec: "text",
+ codedatesec: "date"
+ },
+ selfColumnConfig: {
+ function: {
+ required: this.isRequired,
+ dicData: this.getOptionList,
+ type: this.getType,
+ referConfig: this.getReferConfig,
+ readOnly: this.getDisabled,
+ },
+ exchange: {
+ text: "name",
+ field: "oid",
+ prop: "oid",
+ showField: "name",
+ parentClassifySecOid: "parentClassifySecOid",
+ label: "name",
+ maxlength: "codeSecLength",
+ data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
+ },
+ directVoluation: {
+ search: true,
+ props: {
+ label: "id",
+ value: "id",
+ },
+ },
+ },
+ 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",
+ ],
+ codeRuleOid: "",
};
},
created() {},
@@ -93,39 +223,305 @@
this.$emit("update:visible", val);
},
},
- showCodeApply() {
- if (this.type === "add") {
- if (this.hasResemble && this.resembleTableColumn.length === 0) {
- return false;
- }
- } else {
- if (this.hasResemble) {
- return false;
- }
- }
- return true;
- },
- showResembleQuery() {
- return this.hasResemble;
- },
},
methods: {
+ openDialog() {
+ this.getFormTemplate();
+ if (this.type === "add") {
+ this.getCodeRule();
+ }
+ },
close() {
this.dialogVisible = false;
},
- getFormTemplate(data) {
- this.hasResemble =
- data.resembleTableVO &&
- data.resembleTableVO.cols &&
- data.resembleTableVO.cols.length > 0;
- this.resembleTableColumn = data.resembleTableVO.cols || [];
+ // 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
+ getFormTemplate() {
+ getFormTemplate({
+ templateOid: this.templateOid,
+ codeClassifyOid: this.codeClassifyOid,
+ })
+ .then((res) => {
+ if (res.status === 200) {
+ this.hasResemble =
+ res.data.resembleTableVO &&
+ res.data.resembleTableVO.cols &&
+ res.data.resembleTableVO.cols.length > 0;
+ this.resembleTableColumn = res.data.resembleTableVO.cols || [];
+ if (this.hasResemble) {
+ this.activeName = "resembleQuery";
+ this.showResembleQuery = true;
+ } else {
+ this.showResembleQuery = false;
+ }
+ this.$nextTick(() => {
+ this.$refs.FormTemplate.templateRender(
+ res.data.formDefineVO.items
+ );
+ this.eventList=res.data.templateVO.attributes
+ // this.$refs.FormTemplate.$emit('eventList', res.data.templateVO.attributes);
+ if (Object.keys(this.setForm).length > 0) {
+ this.$refs.FormTemplate.form = this.setForm;
+ }
+ });
+ }
+ })
+ .catch(() => {
+ this.loading = false;
+ });
+ },
+ // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
+ getCodeRule() {
+ let that = this;
+ getCodeRule({ codeClassifyOid: that.codeClassifyOid }).then((res) => {
+ if (res.data && res.data.code === 200) {
+ that.codeRuleOid = res.data.data.oid;
+ const typeList = [
+ //灞炴�х爜娈� 鍙
+ "codeattrsec",
+ //鍙彉鐮佹
+ "codevariablesec",
+ //鍥哄畾鐮佹
+ "codefixedsec",
+ //鍒嗙被鐮佹
+ "codeclassifysec",
+ //鏃ユ湡鐮佹 鍙
+ "codedatesec",
+ //寮曠敤鐮佹
+ "coderefersec",
+ //灞傜骇鐮佹 鍙
+ "codelevelsec",
+ //娴佹按鐮佹 闅愯棌
+ ];
+ that.secVOList = (res.data.data.secVOList || []).filter((item) =>
+ typeList.includes(item.secType)
+ );
+ if (that.secVOList.length > 0 && that.type === "add") {
+ that.showCodeApply = true;
+ that.activeName = "codeApply";
+ that.$nextTick(() => {
+ that.$refs.CodeApply.templateRender(that.secVOList,this.TreeValue);
+ });
+ } else {
+ that.showCodeApply = false;
+ }
+ }
+ });
},
getFormData(form) {
- this.form = form
+ this.form = form;
+ },
+ getCodeApplyFormData(codeApplyForm) {
+ this.codeApplyForm = codeApplyForm;
+ },
+ // 鍙傜収缁勪欢鏁版嵁鍙樻洿
+ referConfigDataUpdate(data) {
+ const { field } = data;
+ this.secVOList = this.secVOList.map((item) => {
+ if (item.parentClassifySecOid === field) {
+ this.$refs.CodeApply.form[item.oid] = undefined;
+ this.$refs.CodeApply.form[item.name] = undefined;
+ item.readOnly=false;
+ item.referConfig.extraParams.parentClassifyValueOid=data.value;
+ }
+ return item;
+ });
+ this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
},
resembleQuerySubmit() {
+ this.activeName = "resembleQuery";
this.$refs.resembleQueryRef.resembleQuery(this.form);
},
+ handleClick() {
+ if (this.activeName === "resembleQuery") {
+ this.resembleQuerySubmit();
+ }
+ },
+ async submit() {
+ // 杩涜琛ㄥ崟鏍￠獙
+ const formValidate = await this.$refs.FormTemplate.validate();
+ if (!formValidate) return;
+ let codeValidate = true;
+ // 杩涜鐮佸�肩敵璇锋牎楠�
+ // if (this.showCodeApply) {
+ // codeValidate = await this.$refs.CodeApply.validate();
+ // if (!codeValidate) {
+ // this.activeName = "codeApply";
+ // return false;
+ // }
+ // }
+ let resembleQueryList = [];
+ if (this.$refs.resembleQueryRef) {
+ // 杩涜鐩镐技椤规煡璇�
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
+ this.form
+ );
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
+ `璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
+ "闇�瑕佹偍纭",
+ {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ }
+ );
+ }
+ // 鎺掗櫎涓�浜涘瓧娈�
+ const noData = [
+ "jiliangdwname",
+ "materialtypeText",
+ "morengongysname",
+ "$caigouwl",
+ "$xiaoshouwl",
+ "$shifoupihaoguanli",
+ "lcstatus_text",
+ "hesuanfenleiname",
+ "$kucunwl",
+ "oldcode",
+ "lastmodifier"
+ ];
+ let resForm = {};
+ const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+ this.form
+ );
+ noData.forEach((item) => {
+ this.$delete(formValue, item);
+ });
+ const keys = Object.keys(formValue);
+ keys.forEach((item, index) => {
+ keys.forEach((itm, idx) => {
+ if ((item === ('$' + itm)) && idx !== index) {
+ this.$delete(formValue, keys[index]);
+ }
+ })
+ });
+
+ resForm.data = formValue;
+ resForm = Object.assign({}, resForm, defaultValue);
+ resForm.secDTOList = this.secVOList.map((item) => {
+ return {
+ secOid: item.oid,
+ secValue: this.codeApplyForm[item.oid],
+ };
+ });
+ resForm.codeClassifyOid = this.codeClassifyOid;
+ resForm.codeRuleOid = this.codeRuleOid;
+ resForm.templateOid = this.templateOid;
+ this.$emit("submit", resForm);
+ },
+ 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];
+ },
+ getReferConfig(item) {
+ let params = {};
+ if (item.secType == "codeclassifysec") {
+ //鍒嗙被鐮佹
+ params = {
+ isMuti: false,
+ type: "grid",
+ tableConfig: {
+ limit: -1,
+ cols: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ sort: true,
+ width: 150,
+ },
+ {
+ field: "description",
+ title: "鎻忚堪",
+ width: 250,
+ },
+ ],
+ queryColumns: [
+ {
+ field: "id",
+ title: "鑻辨枃鍚嶇О",
+ },
+ {
+ field: "name",
+ title: "涓枃鍚嶇О",
+ },
+ ],
+ },
+ url: "api/ubcs-code/ubcs-code/mdmEngineController/listCodeClassifyValueBySecOid",
+ extraParams: {
+ classifySecOid: item.oid,
+ parentClassifyValueOid: item.parentClassifySecOid
+ ? this.codeApplyForm[item.parentClassifySecOid]
+ : "",
+ },
+ };
+ } else if (item.secType == "coderefersec") {
+ //寮曠敤鐮佹
+ params = JSON.parse(item.referValueInfo);
+ }
+ return params;
+ },
+ getDisabled(item) {
+ if (item.secType === "codeclassifysec") {
+ if (item.parentClassifySecOid) {
+ if (!this.codeApplyForm[item.parentClassifySecOid]) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+ }
+ },
+ isRequired(item) {
+ return item.nullableFlag != "true";
+ },
+ //榛樿鍊�
+ getOptionList(item) {
+ if (
+ Array.isArray(item.fixedValueVOList) &&
+ item.fixedValueVOList.length > 0
+ ) {
+ const configAttr = {
+ key: "id",
+ value: "id",
+ };
+ const optionList = item.fixedValueVOList.map((item) => {
+ for (const key in configAttr) {
+ if (Object.hasOwnProperty.call(configAttr, key)) {
+ const element = configAttr[key];
+ item[key] = item[element];
+ }
+ }
+ return item;
+ });
+ return optionList;
+ } else {
+ return [];
+ }
+ },
},
};
</script>
--
Gitblit v1.9.3