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

app/public/js/change_information.js

@@ -344,7 +344,6 @@ $(document).ready(() => {
     const czSpreadObj = {
         makeBackColor: function () {
             const rowCount = czSpread.getActiveSheet().getRowCount();
-            console.log();
             for (let i = 0; i < rowCount; i++) {
                 if (czSpread.getActiveSheet().zh_data[i].color) czSpread.getActiveSheet().getRange(i, -1, 1, -1).backColor('#f5c6cb');
             }
@@ -397,7 +396,7 @@ $(document).ready(() => {
             let color = true;
             if (planInfo) {
                 _.remove(newPlanList, (item) => item === planInfo);
-                if (pamount === c.spamount) {
+                if ((pamount ? pamount : 0) === (c.spamount ? c.spamount : 0)) {
                     color = false;
                 }
             }