Browse Source

order顺序问题

laiguoran 6 years ago
parent
commit
12559c34e7
2 changed files with 6 additions and 3 deletions
  1. 3 0
      app/service/stage_audit.js
  2. 3 3
      app/view/stage/modal.ejs

+ 3 - 0
app/service/stage_audit.js

@@ -273,9 +273,12 @@ module.exports = app => {
                     const sql = 'SELECT `tid`, `sid`, `aid`, `order` FROM ?? WHERE `sid` = ? and `times` = ? GROUP BY `aid`';
                     const sqlParam = [this.tableName, stageId, times];
                     const auditors = await this.db.query(sql, sqlParam);
+                    let order = 1;
                     for (const a of auditors) {
                         a.times = times + 1;
+                        a.order = order;
                         a.status = auditConst.status.uncheck;
+                        order++;
                     }
                     await transaction.insert(this.tableName, auditors);
                     // 计算该审批人最终数据

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

@@ -205,13 +205,13 @@
                         <div class="img-bar">
                             <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
                         </div>
-                        <img src="img/sketch/1.png" id="draggable">
+                        <!--<img src="img/sketch/1.png" id="draggable">-->
                     </div>
                     <div class="img-item" style="left:300px;">
                         <div class="img-bar">
                             <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
                         </div>
-                        <img src="img/sketch/2.png" id="draggable">
+                        <!--<img src="img/sketch/2.png" id="draggable">-->
                     </div>
                 </div>
             </div>
@@ -243,4 +243,4 @@
     </div>
 </div>
 <img src="/public/images/icon-ok.png" id="icon-ok" />
-<% include ./audit_modal.ejs %>
+<% include ./audit_modal.ejs %>