签署进度功能

app/controller/payment_controller.js

@@ -375,8 +375,8 @@ module.exports = app => {
                         const groupList = accountList.filter(item => item.account_group === idx);
                         return { groupName: item, groupList };
                     });
-                    renderData.rptAuditList = await ctx.service.paymentRptAudit.getAllDataByCondition({ where: { td_id: ctx.detail.id } });
                 }
+                renderData.rptAuditList = await ctx.service.paymentRptAudit.getListByDetail(ctx.detail.id);
                 await this.layout('payment/detail.ejs', renderData, 'payment/detail_modal.ejs');
             } catch (err) {
                 console.log(err);

app/service/payment_rpt_audit.js

@@ -70,6 +70,18 @@ module.exports = app => {
             }
             await transaction.updateRows(this.tableName, updateData);
         }
+
+        async getListByDetail(td_id) {
+            const sql = 'SELECT pra.*, pa.name as user_name FROM ?? as pra LEFT JOIN ?? as pa ON pra.`uid` = pa.`id` WHERE td_id = ?';
+            const params = [this.tableName, this.ctx.service.projectAccount.tableName, td_id];
+            const list = await this.db.query(sql, params);
+            if (list.length > 0) {
+                for (const ra of list) {
+                    ra.signature_msg = ra.signature_msg ? JSON.parse(ra.signature_msg) : null;
+                }
+            }
+            return list;
+        }
     }
 
     return PaymentRptAudit;

app/view/payment/audit_modal.ejs

@@ -22,7 +22,7 @@
                                             <div class="row">
                                                 <span class="col-2"><%- index+1 %></span>
                                                 <span class="col-6"><%- ra.signature_name %></span>
-                                                <span class="col-4"><%- ctx.helper._.findIndex(accountList, { id: ra.uid }) !== -1 ? ctx.helper._.find(accountList, { id: ra.uid }).name : '' %></span>
+                                                <span class="col-4"><%- ra.user_name %></span>
                                             </div>
                                         </li>
                                     <% } %>

app/view/payment/detail_modal.ejs

@@ -119,54 +119,15 @@
                     </tr>
                     </thead>
                     <tbody>
+                    <% for (const [index, ra] of rptAuditList.entries()) { %>
                     <tr class="text-center">
-                        <td>1</td>
-                        <td>监理公司</td>
-                        <td>仁温书</td>
-                        <td><i class="fa fa-check text-success"></i></td>
-                        <td><img src="img/seal.png" alt="" > </td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>2</td>
-                        <td>造价咨询单位</td>
-                        <td>玉安然</td>
-                        <td><i class="fa fa-check text-success"></i></td>
-                        <td></td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>3</td>
-                        <td>经办人</td>
-                        <td>李四</td>
-                        <td><i class="fa fa-check text-success"></i></td>
-                        <td></td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>4</td>
-                        <td>合同管理人</td>
-                        <td>王五</td>
-                        <td></td>
-                        <td></td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>5</td>
-                        <td>相关科室负责人</td>
-                        <td>张三</td>
-                        <td><i class="fa fa-check text-success"></i></td>
-                        <td><img src="img/seal.png" alt="" class="img-fluid"> </td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>6</td>
-                        <td>计划财务科科长</td>
-                        <td>老六</td>
-                        <td><i class="fa fa-check text-success"></i></td>
-                    </tr>
-                    <tr class="text-center">
-                        <td>7</td>
-                        <td>分管领导</td>
-                        <td>邓莹洁</td>
-                        <td></td>
-                        <td></td>
+                        <td><%- index+1 %></td>
+                        <td><%- ra.signature_name %></td>
+                        <td><%- ra.user_name %></td>
+                        <td><% if (ra.signature_msg && ra.signature_msg.sign_path !== null ) { %><i class="fa fa-check text-success"></i><% } %></td>
+                        <td><% if (ra.signature_msg && (ra.signature_msg.stamp_path !== null || ra.signature_msg.company_stamp !== null)) { %><i class="fa fa-check text-success"></i><% } %></td>
                     </tr>
+                    <% } %>
                     </tbody>
                 </table>
             </div>