Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/material.js

@@ -175,9 +175,8 @@ $(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;
+        return data && data.t_type === 2;
     };
 
     materialSpreadSetting.imageClick = function (data) {
@@ -333,12 +332,14 @@ $(document).ready(() => {
             }
         },
         materialSheetReset: function (redo = false) {
+
             let newMaterialBillsData = _.cloneDeep(materialBillsData);
             if($('#bills0_list').is(':checked')) {
                 newMaterialBillsData = _.filter(materialBillsData, function (item) {
                     return item.quantity !== null && item.quantity !== 0;
                 });
                 if (redo) {
+                    materialSpread.getActiveSheet().reset();
                     SpreadJsObj.initSpreadSettingEvents(materialSpreadSetting, materialCol);
                     SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
                 }
@@ -442,7 +443,7 @@ $(document).ready(() => {
                 }
                 // sheet.deleteRows(newIndex, 1);
                 // sheet.zh_data.splice(newIndex, 1);
-                materialSpreadObj.materialSheetReset();
+                materialSpreadObj.materialSheetReset(true);
                 resetTpTable();
                 // SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
                 sheet.setSelection(newIndex > 0 ? newIndex - 1 : 0, sel.length > 0 ? sel[0].col : 0, 1, 1);