Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/material_list.js

@@ -249,6 +249,10 @@ $(document).ready(() => {
 
     loadLeafXmjData(0);
     loadMaterialData(0, 0);
+    const sheet = materialSpread.getActiveSheet();
+    sheet.suspendPaint();
+    sheet.setCellType(1, 3, new TipCellType(), spreadNS.SheetArea.colHeader);
+    sheet.resumePaint();
     // 不参与调差数据值变灰
     function checkNotJoinMaterialData() {
         const sheet = ledgerSpread.getActiveSheet();
@@ -481,14 +485,10 @@ $(document).ready(() => {
                     SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
                     return;
                 }
-                console.log(info);
-                // SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
                 const data = [];
-                // const rowData = [];
                 for (let iRow = 0; iRow < range.rowCount; iRow++) {
                     let bPaste = true;
                     const curRow = range.row + iRow;
-                    // const materialData = JSON.parse(JSON.stringify(sortData[curRow]));
                     const materialData = { id: sortData[curRow].id, mb_id: sortData[curRow].mb_id };
                     const hintRow = range.rowCount > 1 ? curRow : '';
                     let sameCol = 0;
@@ -533,15 +533,6 @@ $(document).ready(() => {
                     SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
                     return;
                 }
-                console.log(data);
-                // 更新至服务器
-                // postData(window.location.pathname + '/save', { type:'paste', updateData: data }, function (result) {
-                //     materialBillsData = result.info;
-                //     SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, materialBillsData);
-                // }, function () {
-                //     SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
-                //     return;
-                // });
                 // 更新至服务器
                 postData(window.location.pathname + '/save', { type:'paste', updateData: data }, function (result) {
                     materialListData = result;
@@ -556,12 +547,6 @@ $(document).ready(() => {
         materialSpread.bind(spreadNS.Events.EditEnded, materialSpreadObj.editEnded);
         materialSpread.bind(spreadNS.Events.ClipboardPasted, materialSpreadObj.clipboardPasted);
         SpreadJsObj.addDeleteBind(materialSpread, materialSpreadObj.deletePress);
-        const sheet = materialSpread.getActiveSheet();
-        sheet.suspendPaint();
-        // const basic_range = sheet.getRange(1, 3);
-        sheet.setCellType(1, 3, new TipCellType(), spreadNS.SheetArea.colHeader);
-        // console.log(basic_range);
-        sheet.resumePaint();
         // 应用调差工料至其他清单明细
         $('#user_all_material').click(function () {
             const sheet = materialSpread.getActiveSheet();