From 205056bc17023dd44e6d262cfe78b6e146ee2f20 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 23 八月 2023 20:05:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 125 +++++++++++++++++++++++------------------
1 files changed, 69 insertions(+), 56 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 98665ec..d2585c3 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,7 +3,8 @@
:visible.sync="dialogVisible"
v-if="dialogVisible"
v-dialogDrag
- top="5vh"
+ top="-5vh"
+ class="avue-dialog avue-dialog--top"
:title="title"
:width="width"
append-to-body
@@ -136,7 +137,10 @@
codefixedsec: "combox",
codeclassifysec: "refer",
codevariablesec: "text",
+ codeattrsec: "text",
+ codelevelsec: "text",
coderefersec: "refer",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -155,6 +159,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -196,7 +201,7 @@
"copyfromversion",
"secretgrade",
],
- codeRuleOid: ''
+ codeRuleOid: "",
};
},
created() {},
@@ -237,9 +242,9 @@
this.activeName = "resembleQuery";
this.showResembleQuery = true;
} else {
- this.showResembleQuery = false
+ this.showResembleQuery = false;
}
- console.log(this.hasResemble, 'this.hasResemblethis.hasResemble');
+ console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
this.$nextTick(() => {
this.$refs.FormTemplate.templateRender(
res.data.formDefineVO.items
@@ -258,12 +263,15 @@
getCodeRule() {
getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
- this.codeRuleOid = res.data.data.oid
+ this.codeRuleOid = res.data.data.oid;
const typeList = [
"codefixedsec",
"codeclassifysec",
"codevariablesec",
"coderefersec",
+ "codeattrsec",
+ "codelevelsec",
+ "codedatesec"
];
this.secVOList = (res.data.data.secVOList || []).filter((item) =>
typeList.includes(item.secType)
@@ -313,42 +321,22 @@
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.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) {
- let resForm = {};
- const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
+ resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
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({ secOid: key, secValue: value });
- }
- }
- }
- resForm.codeClassifyOid = this.codeClassifyOid;
- resForm.codeRuleOid = this.codeRuleOid;
- resForm.templateOid = this.templateOid;
- this.$emit("submit", resForm);
- } else {
- this.$confirm(
+ }
+ if (resembleQueryList.length > 0) {
+ await this.$confirm(
`璇ョ墿鏂欏凡鏈�${resembleQueryList.length}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
"闇�瑕佹偍纭",
{
@@ -356,26 +344,51 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}
- )
- .then(() => {
- let resForm = {};
- const { defaultValue, formValue } =
- this.getDefaultValueAndFormValues(this.form);
- 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);
- })
- .catch(() => {});
+ );
}
+ // 鎺掗櫎涓�浜涘瓧娈�
+ 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);
+ debugger
+ 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 = {};
--
Gitblit v1.9.3