费率bug

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

@@ -600,11 +600,14 @@ var feeRateObject={
                          }
                          if(gljUtil.isDef(ltRate)&&gljUtil.isDef(gtRate)){//已经找到前后的值了
                              let step = scMathUtil.roundForObj(gtRate.value - ltRate.value,getDecimal("process"))
-                             let total =  parseInt(gtRate.ID) - parseInt(ltRate.ID)
-                             doc.rate =getRateByStep(ltRate.value,total,parseFloat(value) - parseInt(ltRate.ID),step);
+                             let total =  parseFloat(gtRate.ID) - parseFloat(ltRate.ID)
+                             doc.rate =getRateByStep(ltRate.value,total,parseFloat(value) - parseFloat(ltRate.ID),step);
                          }else if(gljUtil.isDef(ltRate)&&gtRate == null){//说明是超出了选项的最大值
-                             let share = parseFloat(value) - parseInt(ltRate.ID);//超出了多少
+                             let share = parseFloat(value) - parseFloat(ltRate.ID);//超出了多少
                              doc.rate = getRateByStep(ltRate.value,temP.step,share,temP.amount)
+                         }else if(gljUtil.isDef(gtRate)&&ltRate==null){//说明是只有一个选项，且这个选项比输入的值大
+                             let step =  parseFloat(gtRate.value)- 0;
+                             doc.rate = getRateByStep(0,gtRate.value,value,step)
                          }
                      }
                      if(isDef(doc.rate)){
@@ -628,7 +631,7 @@ var feeRateObject={
                 $.bootstrapLoading.end();
             })
         }
-        function getRateByStep(ltValue,total,share,step) {
+        function getRateByStep(ltValue,total,share,step) { //min值 ，计算值的总区间， 区间中占比，步长
             let p = scMathUtil.roundForObj(share/total,getDecimal("process"));
             let a = scMathUtil.roundForObj(step * p,getDecimal("process")) ;
             return scMathUtil.roundForObj(ltValue + a,getDecimal("feeRate"))

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -98,13 +98,11 @@ var subRateObject={
         let options=[];
         if(subRate.isSub == true) return;//是树节点的子节点;
         for(let op of subRate.optionList){
-            //options.push({text:op.name,value:op.value});
-            options.push(op.name);
+           options.push(op.name);
         }
         let dynamicCombo = sheetCommonObj.getDynamicCombo();//new GC.Spread.Sheets.CellTypes.ComboBox();
         dynamicCombo.items(options);
         if(subRate.editable == true) dynamicCombo.editable(true);
-        //dynamicCombo.editorValueType(GC.Spread.Sheets.CellTypes.EditorValueType.value);
         sheet.setCellType(row, col, dynamicCombo, GC.Spread.Sheets.SheetArea.viewport);
     },
     addComboboxOption:function (datas) {