From 2bfad65f3f4ed0282f53e3ae01fc10c879a734bc Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 09 十一月 2023 10:03:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 9f69e9b..90e1442 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,13 +26,14 @@
</template>
<template :slot="item.prop + ''" v-for="item in slotColumnList">
<vciWebRefer
- :key="item.prop" :data-key="item.prop"
+ :key="item.dataKey" :data-key="item.dataKey"
v-if="item.type == 'refer'"
:referConfig="item.referConfig || {}"
:value="form[item.referConfig.field] || item.value"
:text="form[item.referConfig.showField]"
:disabled="item.disabled"
:display="item.display"
+ :reloadData="item.referConfig.reloadData || false"
@setReferValue="setReferValue"
></vciWebRefer>
</template>
@@ -42,7 +43,7 @@
<script>
import { getFormDetail } from "@/api/formTemplate";
-import { getDictionary } from "../../api/system/dict";
+import { getEnumDictionary } from "../../api/system/dict";
import vciWebRefer from "../refer/vciWebRefer.vue";
export default {
name: "FormTemplate",
@@ -61,6 +62,10 @@
type: String,
default: "",
},
+ LoadingStatus:{
+ type: String,
+ default : "code"
+ },
// 鍒楄〃鏁版嵁oid
rowOid: {
type: String,
@@ -69,7 +74,7 @@
// 琛ㄥ崟绫诲瀷锛坅dd, edit, detail锛�
type: {
type: String,
- default: "add",
+ default: "",
},
// 鑷畾涔夎〃鍗曠被鍨�
selfColumnType: {
@@ -96,6 +101,8 @@
},
data() {
return {
+ codeattrsecValue:'',
+ ValidataValue:false,
eventFlag:{},
TreeValueForm:'',
updateIndex: 0,
@@ -127,8 +134,12 @@
mounted() {
this.handleResize();
},
+ updated() {
+ },
created() {
-
+ if (this.LoadingStatus === 'code') {
+ this.loading = false;
+ }
},
computed: {
localTrendsSpan() {
@@ -158,7 +169,7 @@
},
deep:true,
immediate:true
- }
+ },
},
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
@@ -217,7 +228,17 @@
formItem.fieldMap[fieldMapKey]='id'
formItem.fieldMap[formItem.field+'id']='id'
}
+
+
let columnItem = {
+ change:(val)=>{
+ // console.log(val)
+ if(val.column.field === "drawingno"){
+ this.codeattrsecValue=val.value;
+ }
+ console.log(this.codeattrsecValue)
+ },
+ dataKey:formItem.dataKey || formItem.field,
label: formItem.text,
labelslot: true,
prop: this.$utilFunc.isValuableObj(formItem.referConfig)
@@ -235,7 +256,8 @@
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.codeattrsecValue : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
@@ -274,10 +296,12 @@
},
],
props: {
- label: "value",
+ label: "itemName",
value: "key",
},
};
+ // console.log('formItem',formItem)
+ // console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
if (group.length === 0) {
column.push(columnItem);
@@ -301,6 +325,7 @@
changeChildItem(items,TreeValue) {
let column = this.option.column;
let group = this.option.group;
+ let that=this;
items.forEach((item) => {
let formItem = this.resetFormConfig(item);
if (formItem.field == "lcstatus") {
@@ -384,22 +409,22 @@
};
if (group.length === 0) {
- this.slotColumnList.forEach((index, colItem) => {
+ that.slotColumnList.forEach((colItem,index) => {
if (colItem.field == columnItem.field) {
- this.slotColumnList[index] = columnItem;
+ that.slotColumnList[index] = columnItem;
column[index] = columnItem;
return;
}
})
} else {
- this.slotColumnList.forEach((index, colItem) => {
+ that.slotColumnList.forEach((colItem,index) => {
if (colItem.field == columnItem.field) {
- this.slotColumnList[index] = columnItem;
+ that.slotColumnList[index] = columnItem;
return;
}
})
- group.forEach((index, groupItem) => {
- groupItem.column.forEach((colIndex, colItem) => {
+ group.forEach((groupItem,index) => {
+ groupItem.column.forEach((colItem,colIndex) => {
if (colItem.field == columnItem.field) {
group[index].column[colIndex] = columnItem;
return;
@@ -408,8 +433,8 @@
});
}
});
- this.$set(this.option, "column", column);
- this.$set(this.option, "group", group);
+ that.$set(that.option, "column", column);
+ that.$set(that.option, "group", group);
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
@@ -477,7 +502,8 @@
// 寮傛鑾峰彇瀛楀吀鏁版嵁
geDictData(dictKeys) {
dictKeys.forEach((dictObj) => {
- getDictionary({ code: dictObj.dictKey }).then((res) => {
+ getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
+ console.log(res)
if (res.data && res.data.code === 200) {
this.option.column = this.option.column.map((item) => {
if (item.field === dictObj.field) {
@@ -501,6 +527,7 @@
if (valid) {
done();
resolve(true);
+ this.ValidataValue=true;
} else {
resolve(false);
}
--
Gitblit v1.9.3