Browse Source

修复bug

laiguoran 2 năm trước cách đây
mục cha
commit
390a641652
2 tập tin đã thay đổi với 9 bổ sung5 xóa
  1. 8 4
      app/public/js/material.js
  2. 1 1
      app/service/material_stage_bills.js

+ 8 - 4
app/public/js/material.js

@@ -255,7 +255,7 @@ $(document).ready(() => {
         },
     };
 
-    const needUpdateArray = ['quantity', 'msg_tp', 'msg_times', 'msg_spread', 'm_spread', 'm_tp', 'm_tax_tp', 'is_summary', 'remark'];
+    const needUpdateArray = ['quantity', 'expr', 'msg_tp', 'msg_times', 'msg_spread', 'm_spread', 'm_tp', 'm_tax_tp', 'is_summary', 'remark'];
 
     const materialSpreadObj = {
         getMaterialBillsData: function () {
@@ -1336,13 +1336,17 @@ $(document).ready(() => {
                 const select = SpreadJsObj.getSelectObject(sheet);
                 delete select.waitingLoading;
                 const index = materialBillsData.indexOf(select);
-                // console.log(materialBillsData, select, index, result.info);
+                console.log(materialBillsData, index);
                 let newIndex = index;
                 if (isStageSelf) {
                     materialSpreadObj.updateMaterialData(result);
+                    // result.info.quantity = expr;
+                    // result.info.expr = expr;
                     result.info = materialSpreadObj.updateOneMaterialBill(result.info);
-                    // console.log(result.info);
+                    // delete result.info.waitingLoading;
+                    // index = materialBillsData.indexOf(result.info);
                 }
+                // console.log(materialBillsData, index, result.info);
                 if($('#bills0_list').is(':checked')) {
                     const newMaterialBillsData = _.filter(materialBillsData, function (item) {
                         return item.quantity !== null && item.quantity !== 0;
@@ -1351,7 +1355,7 @@ $(document).ready(() => {
                     newMaterialBillsData.splice(newIndex, 1, result.info);
                     sheet.zh_data[newIndex] = result.info;
                 }
-                materialBillsData.splice(index, 1, result.info);
+                // materialBillsData.splice(index, 1, result.info);
                 SpreadJsObj.reLoadRowData(sheet, newIndex);
                 resetTpTable();
                 $('#bcyy').modal('hide');

+ 1 - 1
app/service/material_stage_bills.js

@@ -11,7 +11,7 @@ const auditConst = require('../const/audit').material;
 const materialConst = require('../const/material');
 const MaterialCalculator = require('../lib/material_calc');
 
-const needUpdateArray = ['quantity', 'msg_tp', 'msg_times', 'msg_spread', 'm_spread', 'm_tp', 'm_tax_tp', 'is_summary', 'remark'];
+const needUpdateArray = ['quantity', 'expr', 'msg_tp', 'msg_times', 'msg_spread', 'm_spread', 'm_tp', 'm_tax_tp', 'is_summary', 'remark'];
 
 module.exports = app => {
     class MaterialStageBills extends app.BaseService {