浏览代码

修复变更bug

laiguoran 2 年之前
父节点
当前提交
e5fbfc456d
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 2 1
      app/public/js/change_information_set.js
  2. 1 1
      app/service/change_audit_list.js

+ 2 - 1
app/public/js/change_information_set.js

@@ -1911,7 +1911,8 @@ function remakeChangeSpread(cOrder = changeOrder) {
                 mx_id,
             };
             const radionInfo = changeList.find(function (info) {
-                return info.code === code && (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (info.bwmx === bwmx || (info.bwmx === xmj_jldy && info.mx_id && info.mx_id === mx_id)) && parseInt(info.oamount) === parseInt(oamount);
+                // return info.code === code && (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (info.bwmx === bwmx || (info.bwmx === xmj_jldy && info.mx_id && info.mx_id === mx_id)) && parseInt(info.oamount) === parseInt(oamount);
+                return (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && (info.bwmx === bwmx || (info.bwmx === xmj_jldy && info.mx_id && info.mx_id === mx_id));
             });
             if (radionInfo) {
                 trlist.camount = radionInfo.camount;

+ 1 - 1
app/service/change_audit_list.js

@@ -324,7 +324,7 @@ module.exports = app => {
                         const newList = await transaction.query(sql2, sqlParam2);
                         // const newList = await transaction.select(this.tableName, { where: { cid: this.ctx.change.cid } });
                         for (const used of usedList) {
-                            const newone = this._.find(newList, { code: used.code, lid: used.lid, gcl_id: used.gcl_id, bwmx: used.bwmx });
+                            const newone = this._.find(newList, { lid: used.lid, gcl_id: used.gcl_id, bwmx: used.bwmx, mx_id: used.mx_id });
                             if (newone) {
                                 updateList.push({
                                     row: {