Merge remote-tracking branch 'origin/1.0.0_online' into 1.0.0_online

web/building_saas/main/js/models/fee_rate.js

@@ -326,7 +326,6 @@ var FeeRate = {
                         }
                     }
                     me.datas.rates=data.rates;
-                    projectObj.project.markUpdateProject({projectID:projectObj.project.ID(),feeRateID:me.getActivateFeeRateFileID()},'feeRate');
                     me.onFeeRateFileChange();
                     callback();
                 }

web/building_saas/main/js/views/fee_rate_view.js

@@ -767,7 +767,6 @@ var feeRateObject={
         $.bootstrapLoading.start();
         var callback=function () {
             feeRateObject.reFreshRateViews();
-            projectObj.project.FeeRate.onFeeRateFileChange();
             $.bootstrapLoading.end();
         };
         projectObj.project.FeeRate.changeFeeRateStandard(newVal,callback);

web/building_saas/main/js/views/zmhs_view.js

@@ -121,11 +121,11 @@ let zmhs_obj = {
         let coeList = [];
         if(selected&&selected.sourceType == "ration"){
             let ration = selected.data;
+            let assList = this.getAssList(node); //2019-01-23 新需求，将辅助定额合并到一个表显示  -- 20191206 辅助定额放前面
+            // this.assFirstIndex = coeList.length;//没改前这里要记录辅助定额的起始下标，现在调整顺序后，默认就是0
             coeList = ration_coe.getCoeByRationID(ration.ID);
             _.remove(coeList,{"coeID":-1})//2018-12-24 新需求，把自定义乘系数分离出来，这里排除自定义乘系数行
-            this.assFirstIndex = coeList.length;//辅助定额的起始下标
-            coeList = coeList.concat(this.getAssList(node))  //2019-01-23 新需求，将辅助定额合并到一个表显示
-
+            coeList = assList.concat(coeList)  //2019-01-23 新需求，将辅助定额合并到一个表显示
         }
         this.coeSheet.setRowCount(0);
         sheetCommonObj.showData(this.coeSheet, this.coeSetting,coeList);