修复部分调差bug

app/public/js/material.js

@@ -136,7 +136,7 @@ $(document).ready(() => {
         {title: '工料分类', colSpan: '1', rowSpan: '2', field: 'm_type', hAlign: 1, width: 60, readOnly: 'readOnly.isEdit', cellType: 'customizeCombo', comboItems: materialType.m_type, cellTypeKey: 2},
     ];
     if (materialTax) {
-        materialSpreadSettingCols.push({title: '税率(%)', colSpan: '1', rowSpan: '2', field: 'm_tax', hAlign: 2, width: 50, type: 'Number', readOnly: editTaxPermission ? 'readOnly.isEdit' : 'readOnly.remark'});
+        materialSpreadSettingCols.push({title: '税率(%)', colSpan: '1', rowSpan: '2', field: 'm_tax', hAlign: 2, width: 50, type: 'Number', readOnly: editTaxPermission ? 'readOnly.remark' : 'readOnly.isEdit'});
     }
     materialSpreadSettingCols = _.concat(materialSpreadSettingCols, [
         {title: '上涨 幅度(%)', colSpan: '1', rowSpan: '2', field: 'm_up_risk', hAlign: 2, width: 50, type: 'Number', readOnly: 'readOnly.isEdit'},
@@ -175,6 +175,7 @@ $(document).ready(() => {
     spCol.normalImg = '#ellipsis-icon';
     spCol.indent = 5;
     spCol.showImage = function (data) {
+        // console.log(data, data.t_type);
         // return !readOnly && data.t_type === 2 && data.mid === materialID;
         return data.t_type === 2;
     };
@@ -321,6 +322,7 @@ $(document).ready(() => {
                     return item.quantity !== null && item.quantity !== 0;
                 });
             }
+            console.log(newMaterialBillsData);
             SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, newMaterialBillsData);
             materialSpreadObj.refreshActn();
         },
@@ -1162,7 +1164,8 @@ $(document).ready(() => {
         showWaitingView();
         setTimeout(function () {
             materialSpreadObj.getMaterialBillsData();
-            SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
+            materialSpreadObj.materialSheetReset();
+            // SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
             // 消耗量表格更新
             let html = '';
             calcBase = _.find(calcBaseList, { ms_id: $('#myTab').find('.active').data('msid') }).calcBase;

app/public/js/material_list.js

@@ -438,6 +438,25 @@ $(document).ready(() => {
                     return item.qc_qty || item.contract_qty
                 });
             }
+            if ($('#show_material_gcl').is(':checked')) {
+                const hadMaterialGclGatherData = [];
+                const hadGclIdList = [];
+                for (const ml of materialListData) {
+                    if (hadGclIdList.indexOf(ml.gcl_id) === -1) {
+                        hadGclIdList.push(ml.gcl_id);
+                    }
+                }
+                for (const gcl of gclGatherData) {
+                    for (const index in gcl.leafXmjs) {
+                        const gcl_id = gcl.leafXmjs[index].gcl_id;
+                        if (hadGclIdList.indexOf(gcl_id) !== -1) {
+                            hadMaterialGclGatherData.push(gcl);
+                            break;
+                        }
+                    }
+                }
+                gclGatherData = hadMaterialGclGatherData;
+            }
             console.log(gclGatherData);
             calculateJiaCha(gclGatherData);
             SpreadJsObj.initSheet(leafXmjSpread.getActiveSheet(), leafXmjSpreadSetting);
@@ -1934,11 +1953,18 @@ $(document).ready(() => {
             }
             gclGatherData = hadMaterialGclGatherData;
         } else {
-            gclGatherModel.loadLedgerData(ledger, curLedgerData);
-            gclGatherModel.loadPosData(pos, curPosData);
-            gclGatherData = gclGatherModel.gatherGclData().filter(item => {
-                return item.qc_qty || item.contract_qty
-            });
+            if (isStageSelf) {
+                const ms_id = parseInt($('#myTab').find('.active').data('msid'));
+                updateBillsData(ms_id);
+                const i = _.findIndex(materialStageData, { id: ms_id });
+                gclGatherData = gclGatherListData[i];
+            } else {
+                gclGatherModel.loadLedgerData(_.cloneDeep(ledger), curLedgerData);
+                gclGatherModel.loadPosData(_.cloneDeep(pos), curPosData);
+                gclGatherData = gclGatherModel.gatherGclData().filter(item => {
+                    return item.qc_qty || item.contract_qty
+                });
+            }
             if (openMaterialChecklist) {
                 // 取交集
                 gclGatherData = _.filter(gclGatherData, function (item) {