修复上下移bug

app/controller/material_controller.js

@@ -368,7 +368,7 @@ module.exports = app => {
                     searchsql.mid = midList;
                 }
                 searchsql.t_type = materialConst.t_type[0].value;
-                renderData.materialBillsData = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+                renderData.materialBillsData = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql, orders: [['order', 'asc']] });
                 // 取对应期的截取上期的调差金额和应耗数量
                 if (ctx.material.highOrder !== ctx.material.order) {
                     for (const [mindex, mb] of renderData.materialBillsData.entries()) {
@@ -618,13 +618,14 @@ module.exports = app => {
                     case 'paste':
                         responseData.data.m_tp = await ctx.service.materialBills.saveDatas(data.updateData);
                         // 根据期判断需要获取的工料信息值
-                        const searchsql = { tid: ctx.tender.id };
-                        if (ctx.material.highOrder !== ctx.material.order) {
-                            const midList = await ctx.service.material.getPreMidList(ctx.tender.id, ctx.material.order);
-                            searchsql.mid = midList;
-                        }
-                        // 取所有工料表
-                        responseData.data.info = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql });
+                        // const searchsql = { tid: ctx.tender.id };
+                        // if (ctx.material.highOrder !== ctx.material.order) {
+                        //     const midList = await ctx.service.material.getPreMidList(ctx.tender.id, ctx.material.order);
+                        //     searchsql.mid = midList;
+                        // }
+                        // // 取所有工料表
+                        // responseData.data.info = await ctx.service.materialBills.getAllDataByCondition({ where: searchsql, orders: [['order', 'asc']] });
+                        responseData.data.info = await this._getMaterialBillsData(ctx);
                         break;
                     default: throw '参数有误';
                 }

app/public/js/material.js

@@ -589,7 +589,8 @@ $(document).ready(() => {
             // 更新至服务器
             postData(window.location.pathname + '/save', { type:'paste', updateData: data }, function (result) {
                 materialBillsData = result.info;
-                SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
+                // SpreadJsObj.reLoadSheetData(materialSpread.getActiveSheet());
+                SpreadJsObj.loadSheetData(materialSpread.getActiveSheet(), SpreadJsObj.DataType.Data, materialBillsData);
                 // for (const row in rowData) {
                 //     materialBillsData.splice(index, 1, result.info[row]);
                 //     SpreadJsObj.reLoadRowData(info.sheet, row);
@@ -599,12 +600,16 @@ $(document).ready(() => {
                         m.code = materialBillsData[i].code;
                         m.name = materialBillsData[i].name;
                         m.unit = materialBillsData[i].unit;
+                        m.origin = materialBillsData[i].origin;
                     }
-                    SpreadJsObj.reLoadSheetData(materialMonthSpread.getActiveSheet());
+                    SpreadJsObj.loadSheetData(materialMonthSpread.getActiveSheet(), SpreadJsObj.DataType.Data, monthsList);
+                    // SpreadJsObj.reLoadSheetData(materialMonthSpread.getActiveSheet());
                 }
                 m_tp = result.m_tp;
                 resetTpTable();
+                // materialSpreadObj.refreshActn();
             }, function () {
+                // materialSpreadObj.refreshActn();
                 SpreadJsObj.reLoadRowData(info.sheet, info.cellRange.row, info.cellRange.rowCount);
                 return;
             });