瀏覽代碼

修复期无法打开bug

laiguoran 5 年之前
父節點
當前提交
7f6341aff9
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      app/service/stage_audit.js
  2. 3 3
      app/view/stage/audit_modal.ejs

+ 1 - 1
app/service/stage_audit.js

@@ -667,7 +667,7 @@ module.exports = app => {
         async getAuditGroupByList(stageId, times) {
             const sql = 'SELECT la.`aid`, pa.`name`, pa.`company`, pa.`role`, la.`times`, la.`sid`, la.`aid`, la.`order` ' +
                 'FROM ?? AS la, ?? AS pa ' +
-                'WHERE la.`sid` = ? and la.`times` = ? and la.`aid` = pa.`id` GROUP BY la.`aid`';
+                'WHERE la.`sid` = ? and la.`times` = ? and la.`aid` = pa.`id` GROUP BY la.`aid` ORDER BY la.`order`';
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, stageId, times];
             return await this.db.query(sql, sqlParam);
             // const sql = 'SELECT `tid`, `sid`, `aid`, `order` FROM ?? WHERE `sid` = ? and `times` = ? GROUP BY `aid`';

+ 3 - 3
app/view/stage/audit_modal.ejs

@@ -284,7 +284,7 @@
                 <h5 class="modal-title">审批通过</h5>
             </div>
             <div class="modal-body">
-                <h5>审批前,需要完成中间计量。</h5>
+                <h5>审批前,需要完成本期中间计量。</h5>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
@@ -771,7 +771,7 @@
                 <h5 class="modal-title">重新上报</h5>
             </div>
             <div class="modal-body">
-                <h5>上报前,需要完成中间计量。</h5>
+                <h5>上报前,需要完成本期中间计量。</h5>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
@@ -1099,7 +1099,7 @@
                     <h5 class="modal-title">审批通过</h5>
                 </div>
                 <div class="modal-body">
-                    <h5>审批前,需要完成中间计量。</h5>
+                    <h5>审批前,需要完成本期中间计量。</h5>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>