Просмотр исходного кода

refactor: 工程变更、材料调差审批时间加上时分秒

lanjianrong 5 лет назад
Родитель
Сommit
d4808735d1
4 измененных файлов с 164 добавлено и 160 удалено
  1. 34 30
      app/extend/helper.js
  2. 33 33
      app/view/change/info_modal.ejs
  3. 31 31
      app/view/material/audit_modal.ejs
  4. 66 66
      app/view/stage/audit_modal.ejs

+ 34 - 30
app/extend/helper.js

@@ -846,64 +846,68 @@ module.exports = {
         return overWan ? getWan(overWan) + '万' + getWan(noWan) : getWan(num);
     },
     formatNum(num, pattern) {
-        var strarr = num?num.toString().split('.'):['0'];
-        var fmtarr = pattern?pattern.split('.'):[''];
-        var retstr='';
+        const strarr = num ? num.toString().split('.') : ['0'];
+        const fmtarr = pattern ? pattern.split('.') : [''];
+        let retstr = '';
 
         // 整数部分
-        var str = strarr[0];
-        var fmt = fmtarr[0];
-        var i = str.length-1;
-        var comma = false;
-        for(var f=fmt.length-1;f>=0;f--){
-            switch(fmt.substr(f,1)){
+        let str = strarr[0];
+        let fmt = fmtarr[0];
+        let i = str.length - 1;
+        let comma = false;
+        for (var f = fmt.length - 1; f >= 0; f--) {
+            switch (fmt.substr(f, 1)) {
                 case '#':
-                    if(i>=0 ) retstr = str.substr(i--,1) + retstr;
+                    if (i >= 0) retstr = str.substr(i--, 1) + retstr;
                     break;
                 case '0':
-                    if(i>=0) retstr = str.substr(i--,1) + retstr;
+                    if (i >= 0) retstr = str.substr(i--, 1) + retstr;
                     else retstr = '0' + retstr;
                     break;
                 case ',':
                     comma = true;
-                    retstr=','+retstr;
+                    retstr = ',' + retstr;
                     break;
             }
         }
-        if(i>=0){
-            if(comma){
-                var l = str.length;
-                for(;i>=0;i--){
-                    retstr = str.substr(i,1) + retstr;
-                    if(i>0 && ((l-i)%3)==0) retstr = ',' + retstr;
+        if (i >= 0) {
+            if (comma) {
+                const l = str.length;
+                for (;i >= 0; i--) {
+                    retstr = str.substr(i, 1) + retstr;
+                    if (i > 0 && ((l - i) % 3) == 0) retstr = ',' + retstr;
                 }
-            }
-            else retstr = str.substr(0,i+1) + retstr;
+            } else retstr = str.substr(0, i + 1) + retstr;
         }
 
-        retstr = retstr+'.';
+        retstr = retstr + '.';
         // 处理小数部分
-        str=strarr.length>1?strarr[1]:'';
-        fmt=fmtarr.length>1?fmtarr[1]:'';
-        i=0;
-        for(var f=0;f<fmt.length;f++){
-            switch(fmt.substr(f,1)){
+        str = strarr.length > 1 ? strarr[1] : '';
+        fmt = fmtarr.length > 1 ? fmtarr[1] : '';
+        i = 0;
+        for (var f = 0; f < fmt.length; f++) {
+            switch (fmt.substr(f, 1)) {
                 case '#':
-                    if(i<str.length) retstr+=str.substr(i++,1);
+                    if (i < str.length) retstr += str.substr(i++, 1);
                     break;
                 case '0':
-                    if(i<str.length) retstr+= str.substr(i++,1);
-                    else retstr+='0';
+                    if (i < str.length) retstr += str.substr(i++, 1);
+                    else retstr += '0';
                     break;
             }
         }
-        return retstr.replace(/^,+/,'').replace(/\.$/,'');
+        return retstr.replace(/^,+/, '').replace(/\.$/, '');
     },
 
     dateTran(time) {
         return moment(time).format('YYYY年MM月DD日 HH:mm');
     },
 
+    // 审批日期格式:2020-5-7 9:40:30
+    formatFullDate(time) {
+        return moment(time).format('YYYY-MM-DD HH:mm:ss');
+    },
+
     timeAdd(duration) {
         const d = parseInt(duration);
         let time = 0;

+ 33 - 33
app/view/change/info_modal.ejs

@@ -287,17 +287,17 @@
                                                     <% if (al.usite === 0 && al.status === 2) { %>
                                                         <span>重新上报中</span>
                                                     <% } else if (al.usite === 0 && al.status === 3) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>上报</span>
                                                     <% } else if (al.usite !== 0 && al.status === 2) { %>
                                                         <span>审批中</span>
                                                     <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                                     <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                                     <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
                                                     <% } else if (al.usite !== 0 && al.status === 7) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批 </span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批 </span>
                                                     <% } %>
                                                     <% if (al.sdesc !== '' && al.sdesc !== null) { %>
                                                         <p class="card-text"><%- al.sdesc %></p>
@@ -404,19 +404,19 @@
                                         <% if (al.usite === 0 && al.status === 2) { %>
                                             <span>重新上报中</span>
                                         <% } else if (al.usite === 0 && al.status === 3 && al.times === 1) { %>
-                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>上报</span>
                                         <% } else if (al.usite === 0 && al.status === 3 && al.times !== 1) { %>
-                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新上报</span>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新上报</span>
                                         <% } else if (al.usite !== 0 && al.status === 2) { %>
                                             <span>审批中</span>
                                         <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                         <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                            <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                            <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                         <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
+                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
                                         <% } else if (al.usite !== 0 && al.status === 7) { %>
-                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
+                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批</span>
                                         <% } %>
                                         <% if (al.sdesc !== '' && al.sdesc !== null) { %>
                                             <p class="card-text"><%- al.sdesc %></p>
@@ -499,19 +499,19 @@
                                                     <% if (al.usite === 0 && al.status === 2) { %>
                                                         <span>重新上报中</span>
                                                     <% } else if (al.usite === 0 && al.status === 3 && al.times === 1) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>上报</span>
                                                     <% } else if (al.usite === 0 && al.status === 3 && al.times !== 1) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新上报</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新上报</span>
                                                     <% } else if (al.usite !== 0 && al.status === 2) { %>
                                                         <span>审批中</span>
                                                     <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                                     <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                                     <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList4[time][0].name %><% } %></span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList4[time][0].name %><% } %></span>
                                                     <% } else if (al.usite !== 0 && al.status === 7) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批</span>
                                                     <% } %>
                                                     <% if (al.sdesc !== '' && al.sdesc !== null) { %>
                                                         <p class="card-text"><%- al.sdesc %></p>
@@ -532,7 +532,7 @@
                                                 <%= a.name %>&nbsp;<small class="text-muted"><%= a.jobs%></small><span class="pull-right">原报</span>
                                             </h5>
                                             <div class="ml-3">
-                                                <span class="text-success"><small><%= moment(a.sin_time).format('YYYY-MM-DD') %> </small><span class="text-success"><% if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>重新<% } %>上报</span></span>
+                                                <span class="text-success"><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %> </small><span class="text-success"><% if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>重新<% } %>上报</span></span>
                                             </div>
                                         <% } else { %>
                                             <h5 class="card-title">
@@ -541,13 +541,13 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (a.status === 3) { %>
-                                                    <span class="text-success"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                    <span class="text-success"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                                 <% } else if (a.status === 4) { %>
-                                                    <span class="text-danger"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                    <span class="text-danger"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                                 <% } else if (a.status === 6) { %>
-                                                <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回</span>
+                                                <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回</span>
                                                 <% } else if (a.status === 7) { %>
-                                                    <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
+                                                    <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批</span>
                                                 <% } %>
                                                 <p class="card-text"><%- a.sdesc %></p>
                                             </div>
@@ -646,19 +646,19 @@
                                                     <% if (al.usite === 0 && al.status === 2) { %>
                                                         <span>重新上报中</span>
                                                     <% } else if (al.usite === 0 && al.status === 3 && al.times === 1) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>上报</span>
                                                     <% } else if (al.usite === 0 && al.status === 3 && al.times !== 1) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新上报</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新上报</span>
                                                     <% } else if (al.usite !== 0 && al.status === 2) { %>
                                                         <span>审批中</span>
                                                     <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                                     <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                                     <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList4[time][0].name %><% } %></span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList4[time][0].name %><% } %></span>
                                                     <% } else if (al.usite !== 0 && al.status === 7) { %>
-                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批</span>
                                                     <% } %>
                                                     <% if (al.sdesc !== '' && al.sdesc !== null) { %>
                                                         <p class="card-text"><%- al.sdesc %></p>
@@ -679,7 +679,7 @@
                                                     <%= a.name %>&nbsp;<small class="text-muted"><%= a.jobs%></small><span class="pull-right">原报</span>
                                                 </h5>
                                                 <div class="ml-3">
-                                                    <span class="text-success"><small><%= moment(a.sin_time).format('YYYY-MM-DD') %> </small><span class="text-success"><% if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>重新<% } %>上报</span></span>
+                                                    <span class="text-success"><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %> </small><span class="text-success"><% if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>重新<% } %>上报</span></span>
                                                 </div>
                                             <% } else { %>
                                                 <h5 class="card-title">
@@ -688,13 +688,13 @@
                                                 </h5>
                                                 <div class="ml-3">
                                                     <% if (a.status === 3) { %>
-                                                        <span class="text-success"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                        <span class="text-success"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批通过</span>
                                                     <% } else if (a.status === 4) { %>
-                                                        <span class="text-danger"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                        <span class="text-danger"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批终止</span>
                                                     <% } else if (a.status === 6) { %>
-                                                        <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回</span>
+                                                        <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>审批退回</span>
                                                     <% } else if (a.status === 7) { %>
-                                                        <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
+                                                        <span class="text-warning"><% if (a.sin_time !== null) { %><small><%= moment(a.sin_time).format('YYYY-MM-DD HH:mm:ss') %></small> <% } %>重新审批</span>
                                                     <% } %>
                                                     <p class="card-text"><%- a.sdesc %></p>
                                                 </div>

+ 31 - 31
app/view/material/audit_modal.ejs

@@ -92,7 +92,7 @@
                                                     <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                                 </h5>
                                                 <div class="ml-3">
-                                                    <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                 </div>
                                             </li>
                                             <li class="list-group-item">
@@ -101,7 +101,7 @@
                                                 </h5>
                                                 <div class="ml-3">
                                                     <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                     <% } %>
                                                     <p class="card-text"><%- ah[iA].opinion %></p>
                                                 </div>
