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}} {{item.field}} - {{parseDataPicker(item.field)}} + {{parseDataPicker(item.field,item.type)}} @@ -122,7 +125,14 @@ const getStateText=(val:number)=>{