diff --git a/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue b/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue index 2759ddf..957658e 100644 --- a/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue +++ b/src/components/DesignForm/app/calendar/calendar1/calendarPage.vue @@ -164,13 +164,15 @@ const goTady = () => { const calendarSearchData = (val:any) => { switch(curtteDayType.value){ case 2: + weekPageRef.value.searchatWeekList(val) break; case 3: dayPageRef.value.searchatDayList(val); default: + monthPageRef.value.searchatMonthList(val); break; } - // console.log("查询数据",props.searchSend) + console.log("查询数据",curtteDayType.value,props.searchSend) } defineExpose({ calendarSearchData diff --git a/src/components/DesignForm/app/calendar/calendar1/dayPage.vue b/src/components/DesignForm/app/calendar/calendar1/dayPage.vue index 5445a69..3ee79cc 100644 --- a/src/components/DesignForm/app/calendar/calendar1/dayPage.vue +++ b/src/components/DesignForm/app/calendar/calendar1/dayPage.vue @@ -91,7 +91,7 @@ const searchatDayList = (val:any) => { dayType:"", mapWord:"" } - // console.log("获取每天数据",val) + console.log("获取每天数据",val) let sendInfo = { search:val, timeAry:[dayInfo.value] diff --git a/src/components/DesignForm/app/calendar/calendar1/monthPage.vue b/src/components/DesignForm/app/calendar/calendar1/monthPage.vue index cec6012..3f35db3 100644 --- a/src/components/DesignForm/app/calendar/calendar1/monthPage.vue +++ b/src/components/DesignForm/app/calendar/calendar1/monthPage.vue @@ -88,13 +88,13 @@ const searchatMonthList = (val:any) => { dayType:"", mapWord:"" } - // console.log("获取每天数据",val) + console.log("获取每天数据",val) let sendInfo = { search:val, timeMonthAry:TBody.value, types:1 } - // console.log("获取每天数据条件",sendInfo) + console.log("获取每天数据条件",sendInfo) gainCalendarList(sendInfo) .then(({data})=>{ // console.log("获取月份数据",data) @@ -104,7 +104,7 @@ const searchatMonthList = (val:any) => { } defineExpose({ - gainCalendarList + searchatMonthList }) diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index 5081fde..f3a013f 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -341,14 +341,14 @@ const getPageData = () => { switch(viewType.value){ case 2: nextTick(()=>{ - // console.log("获取列表详细信息-------555---------->",calendarPageRef.value) + console.log("获取列表详细信息-------555---------->",calendarPageRef.value) calendarPageRef.value.calendarSearchData(sendData) }) // calendarPageRef.value.calendarSearchData() break; case 3: nextTick(()=>{ - // console.log("获取列表详细信息-------222---------->",timeAxisRef.value) + console.log("获取列表详细信息-------222---------->",timeAxisRef.value) timeAxisRef.value.searchTimeList(sendData,1) }) diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 481b9fa..3bea718 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -1065,7 +1065,7 @@ const controlChange = (obj: any, val: any) => { if(val != ""){ let ary = ["founder","founderTime","editTime","owner","deptOrg"] if (!ary.includes(controlData.value.type)){ - if(!props.formField.includes(controlData.value.name)){ + if(Array.isArray(props.formField) && !props.formField.includes(controlData.value.name)){ chineseToPinyin({title:val,types:8,connector:"",formJson:JSON.stringify(props.formInfo)}) .then((data:any)=>{ if(data.code == 0){ @@ -1555,9 +1555,13 @@ const isNotWrite = (val:any) =>{ return false } const isNotWriteWord = (val:any) =>{ - - if(val.eventName === "filedNameKey" && props.customerformid != "" && props.formField.includes(val.value)){ - return true + console.log("isNotWriteWord---->",val) + console.log("isNotWriteWord--formField-->",props.formField) + if(val.eventName === "filedNameKey" && props.customerformid != "" && props.formField && Array.isArray(props.formField) && props.formField.includes(val.value) ){ + // if(props.formField.includes(val.value)){ + return true + // } + } return false } diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index 0c73be8..c1c407d 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -420,7 +420,7 @@ function optionsValue3Get1(data: any,fieldName: string){ v-if="linksIf(element)" > - {{element.type}} + {{ element.type}}