diff --git a/src/views/formTable/pageInfo.vue b/src/views/formTable/pageInfo.vue index 391146b..71ceceb 100644 --- a/src/views/formTable/pageInfo.vue +++ b/src/views/formTable/pageInfo.vue @@ -88,6 +88,33 @@ watch(() => openPage.value,(val:boolean) => { .then(({ data }) => { console.log("获取自定义表单内容---->", data, data.structure); props.stateForm.formData = stringToObj(data.structure.mastesform); + //liwenxuan 修复 子表日期选择器 区间情况bug start + let tableDatePickerRangeArr: any[] = [] + props.stateForm.formData.list.forEach((element: any) => { + if(element.type=="table"){ + element.list.forEach((item: any) => { + if(item.type=="datePicker"){ + if(item.control.type=="monthrange"||item.control.type=="daterange"||item.control.type=="datetimerange"){ + let str: string[] = [] + str.push(element.name) + str.push(item.name) + tableDatePickerRangeArr.push(str) + } + } + }); + } + }); + tableDatePickerRangeArr.forEach(element => { + let tableName = element[0] + let datePickerName = element[1] + data.tableData[tableName].forEach((item: any) => { + let arr = [] + arr.push(item[datePickerName]) + arr.push(item[datePickerName+"_end"]) + item[datePickerName] = arr + }); + }); + //liwenxuan 修复 子表日期选择器 区间情况bug end props.stateForm.dict = string2json(data.structure.dict); if(props.stateForm.type != 3){ judgeSubmitCancel({ name: data.structure.mastesformjson }).then((data: any) => {