From 9e9e1ea397c2a434488dbf981cfc6d57f8ff44a8 Mon Sep 17 00:00:00 2001
From: hreenshan112 <hreenshan112@noreply.gitcode.com>
Date: Fri, 11 Oct 2024 13:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=90=E8=A1=A8=E5=86=85?=
 =?UTF-8?q?=E7=9A=84=E8=81=94=E7=B3=BB=E5=9C=B0=E5=9D=80=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/public/form/childTable.vue  | 11 +++++++----
 src/components/DesignForm/public/form/formItem.vue    |  1 +
 .../DesignForm/tableListPage/formPageCont.vue         |  1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue
index c4b8abd..9302203 100644
--- a/src/components/DesignForm/public/form/childTable.vue
+++ b/src/components/DesignForm/public/form/childTable.vue
@@ -53,9 +53,9 @@ const addColumn = () => {
     }
 }
 const getText = (text: any,val:any,name:any) => {
-	console.log("text===>",text)
-	console.log("name===>",name)
-	console.log("val===>",val)
+	// console.log("text===>",text)
+	// console.log("name===>",name)
+	// console.log("val===>",val)
     if (typeof text === 'string') {
       	return text
     } else {
@@ -93,6 +93,7 @@ const timeToAry = (timestamp:number) => {
 @ 功能: 将时间戳转换成字符串
 */
 const timeToString = (timeVal:any,types:int) => {
+	// console.log("将时间戳转换成字符串",timeVal,types)
 	let timeStr = ""
 	if(Array.isArray(timeVal)){
 		if(timeVal.length >= 2){
@@ -169,7 +170,7 @@ const timeToString = (timeVal:any,types:int) => {
 			case  "week":	//周
 				timeStr = getYearWeek(timeVal)
 				break;
-			case "timeCalss": //时间
+			case "timePicker": //时间
 				timeStr = `${hours}:${minutes}:${seconds}`;
 				break;
 			default:
@@ -210,6 +211,8 @@ const timeToString = (timeVal:any,types:int) => {
 						</div>
 						<div v-else-if="item.type=='datePicker'" v-html="timeToString(scope.row[item.name],item.control.type)">
 						</div>
+						<div v-else-if="item.type=='timePicker'" v-html="timeToString(scope.row[item.name],item.type)">
+						</div>
 						<div v-else>{{ getText(scope.row[item.name],scope.row,item.name) }}</div>
 					</div>
 					<div v-else>
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 57c69ff..ab16857 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -670,6 +670,7 @@ const judgeIsDisabled = (key:string)  => {
 @ 功能: 将时间戳转换成字符串
 */
 const timeToString = (timeVal:any,types:int) => {
+	// console.log("将时间戳转换成字符串",timeVal,types)
 	let timeStr = ""
 	if(Array.isArray(timeVal)){
 		if(timeVal.length >= 2){
diff --git a/src/components/DesignForm/tableListPage/formPageCont.vue b/src/components/DesignForm/tableListPage/formPageCont.vue
index 75f39d0..04337ed 100644
--- a/src/components/DesignForm/tableListPage/formPageCont.vue
+++ b/src/components/DesignForm/tableListPage/formPageCont.vue
@@ -417,6 +417,7 @@ const jsuanKuandu = () => {
 						</el-tabs>
 						<el-tabs v-if="item.sunData" type="border-card" style="margin-top:20px;">
 							<el-tab-pane v-for="(sonItem,sonIndex) in item.sunData" :label="sonIndex" :key="sonIndex">
+							
 								<el-descriptions v-for="(sonVal,sonIndex) in sonItem" :key="sonIndex" border>
 									<el-descriptions-item v-for="(sonCentor,sonKey) in sonVal" :key="sonKey" width="150px" >	
 										<template #label>