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 | 180 +++++++++++++++++++++++++++++++-----------------------------
1 files changed, 93 insertions(+), 87 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 68f7141..886ce91 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,7 +13,9 @@
<FormTemplate
v-bind="$attrs"
:type="type"
+ :TreeValue="TreeValue"
:rowOid="rowOid"
+ :eventList="eventList"
:templateOid="templateOid"
v-if="dialogVisible"
ref="FormTemplate"
@@ -91,6 +93,10 @@
type: Boolean,
default: false,
},
+ TreeValue:{
+ type: String,
+ default: "",
+ },
type: {
type: String,
default: "add",
@@ -123,6 +129,9 @@
},
data() {
return {
+ eventList:[],
+ //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+ codeValueApplyStatus:'',
loading: false,
submitBtnLoading: false,
hasResemble: false,
@@ -134,10 +143,13 @@
showCodeApply: false,
showResembleQuery: false,
selfColumnType: {
- codefixedsec: "combox",
- codeclassifysec: "refer",
- codevariablesec: "text",
- coderefersec: "refer",
+ codefixedsec: "combox",//鍥哄畾鐮佹
+ codeclassifysec: "refer",//鍒嗙被鐮佹
+ codevariablesec: "text",//鍙彉鐮佹
+ coderefersec: "refer",//寮曠敤鐮佹
+ codeattrsec: "text",
+ codelevelsec: "text",
+ codedatesec: "date"
},
selfColumnConfig: {
function: {
@@ -156,6 +168,7 @@
label: "name",
maxlength: "codeSecLength",
data: "fixedValueVOList",
+ dateFormate: "codeDateFormatStr"
},
directVoluation: {
search: true,
@@ -240,11 +253,12 @@
} else {
this.showResembleQuery = false;
}
- console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
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;
}
@@ -257,26 +271,38 @@
},
// 鑾峰彇鐮佸�肩敵璇锋暟鎹�
getCodeRule() {
- getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
+ let that = this;
+ getCodeRule({ codeClassifyOid: that.codeClassifyOid }).then((res) => {
if (res.data && res.data.code === 200) {
- this.codeRuleOid = res.data.data.oid;
+ that.codeRuleOid = res.data.data.oid;
const typeList = [
- "codefixedsec",
- "codeclassifysec",
+ //灞炴�х爜娈� 鍙
+ "codeattrsec",
+ //鍙彉鐮佹
"codevariablesec",
+ //鍥哄畾鐮佹
+ "codefixedsec",
+ //鍒嗙被鐮佹
+ "codeclassifysec",
+ //鏃ユ湡鐮佹 鍙
+ "codedatesec",
+ //寮曠敤鐮佹
"coderefersec",
+ //灞傜骇鐮佹 鍙
+ "codelevelsec",
+ //娴佹按鐮佹 闅愯棌
];
- this.secVOList = (res.data.data.secVOList || []).filter((item) =>
+ that.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.$nextTick(() => {
- this.$refs.CodeApply.templateRender(this.secVOList);
+ 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 {
- this.showCodeApply = false;
+ that.showCodeApply = false;
}
}
});
@@ -294,10 +320,12 @@
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.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
},
resembleQuerySubmit() {
this.activeName = "resembleQuery";
@@ -328,42 +356,8 @@
this.form
);
}
- if (resembleQueryList.length === 0) {
- let resForm = {};
- const { defaultValue, formValue } = this.getDefaultValueAndFormValues(
- this.form
- );
- const noData = [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- ];
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- 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}鏉＄浉浼兼暟鎹紝鏄惁缁х画淇濆瓨锛焋,
"闇�瑕佹偍纭",
{
@@ -371,41 +365,50 @@
cancelButtonText: "鍙栨秷",
type: "warning",
}
- )
- .then(() => {
- // 鎺掗櫎涓�浜涘瓧娈�
- const noData = [
- "jiliangdwname",
- "materialtypeText",
- "morengongysname",
- "$caigouwl",
- "$xiaoshouwl",
- "$shifoupihaoguanli",
- "lcstatus_text",
- "hesuanfenleiname",
- "$kucunwl",
- ];
- let resForm = {};
- const { defaultValue, formValue } =
- this.getDefaultValueAndFormValues(this.form);
- noData.forEach((item) => {
- this.$delete(formValue, item);
- });
- 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);
+ 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 = {};
@@ -431,6 +434,7 @@
getReferConfig(item) {
let params = {};
if (item.secType == "codeclassifysec") {
+ //鍒嗙被鐮佹
params = {
isMuti: false,
type: "grid",
@@ -475,6 +479,7 @@
},
};
} else if (item.secType == "coderefersec") {
+ //寮曠敤鐮佹
params = JSON.parse(item.referValueInfo);
}
return params;
@@ -493,6 +498,7 @@
isRequired(item) {
return item.nullableFlag != "true";
},
+ //榛樿鍊�
getOptionList(item) {
if (
Array.isArray(item.fixedValueVOList) &&
--
Gitblit v1.9.3