@@ -113,7 +113,7 @@
                                                 </h5>
                                                 <div class="ml-3">
                                                     <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                     <% } %>
                                                     <p class="card-text"><%- ah[iA].opinion %></p>
                                                 </div>
@@ -125,7 +125,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -142,7 +142,7 @@
                                         <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- ctx.material.auditors[0].begin_time.toLocaleDateString() %></small> 上报</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.material.auditors[0].begin_time) %></small> 上报</span>
                                     </div>
                                 </li>
                                 <% for (let iA = 0; iA < ctx.material.auditors.length; iA++) { %>
@@ -153,7 +153,7 @@
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down text-success' : 'fa fa-stop-circle text-success') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small><span class="pull-right"><%= auditors[iA].sort === auditors[iA].max_sort ? '终' : ctx.helper.transFormToChinese(auditors[iA].sort) %>审</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- auditors[iA].end_time.toLocaleDateString() %></small> 审批通过</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].end_time) %></small> 审批通过</span>
                                         <p class="card-text"><%- auditors[iA].opinion %></p>
                                     </div>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
@@ -233,7 +233,7 @@
                                                     <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                                 </h5>
                                                 <div class="ml-3">
-                                                    <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                 </div>
                                             </li>
                                             <li class="list-group-item">
@@ -242,7 +242,7 @@
                                                 </h5>
                                                 <div class="ml-3">
                                                     <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                     <% } %>
                                                     <p class="card-text"><%- ah[iA].opinion %></p>
                                                 </div>
