瀏覽代碼

修复变更bug

laiguoran 4 年之前
父節點
當前提交
d68b59be98
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      app/public/js/change_information_set.js

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

@@ -605,9 +605,7 @@ $(document).ready(() => {
                 gcl = gclGatherData[$(this).data('gcl')];
             }
             codeHtml = '';
-            console.log(changeUsedData);
             for (const leaf of gcl.leafXmjs) {
-                console.log(leaf);
                 const quantity = leaf.quantity !== undefined && leaf.quantity !== null ? leaf.quantity : 0;
                 const gcl_id = leaf.gcl_id ? leaf.gcl_id : '';
                 const bwmx = leaf.bwmx !== undefined ? leaf.bwmx : '';
@@ -618,7 +616,6 @@ $(document).ready(() => {
                     (bwmx !== '' ? bwmx : leaf.jldy ? leaf.jldy : '') + '*;*' + quantity) !== -1 && isCheck ?
                     'checked' : '';
                 const isUsed = _.find(changeUsedData, { gcl_id: leaf.gcl_id, bwmx: leaf.bwmx });
-                console.log(isUsed);
                 const isDisabled = isUsed ? 'disabled ' : '';
                 codeHtml += '<tr quantity="' + quantity + '" gcl_id="' + gcl_id + '"><td>' + leaf.code + '</td>' +
                     '<td>' + (leaf.jldy ? leaf.jldy: '') + '</td>' +
@@ -1062,7 +1059,7 @@ function remakeChangeSpread() {
                 gcl_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;
+                return info.code === code && (info.lid == lid || parseInt(info.lid) === parseInt(lindex)) && gcl_id == info.gcl_id && info.bwmx === bwmx && parseInt(info.oamount) === parseInt(oamount);
             });
             if (radionInfo) {
                 trlist.camount = radionInfo.camount;