From 7225108e501b5288a1a964303f5e408dfe3f462b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 10 十一月 2023 16:08:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 2f3f08b..f16ba65 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -43,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 +61,10 @@
codeClassifyOid: {
type: String,
default: "",
+ },
+ LoadingStatus:{
+ type: String,
+ default : "code"
},
// 鍒楄〃鏁版嵁oid
rowOid: {
@@ -97,6 +101,9 @@
},
data() {
return {
+ add:'',
+ codeattrsecValue:'',
+ ValidataValue:false,
eventFlag:{},
TreeValueForm:'',
updateIndex: 0,
@@ -128,8 +135,12 @@
mounted() {
this.handleResize();
},
+ updated() {
+ },
created() {
-
+ if (this.LoadingStatus === 'code') {
+ this.loading = false;
+ }
},
computed: {
localTrendsSpan() {
@@ -159,7 +170,7 @@
},
deep:true,
immediate:true
- }
+ },
},
methods: {
// 娓叉煋琛ㄥ崟妯℃澘
@@ -218,7 +229,15 @@
formItem.fieldMap[fieldMapKey]='id'
formItem.fieldMap[formItem.field+'id']='id'
}
+
+
let columnItem = {
+ change:(val)=>{
+ if(val.column.field === "drawingno"){
+ this.codeattrsecValue=val.value;
+ }
+ // console.log(this.codeattrsecValue)
+ },
dataKey:formItem.dataKey || formItem.field,
label: formItem.text,
labelslot: true,
@@ -237,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.add : null),
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
tip: formItem.tooltips,
@@ -280,6 +300,8 @@
value: "key",
},
};
+ // console.log('formItem',formItem)
+ // console.log('columnItem',columnItem)
slotColumnList.push(columnItem);
if (group.length === 0) {
column.push(columnItem);
@@ -325,6 +347,9 @@
formItem.fieldMap[formItem.field + 'id'] = 'id'
}
let columnItem = {
+ change:(val)=>{
+ console.log('1',val)
+ },
label: formItem.text,
labelslot: true,
prop: this.$utilFunc.isValuableObj(formItem.referConfig)
@@ -431,6 +456,7 @@
if (Object.hasOwnProperty.call(element, newAttr)) {
const oldAttr = element[newAttr];
formItem[newAttr] = formItem[oldAttr];
+
}
}
} else if (configType === "directVoluation") {
@@ -480,13 +506,13 @@
// 寮傛鑾峰彇瀛楀吀鏁版嵁
geDictData(dictKeys) {
dictKeys.forEach((dictObj) => {
- getDictionary({ code: dictObj.dictKey }).then((res) => {
+ getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
if (res.data && res.data.code === 200) {
this.option.column = this.option.column.map((item) => {
if (item.field === dictObj.field) {
let dictData = (res.data.data || []).map((itm) => {
- itm.value = itm.dictValue;
- itm.key = itm.dictKey;
+ itm.value = itm.itemName;
+ itm.key = itm.itemValue;
return itm;
});
item.dicData = dictData;
@@ -504,6 +530,7 @@
if (valid) {
done();
resolve(true);
+ this.ValidataValue=true;
} else {
resolve(false);
}
--
Gitblit v1.9.3