@@ -254,7 +254,7 @@
                                                 </h5>
                                                 <div class="ml-3">
                                                     <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                        <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                     <% } %>
                                                     <p class="card-text"><%- ah[iA].opinion %></p>
                                                 </div>
@@ -266,7 +266,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -283,7 +283,7 @@
                                         <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- ctx.material.auditors[0].begin_time.toLocaleDateString() %></small> 上报</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.material.auditors[0].begin_time) %></small> 上报</span>
                                     </div>
                                 </li>
                                 <% for (let iA = 0; iA < ctx.material.auditors.length; iA++) { %>
@@ -294,7 +294,7 @@
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down text-success' : 'fa fa-stop-circle text-success') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small><span class="pull-right"><%= auditors[iA].sort === auditors[iA].max_sort ? '终' : ctx.helper.transFormToChinese(auditors[iA].sort) %>审</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- auditors[iA].end_time.toLocaleDateString() %></small> 审批通过</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].end_time) %></small> 审批通过</span>
                                         <p class="card-text"><%- auditors[iA].opinion %></p>
                                     </div>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
@@ -376,7 +376,7 @@
                                         <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                     </div>
                                 </li>
                                 <li class="list-group-item">
@@ -385,7 +385,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                     </div>
@@ -397,7 +397,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                     </div>
@@ -409,7 +409,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                     </div>
@@ -439,7 +439,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (auditors[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- auditors[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(auditors[iA].end_time) %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- auditors[iA].opinion %></p>
                                     </div>
@@ -451,7 +451,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (auditors[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- auditors[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(auditors[iA].end_time) %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- auditors[iA].opinion %></p>
                                     </div>
@@ -463,7 +463,7 @@
                                     </h5>
                                     <div class="ml-3">
                                         <% if (auditors[iA].status !== auditConst.status.uncheck) { %>
-                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- auditors[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                            <span class="<%- auditConst.statusClass[auditors[iA].status] %>"><% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(auditors[iA].end_time) %></small> <% } %><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                         <% } %>
                                         <p class="card-text"><%- auditors[iA].opinion %></p>
                                     </div>
@@ -522,7 +522,7 @@
                                                 <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                             </h5>
                                             <div class="ml-3">
-                                                <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                             </div>
                                         </li>
                                         <li class="list-group-item">
@@ -531,7 +531,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -543,7 +543,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -555,7 +555,7 @@
                                         </h5>
                                         <div class="ml-3">
                                             <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                             <% } %>
                                             <p class="card-text"><%- ah[iA].opinion %></p>
                                         </div>
@@ -613,7 +613,7 @@
                                                 <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span>
                                             </h5>
                                             <div class="ml-3">
-                                                <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                             </div>
                                         </li>
                                         <li class="list-group-item">
@@ -622,7 +622,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -634,7 +634,7 @@
                                             </h5>
                                             <div class="ml-3">
                                                 <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                    <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                 <% } %>
                                                 <p class="card-text"><%- ah[iA].opinion %></p>
                                             </div>
@@ -646,7 +646,7 @@
                                         </h5>
                                         <div class="ml-3">
                                             <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                             <% } %>
                                             <p class="card-text"><%- ah[iA].opinion %></p>
                                         </div>
@@ -706,7 +706,7 @@
                                                 <li class="list-group-item">
                                                     <h5 class="card-title"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.material.user.name %> <small class="text-muted"><%- ctx.material.user.role %></small><span class="pull-right">原报</span></h5>
                                                     <div class="ml-3">
-                                                        <span class="text-success"><small><%- ah[iA].begin_time.toLocaleDateString() %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.material.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                         <p class="card-text"></p>
                                                     </div>
 
@@ -717,7 +717,7 @@
                                                     </h5>
                                                     <div class="ml-3">
                                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                         <% } %>
                                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                                     </div>
@@ -727,7 +727,7 @@
                                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small><span class="pull-right">终审</span></h5>
                                                     <div class="ml-3">
                                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                         <% } %>
                                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                                     </div>
@@ -739,7 +739,7 @@
                                                     </h5>
                                                     <div class="ml-3">
                                                         <% if (ah[iA].status !== auditConst.status.uncheck) { %>
-                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ah[iA].end_time.toLocaleDateString() %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
+                                                            <span class="<%- auditConst.statusClass[ah[iA].status] %>"><% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %><small><%- ctx.helper.formatFullDate(ah[iA].end_time) %></small> <% } %><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.material.user.name %><% } %></span>
                                                         <% } %>
                                                         <p class="card-text"><%- ah[iA].opinion %></p>
                                                     </div>

Разница между файлами не показана из-за своего большого размера
+ 66 - 66
app/view/stage/audit_modal.ejs