From 505bd90a7f28f7bdf7806f499a9a1cf12cf7937f Mon Sep 17 00:00:00 2001
From: han2015 <1019850453@qq.com>
Date: Wed, 17 Dec 2025 10:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9A=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/printHtmlRender.vue | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/components/DesignForm/printHtmlRender.vue b/src/components/DesignForm/printHtmlRender.vue
index 82512bf..8d7520f 100644
--- a/src/components/DesignForm/printHtmlRender.vue
+++ b/src/components/DesignForm/printHtmlRender.vue
@@ -39,16 +39,19 @@ const props = withDefaults(defineProps<{
 const qrdata=ref("")
 const userName=useUserStore().nickname;
 
-function parseDataPicker(val:string){
+function parseDataPicker(val:string,vtype:string){
   let str:string;
   if(typeof(val)=="number"){
     str=new Date(val).toLocaleString()
-  }else{
-    if(val==""|| val.match(/[a-z]/) ) return val;
+  }else{//"";2025-12-17;sheng1chan3ri4qi1;三种值直接返回
+    if(val==""|| val.match(/[a-z-:.]/) ) return val;
     str=new Date(parseInt(val)).toLocaleString()
   }
   
-  return str.slice(0,10)+" "+str.slice(11,16)
+  if(vtype.startsWith("time")){
+    return str.slice(11,16)
+  }
+  return str.slice(0,10)
 }
 
 const generateQrCode= ()=>{
@@ -100,7 +103,7 @@ const getStateText=(val:number)=>{
               {{item.name}}
             </span>
             <span v-if="item.type !=='datePicker'" class="content">{{item.field}}</span>
-            <span v-else class="content">{{parseDataPicker(item.field)}}</span>
+            <span v-else class="content">{{parseDataPicker(item.field,item.type)}}</span>
           </div>
         </template>
     </div>
@@ -122,7 +125,14 @@ const getStateText=(val:number)=>{
         <tbody>
           <tr v-for="(dd, index) in group.data" :key="dd">
             <template v-for="child in group.child">
-              <td v-if="child.checked!=2" >{{ dd[child.field]}}</td>
+              <td v-if="child.checked!=2">
+                <template v-if="child.type.includes('Picker')">
+                  {{parseDataPicker(dd[child.field],child.type)}}
+                </template>
+                <template v-else>
+                  {{dd[child.field]}}
+                </template>
+              </td>
             </template>
           </tr>
         </tbody>
@@ -138,7 +148,7 @@ const getStateText=(val:number)=>{
                 {{item.name}}
               </span>
               <span v-if="item.type !=='datePicker'" class="content">{{item.field}}</span>
-              <span v-else class="content">{{parseDataPicker(item.field)}}</span>
+              <span v-else class="content">{{parseDataPicker(item.field,item.type)}}</span>
             </div>
           </template>
         </div>
@@ -161,7 +171,14 @@ const getStateText=(val:number)=>{
             <tbody>
               <tr v-for="(dd, index) in tabs.data" :key="dd">
                 <template v-for="child in tabs.child">
-                  <td v-if="child.checked!=2" >{{ dd[child.field]}}</td>
+                  <td v-if="child.checked!=2" >
+                    <template v-if="child.type.includes('Picker')">
+                      {{parseDataPicker(dd[child.field],child.type)}}
+                    </template>
+                    <template v-else>
+                      {{dd[child.field]}}
+                    </template>
+                  </td>
                 </template>
               </tr>
             </tbody>
@@ -172,7 +189,7 @@ const getStateText=(val:number)=>{
             {{tabs.name}}
           </span>
           <span v-if="tabs.type !=='datePicker'" class="content">{{tabs.field}}</span>
-          <span v-else class="content">{{parseDataPicker(tabs.field??'')}}</span>
+          <span v-else class="content">{{parseDataPicker(tabs.field??'',tabs.type)}}</span>
         </div>
 
       </div>