Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/reports/rpt_component/jpc_flow_tab.js

@@ -706,6 +706,7 @@ JpcFlowTabSrv.prototype.createNew = function(){
                             pageStatus[JV.STATUS_SEGMENT_END] = true;
                             pageStatus[JV.STATUS_REPORT_END] = (segIdx === me.segments.length - 1);
                             private_addPage(segIdx, grpSeqInfo, false, false, -1);
+                            pageStatus[JV.STATUS_SEGMENT_END] = false; // 加完章统计页后，记得把章尾页设置为false
                         } else {
                             private_addPage(segIdx, grpSeqInfo, false, false, -1);
                         }

public/web/common_ajax.js

@@ -20,7 +20,7 @@ var CommonAjax = {
                         successCallback(result.data);
                     }
                 } else {
-                    alert('error: ' + result.message);
+                    alert(result.message);
                     if (errorCallback) {
                         errorCallback();
                     }