temp update

web/building_saas/main/js/models/ration_glj.js

@@ -512,13 +512,21 @@ let ration_glj = {
                 if (condition.init) {
                     gljOprObj.treeData = data.treeData;
                     gljOprObj.distTypeTree = gljOprObj.getComboData(data.distTypeTree);
+                    /*gljOprObj.stdGLJ = data.stdGLJ;
+                    gljOprObj.complementaryGLJs = data.complementaryGLJs;
+                    gljOprObj.AllRecode = [...gljOprObj.stdGLJ, ...gljOprObj.complementaryGLJs];*/
+                }
+                if (condition.index === 0) {
                     gljOprObj.stdGLJ = data.stdGLJ;
                     gljOprObj.complementaryGLJs = data.complementaryGLJs;
                     gljOprObj.AllRecode = [...gljOprObj.stdGLJ, ...gljOprObj.complementaryGLJs];
+                    gljOprObj.gljLibSheetData = gljOprObj.AllRecode;
                 } else {
                     gljOprObj[gljType].splice(condition.index, 0, ...data[gljType]);
                     gljOprObj.AllRecode.splice(condition.index, 0, ...data[gljType]);
                 }
+                let tReg = /^[+\d]{1,}(?:\.{0}\d{2}|\d+)/
+                console.log(gljOprObj.AllRecode);
                 // 设置人材机类型名称
                 gljOprObj.setTypeName(gljOprObj.distTypeTree.comboDatas, data[gljType]);
                 if (data.priceProperties && data.priceProperties.length > 0) {

web/building_saas/main/js/views/glj_view.js

@@ -324,15 +324,14 @@ var gljOprObj = {
         const radioType = $("input[name='glj']:checked").val();
         const curRecord = radioType === 'stdGLJ' ? me.stdGLJ : me.complementaryGLJs;
         // 当前表显示数据数大于等于当前筛选情况下最大数据数，不获取下一分页
-        if (curRecord.length >= me.curPageTotal && me.loadingPagination) {
+        if (curRecord.length >= me.curPageTotal ||
+            me.loadingPagination) {
             return;
         }
-        debugger;
         if (curRecord.length -1 === bottomRow) {
             // 获取第curRecord.length行开始的数据
             me.loadPageData(args.sheet, curRecord.length);
         }
-
     },
     loadPageData: function (sheet, index) {
         let condition = this.getPagingCondition(false, index);
@@ -1223,6 +1222,7 @@ var gljOprObj = {
     doAddGLJ: function () {
         var selected = projectObj.project.mainTree.selected;
         var project = projectObj.project;
+        debugger;
         gljOprObj.GLJSelection = _.filter(gljOprObj.GLJSelection, function (n) {
             var rg = _.find(gljOprObj.sheetData, function (item) {
                 if(item.isMixRatio == true){
@@ -1596,7 +1596,7 @@ $(function () {
             sheetCommonObj.setSheetBySetting(gljOprObj.gljLibSheet, gljOprObj.gljLibSheetSetting);
         }
         gljOprObj.gljLibSheet.setRowCount(0);
-        gljOprObj.gljLibSheetData = gljOprObj.AllRecode;
+        //gljOprObj.gljLibSheetData = gljOprObj.AllRecode;
         let gljClass = 0, selectMap = {};
         if ($('#actionType').val() == 'add' || $('#actionType').val() == 'insert') {//插入，添加
             gljOprObj.GLJSelection = [];