From c48c27fc96e26309e8ab0df414dcb179c0348e2f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 14:39:23 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 77 +++++++++++++++++++++++++++-----------
1 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index b8bfceb..525f4f4 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -103,11 +103,19 @@
type: String,
default: "",
},
+ selectRow: {
+ type: Array,
+ default: []
+ }
},
data() {
return {
+ selectValue: "",
//骞翠唬鍙�
- dataYearValue:null,
+ dataYearCode: {
+ type: "",
+ value: ""
+ },
filteredObject: {},
filteredArray: [],
isSeriesType: {},
@@ -197,12 +205,21 @@
this.$emit("isShow", newV)
}
},
- dataYearValue:{
- handler(newV){
- if(newV){
- this.$emit("dataYearValue",newV)
- }
+ dataYearCode: {
+ deep: true,
+ immediate: true,
+ handler(newV) {
+ this.$emit("dataYearCode", newV)
}
+ },
+ selectRow: {
+ handler(newval) {
+ console.log(newval);
+ let ids = newval.map(item => item.id);
+ this.selectValue = ids.join(",");
+ },
+ deep: true,
+ immediate: true
}
},
methods: {
@@ -223,6 +240,7 @@
let slotColumnList = [];
formItemList.forEach((formItem) => {
formItem = this.resetFormConfig(formItem);
+ console.log(formItem)
//灞炴�х爜娈佃鍒�
if (formItem.secType === "codeattrsec") {
this.attrList.push(formItem);
@@ -230,6 +248,7 @@
//绯诲垪鍙疯鍒�
if (formItem.field === "codeStandardEditType") {
if (this.status === "amend") {
+ console.log("formItem-amend", formItem)
formItem.readOnly = true;
}
}
@@ -279,19 +298,21 @@
this.codeattrsecValue = val.value;
return;
}
- //鏄惁绯诲垪-绯诲垪鍙�
- if (val.column.field === "isSeries") {
+ //淇涓�-绯诲垪鍙�
+ if (val.column.field === "reviseSeries") {
if (val.value === "false") {
this.isShow = true;
} else {
this.isShow = false;
}
}
- if(val.column.field === "releaseDate"){
- if(val.value){
- this.dataYearValue = val.column.valueFormat;
- }else {
- this.dataYearValue = null;
+ if (val.column.field === "releaseDate") {
+ if (val.value) {
+ this.dataYearCode.type = val.column.valueFormat;
+ this.dataYearCode.value = val.value;
+ } else {
+ this.dataYearCode.type = "";
+ this.dataYearCode.value = "";
}
}
},
@@ -304,7 +325,8 @@
field: formItem.field,
type: this.columnType[formItem.type],
dicData: this.getDataList(formItem.type, formItem.data),
- disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false),
+ disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ? true : false) ||
+ (this.status === 'amend' ? (formItem.field === "reviseSeries" ? (formItem.value == 'false' ? true : false) : false) : false),
prepend: this.preOrSufFixShow("text", formItem.prefix),
append: this.preOrSufFixShow("text", formItem.suffix),
prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -312,9 +334,12 @@
valueFormat: formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
- value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
+ value: formItem.defaultValue || (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
(formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
- (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null),
+ (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
+ (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null) ||
+ //鐖剁粍浠跺鏋滄槸鍙傜収鏁版嵁浼氬皢selectRow缃┖,selectRow涓嶄负绌哄氨璇存槑涓嶆槸鍙傜収瑕佸洖濉簮鏍囧噯鍙锋暟鎹�
+ (this.status === "amend" ? (this.selectRow && (formItem.field === "oldcode" ? this.selectValue : null)) : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
@@ -421,7 +446,9 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
- (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null),
+ (formItem.secType == "codedatesec" ? formItem.codeDateValue : null) || (TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
+ (formItem.secType == "codeattrsec" ? this.add : null) || (this.status === "apply" && formItem.field === "codeStandardEditType" ? "1" : null) ||
+ (this.status === "amend" && formItem.field === "codeStandardEditType" ? "2" : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
@@ -593,12 +620,16 @@
// 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
getFormDetail() {
if (this.type === "add") return;
- getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
- (res) => {
- this.form = Object.assign(this.form, res.data.data[0]);
- this.loading = false;
- }
- );
+ if (this.templateOid) {
+ getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
+ (res) => {
+ this.form = Object.assign(this.form, res.data.data[0]);
+ this.loading = false;
+ }
+ );
+ return;
+ }
+
},
setReferValue(data) {
if (data.field) {
--
Gitblit v1.9.3