月信息价和调差bug修复

app/public/js/global.js

@@ -24,6 +24,7 @@ function autoFlashHeight(){
     $(".sjs-height-3").height($(window).height()-cHeader-sBar-492+25);/*492*/
     $(".sjs-height-4").height($(window).height()-cHeader-pBarz-110+75);
     $(".sjs-height-5").height($(window).height()-cHeader-sBar-492+55);/*492*/
+    $(".sjs-height-6").height($(window).height()-cHeader-34-sBar1);
     $(".sp-wrap").height(bcontent-30);
     /*侧栏高度*/
     $(".sjs-sh-1").height($(window).height()-cHeader-sBar1-92+55);

app/public/js/material.js

@@ -979,7 +979,6 @@ $(document).ready(() => {
                     });
                 }
                 monthsList = data.monthsList;
-                console.log(monthsList);
                 SpreadJsObj.reinitSheetHeader(materialMonthSpread.getActiveSheet(), materialMonthSpreadSetting);
                 SpreadJsObj.initSpreadSettingEvents(materialMonthSpreadSetting, materialMonthCol);
                 SpreadJsObj.loadSheetData(materialMonthSpread.getActiveSheet(), SpreadJsObj.DataType.Data, monthsList);
@@ -987,7 +986,6 @@ $(document).ready(() => {
 
                 // 工料表单价显示也要更新
                 materialBillsData = data.materialBillsData;
-                console.log(materialBillsData);
                 SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, materialBillsData);
                 m_tp = data.m_tp;
                 resetTpTable();

app/public/js/material_list.js

@@ -169,10 +169,11 @@ $(document).ready(() => {
             SpreadJsObj.loadSheetData(leafXmjSpread.getActiveSheet(), SpreadJsObj.DataType.Data, gcl.leafXmjs);
             // 对清单调差工料table的单位数量进行改变
             materialSpreadSetting.cols[materialSpreadSetting.cols.length - 1].title = '|' + gcl.unit + '数量 �';
-            SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
+            // SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
         } else {
             SpreadJsObj.loadSheetData(leafXmjSpread.getActiveSheet(), SpreadJsObj.DataType.Data, []);
         }
+        SpreadJsObj.initSheet(materialSpread.getActiveSheet(), materialSpreadSetting);
     }
     SpreadJsObj.initSheet(ledgerSpread.getActiveSheet(), ledgerSpreadSetting);
 
@@ -406,6 +407,9 @@ $(document).ready(() => {
                         const sheet = leafXmjSpread.getActiveSheet();
                         const select = SpreadJsObj.getSelectObject(sheet);
                         const notx = findNotJoinLeafXmj(select);
+                        if (!select) {
+                            return false;
+                        }
                         if (!readOnly && select && notx === undefined) {
                             return true;
                         } else {
@@ -423,6 +427,9 @@ $(document).ready(() => {
                         const sheet = leafXmjSpread.getActiveSheet();
                         const select = SpreadJsObj.getSelectObject(sheet);
                         const notx = findNotJoinLeafXmj(select);
+                        if (!select) {
+                            return false;
+                        }
                         if (!readOnly && select && notx === undefined) {
                             return false;
                         } else {
@@ -659,6 +666,9 @@ $(document).ready(() => {
                         const sheet = leafXmjSpread.getActiveSheet();
                         const select = SpreadJsObj.getSelectObject(sheet);
                         const notx = findNotJoinLeafXmj(select);
+                        if (!select) {
+                            return true;
+                        }
                         if (!readOnly && notx === undefined) {
                             return false;
                         } else {
@@ -675,6 +685,9 @@ $(document).ready(() => {
                     disabled: function (key, opt) {
                         const sheet = materialSpread.getActiveSheet();
                         const select = SpreadJsObj.getSelectObject(sheet);
+                        if (!select) {
+                            return true;
+                        }
                         if (!readOnly && select && materialBase.isEdit(select)) {
                             return false;
                         } else {

app/service/material_month.js

@@ -103,22 +103,20 @@ module.exports = app => {
                 if (mbList.length !== 0) {
                     const updateArray = [];
                     for (const mb of mbList) {
-                        if (monthList.length !== 0) {
-                            this._.remove(monthList, function(m) {
-                                return data.indexOf(m.yearmonth) !== -1;
-                            });
-                            const mb_msg_tp_sum = this._.sumBy(this._.filter(monthList, { mb_id: mb.id }), 'msg_tp');
-                            const month_num = material_month.length - this.ctx.helper.arrayCount(this._.map(this._.filter(monthList, { mb_id: mb.id }), 'msg_tp'), null);
-                            const new_msg_tp = month_num !== 0 ? this.ctx.helper.round(this.ctx.helper.div(mb_msg_tp_sum, month_num), 3) : null;
-                            const [newmsg_spread, newm_spread] = await this.ctx.service.materialBills.getSpread(mb, new_msg_tp);
-                            updateArray.push({
-                                id: mb.id,
-                                msg_tp: new_msg_tp,
-                                msg_spread: newmsg_spread,
-                                m_spread: newm_spread,
-                                m_tp: this.ctx.helper.round(this.ctx.helper.mul(mb.quantity, newm_spread), 2),
-                            });
-                        }
+                        this._.remove(monthList, function(m) {
+                            return data.indexOf(m.yearmonth) !== -1;
+                        });
+                        const mb_msg_tp_sum = this._.sumBy(this._.filter(monthList, { mb_id: mb.id }), 'msg_tp');
+                        const month_num = material_month.length - this.ctx.helper.arrayCount(this._.map(this._.filter(monthList, { mb_id: mb.id }), 'msg_tp'), null);
+                        const new_msg_tp = month_num !== 0 ? this.ctx.helper.round(this.ctx.helper.div(mb_msg_tp_sum, month_num), 3) : null;
+                        const [newmsg_spread, newm_spread] = await this.ctx.service.materialBills.getSpread(mb, new_msg_tp);
+                        updateArray.push({
+                            id: mb.id,
+                            msg_tp: new_msg_tp,
+                            msg_spread: newmsg_spread,
+                            m_spread: newm_spread,
+                            m_tp: this.ctx.helper.round(this.ctx.helper.mul(mb.quantity, newm_spread), 2),
+                        });
                     }
                     if (updateArray.length !== 0) await transaction.updateRows(this.ctx.service.materialBills.tableName, updateArray);
                 }

app/view/material/info.ejs

@@ -24,7 +24,7 @@
         </div>
     </div>
     <div class="content-wrap">
-        <div class="c-header p-0">
+        <div class="c-header p-0 col-12">
         </div>
         <div class="row w-100 sub-content">
             <div id="main-view" class="c-body col-8" style="width: 100%">
@@ -71,7 +71,7 @@
                             </div>
                         </div>
                         <% } %>
-                        <div class="sjs-height-1" id="material-month-spread">
+                        <div class="sjs-height-6" id="material-month-spread">
                         </div>
                     </div>
                 </div>