修复部分bug

app/public/js/payment_detail.js

@@ -90,25 +90,23 @@ $(function () {
         rptAudit.signature_msg.content = $('#signature_content').val() ? $('#signature_content').val() : null;
         console.log(rptAudit.signature_msg);
         // 签章
-        if (rptAudit.signature_msg.sign_path || rptAudit.signature_msg.company_stamp || rptAudit.signature_msg.stamp_path) {
+        if (rptAudit.signature_msg.sign_path !== null || rptAudit.signature_msg.company_stamp !== null || rptAudit.signature_msg.stamp_path !== null) {
             const signArray = [];
             if (rptAudit.signature_msg.sign_path) signArray.push('/public/upload/sign/' + rptAudit.signature_msg.sign_path);
             if (rptAudit.signature_msg.company_stamp) signArray.push(rptAudit.signature_msg.company_stamp);
             if (rptAudit.signature_msg.stamp_path) signArray.push(rptAudit.signature_msg.stamp_path);
-            if (signArray.length > 0) {
-                tesRpttData.items[0].signature_cells[rptAudit.signature_index].path = signArray.length > 0 ? signArray.join('!;!') : null;
-                const date_index = _.findIndex(tesRpttData.items[0].signature_date_cells, { signature_name: rptAudit.signature_name + '_签字日期' });
-                if (date_index !== -1) {
-                    tesRpttData.items[0].signature_date_cells[date_index].Value = rptAudit.signature_msg.date ? rptAudit.signature_msg.date : '';
-                }
-                const content_index = _.findIndex(tesRpttData.items[0].signature_audit_cells, { signature_name: rptAudit.signature_name + '_审核意见' });
-                if (content_index !== -1) {
-                    tesRpttData.items[0].signature_audit_cells[content_index].Value = rptAudit.signature_msg.content ? rptAudit.signature_msg.content : '';
-                }
-                postData('/payment/' + tenderId + '/detail/' + detailId + '/save', { type: 'update_sign', signature_msg: rptAudit.signature_msg }, function (result) {
-                    auditRptPrintHelper.showPage();
-                });
+            tesRpttData.items[0].signature_cells[rptAudit.signature_index].path = signArray.length > 0 ? signArray.join('!;!') : null;
+            const date_index = _.findIndex(tesRpttData.items[0].signature_date_cells, { signature_name: rptAudit.signature_name + '_签字日期' });
+            if (date_index !== -1) {
+                tesRpttData.items[0].signature_date_cells[date_index].Value = rptAudit.signature_msg.date ? rptAudit.signature_msg.date : '';
             }
+            const content_index = _.findIndex(tesRpttData.items[0].signature_audit_cells, { signature_name: rptAudit.signature_name + '_审核意见' });
+            if (content_index !== -1) {
+                tesRpttData.items[0].signature_audit_cells[content_index].Value = rptAudit.signature_msg.content ? rptAudit.signature_msg.content : '';
+            }
+            postData('/payment/' + tenderId + '/detail/' + detailId + '/save', { type: 'update_sign', signature_msg: rptAudit.signature_msg }, function (result) {
+                auditRptPrintHelper.showPage();
+            });
             $('#sub-sp5').modal('hide');
         } else {
             toastr.error('至少选择一个签字/签章');

app/service/payment_detail_audit.js

@@ -351,11 +351,14 @@ module.exports = app => {
                 }
                 await transaction.update(this.ctx.service.paymentDetail.tableName, updateDetailData);
                 // 判断用户是否有权限查看支付审批，没有则自动加入到权限中
-                const auditList = await this.ctx.service.paymentDetailAudit.getAllDataByCondition({ where: { td_id: detailId, times } });
+                const auditList = await this.getAllDataByCondition({ where: { td_id: detailId, times } });
+                const rptAuditList = await this.ctx.service.paymentRptAudit.getAllDataByCondition({ where: { td_id: detailId } });
                 const auditIdList = this._.map(auditList, 'aid');
+                const rptAuditIdList = this._.map(rptAuditList, 'uid');
                 const permissionAuditList = await this.ctx.service.paymentPermissionAudit.getAllDataByCondition({ where: { pid: this.ctx.session.sessionProject.id } });
                 const paIdList = this._.map(permissionAuditList, 'uid');
-                const newAudits = this._.difference(auditIdList, paIdList);
+                const detailIdList = this._.union(auditIdList, rptAuditIdList);
+                const newAudits = this._.difference(detailIdList, paIdList);
                 if (newAudits.length > 0) {
                     const accountList = await this.ctx.service.projectAccount.getAllDataByCondition({
                         where: { project_id: this.ctx.session.sessionProject.id, id: newAudits },