Browse Source

判空后台处理

laiguoran 3 years ago
parent
commit
abbdf93b3e
2 changed files with 4 additions and 4 deletions
  1. 1 1
      app/public/js/change_information_approval.js
  2. 3 3
      app/service/change.js

+ 1 - 1
app/public/js/change_information_approval.js

@@ -384,7 +384,7 @@ $(document).ready(() => {
                 //     toastr.error('清单第' + (i+1) + '行审批变更数量不能为空');
                 //     returnflag = false;
                 // } else {
-                clist.push(cl.id + '_' + (cl['audit_amount_' + accountId] ? cl['audit_amount_' + accountId] : 0));
+                clist.push(cl.id + '_' + cl['audit_amount_' + accountId]);
                 // }
             }
             $('#change-list-approval').val(clist.join(','));

+ 3 - 3
app/service/change.js

@@ -787,7 +787,7 @@ module.exports = app => {
                 for (const bl of bills_list) {
                     const listInfo = bl.split('_');
                     const lid = listInfo[0];
-                    const amount = listInfo[1];
+                    const amount = listInfo[1] !== 'null' && listInfo[1] !== '' ? listInfo[1] : null;
                     const changeListInfo = await this.ctx.service.changeAuditList.getDataById(lid);
                     if (changeListInfo !== undefined) {
                         total_price = this.ctx.helper.add(total_price, this.ctx.helper.mul(changeListInfo.unit_price, amount, tp_decimal));
@@ -796,10 +796,10 @@ module.exports = app => {
                         const list_update = {
                             id: lid,
                             audit_amount: audit_amount.join(','),
-                            spamount: parseFloat(amount),
+                            spamount: amount !== null ? parseFloat(amount) : null,
                         };
                         if (postData.audit_next_id === undefined) {
-                            list_update.samount = amount;
+                            list_update.samount = amount !== null ? amount : '';
                         }
                         await this.transaction.update(this.ctx.service.changeAuditList.tableName, list_update);
                     }