Browse Source

代码提交

maotao 4 days ago
parent
commit
fecfd5decf
1 changed files with 9 additions and 8 deletions
  1. 9 8
      pages/receipt_infopage/receipt_infopage.vue

+ 9 - 8
pages/receipt_infopage/receipt_infopage.vue

@@ -1740,15 +1740,16 @@
1740 1740
           if (res.status == 200) {
1741 1741
 						if(res.data.checkList){
1742 1742
 							res.data.checkList.forEach(e =>{
1743
-								e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
1744
-								if(e.endCheckTime){
1745
-									e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
1746
-									e.yyEndTime = e.newTime +'--'+ e.newTime2
1743
+								if(e.yyTime){
1744
+									e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
1745
+									if(e.endCheckTime){
1746
+										e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
1747
+										e.yyEndTime = e.newTime +'--'+ e.newTime2
1748
+									}else{
1749
+										e.yyEndTime = e.newTime
1750
+									}
1747 1751
 								}else{
1748
-									// let date = dayjs(new Date(e.yyTime));
1749
-									// let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
1750
-									// e.newTime2 = newDate.format('HH:mm');
1751
-									e.yyEndTime = e.newTime
1752
+									e.yyEndTime = null
1752 1753
 								}
1753 1754
 							})
1754 1755
 						}