Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/report/js/rpt_signature.js

@@ -287,8 +287,10 @@ let rptSignatureHelper = {
                         //只有在审批人通过后才获取审批时间
                         // let dt = new Date(stga.end_time);
                         dftDate = (new Date(stga.end_time)).Format('yyyy-MM-dd');
+                    } else {
+                        dftDate = '';
                     }
-                    break;
+                    // break; // 实际情况：有可能会有多次审核，要取最后一次
                 }
             }
         }
@@ -564,9 +566,14 @@ let rptSignatureHelper = {
                 if (role_rel.sign_date === undefined || role_rel.sign_date ===  null || role_rel.sign_date ===  '') {
                     for (const stg_audit of STAGE_AUDIT) {
                         if (role_rel.acc_id === stg_audit.aid) {
-                            role_rel.sign_date = stg_audit.end_time;
-                            rptSignatureHelper.originalRoleRelList[rridx].sign_date = stg_audit.end_time;
-                            break;
+                            if (stg_audit.status === 3) {
+                                role_rel.sign_date = stg_audit.end_time;
+                                rptSignatureHelper.originalRoleRelList[rridx].sign_date = stg_audit.end_time;
+                            } else {
+                                role_rel.sign_date = '';
+                                rptSignatureHelper.originalRoleRelList[rridx].sign_date = '';
+                            }
+                            // break; //因为实际业务中会有反复，所以就不break了，一直判断，以最后一个为准
                         }
                     }
                 }

app/view/stage/index.ejs

@@ -329,7 +329,7 @@
                                                 <label>替换文件</label>
                                                 <div class="custom-file">
                                                     <input type="file" class="custom-file-input" id="change-att-btn">
-                                                    <label class="custom-file-label" for="customFile">Choose file</label>
+                                                    <label class="custom-file-label" data-browse="浏览" for="customFile">选择文件</label>
                                                 </div>
                                             </div>
                                         </div>