feat: 新增线下费率

Framework/YLErp.Core/DBModels/SwapRate.cs

@@ -124,5 +124,13 @@ namespace YLErp.DBModels
         [DisplayName("后台费用万分比")]
         [Column("back_desk_charge_is_percent")]
         public bool? BackDeskChargeIsPercent { get; set; } = true;
+
+        /// <summary>
+        /// 线下协商费率
+        /// </summary>
+        [DisplayName("线下费率")]
+        [Column("off_line_rate")]
+        [DataChange]
+        public decimal? OfflineRate { get; set; }
     }
 }

YLErpDAL/Model/SwapRateExportModel.cs

@@ -20,5 +20,6 @@ namespace YLErp.Model
 
         public string FrontDeskCharge { get; set; }
         public string BackDeskCharge { get; set; }
+        public string OfflineRate { get; set; }
     }
 }

YLErpDAL/Modules/SwapModule/SwapRateService.cs

@@ -110,6 +110,7 @@ namespace YLErp.Modules.SwapModule
                 swapRate.FrontDeskChargeIsPercent = req.FrontDeskChargeIsPercent;
                 swapRate.BackDeskCharge = req.BackDeskCharge;
                 swapRate.BackDeskChargeIsPercent = req.BackDeskChargeIsPercent;
+                swapRate.OfflineRate = req.OfflineRate;
                 swapRate.SetOpt(UserId, UserName);
             }
             else
@@ -345,6 +346,7 @@ namespace YLErp.Modules.SwapModule
                 exportModel.DiscountAccDown = item.DiscountAccDown.OtcFormatMoney(true);
                 exportModel.FrontDeskCharge = item.FrontDeskChargeIsPercent == true ? item.FrontDeskCharge.OtcFormatTenThousandsPercent(4) : item.FrontDeskCharge.OtcFormatMoney(true);
                 exportModel.BackDeskCharge = item.BackDeskChargeIsPercent == true ? item.BackDeskCharge.OtcFormatTenThousandsPercent(4) : item.BackDeskCharge.OtcFormatMoney(true);
+                exportModel.OfflineRate = item.OfflineRate.OtcFormatTenThousandsPercent(4);
                 list.Add(exportModel);
             }
             var tplFilePath = OtcAppContext.MapPath("/App_Docs");

YLErpWeb/Views/SwapRate/Detail.cshtml

@@ -72,6 +72,10 @@
                     <td>优惠累计量下限</td>
                     <td>@Model.DiscountAccDown.OtcFormatMoney(true)</td>
                 </tr>
+                <tr>
+                    <td>线下费率</td>
+                    <td>@Model.OfflineRate.OtcFormatPercent(4)</td>
+                </tr>
             </tbody>
         </table>
     </div>

YLErpWeb/Views/SwapRate/Edit.cshtml

@@ -73,6 +73,11 @@
                     <vue-number-input v-model="rate.DiscountAccDown" v-bind:format="inputFormatSinglePrice" style="width:45% !important;margin-left:4px;"></vue-number-input>
                     <span style="color:red">*</span>
                 </div>
+                <div class="form-group">
+                    <label class="formlabel half"><i class="fa fa-question-circle" data-toggle="tooltip" title="即为合约成交费率"></i>线下费率</label>
+                    <vue-number-input v-model="rate.OfflineRate" v-bind:format="inputFormatRate" style="width:45% !important;margin-left:4px;"></vue-number-input>
+                    <a href="javascript:;"class="yt-input-group-append" tabindex="-1">%</a>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-primary" v-on:click="save">保存</button>

YLErpWeb/Views/SwapRate/Index.cshtml

@@ -52,7 +52,7 @@
         <div class="yc-panel">
             <h4 class="mb-3">阶梯费率导入模板下载</h4>
             <div class="mb-4">
-                <a class="btn btn-link" href="/App_Docs/导入模板/阶梯费率导入模板.xlsx" target="_blank">
+                <a class="btn btn-link" href="/App_Docs/导入模板/阶梯费率导入模板.xlsx?v=1.4.0" target="_blank">
                     阶梯费率模板下载
                 </a>
             </div>

YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateEdit.js

@@ -19,7 +19,8 @@ var vue = new Vue({
             FrontDeskChargeIsPercent: true,
             FrontDeskCharge: null,
             BackDeskChargeIsPercent: true,
-            BackDeskCharge:null
+            BackDeskCharge: null,
+            OfflineRate: null,
         },
         IsDma: false
     },

YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateList.js

@@ -175,6 +175,14 @@ var getColModelGrid = function () {
                     }
                 }
             }
+        }, {
+            name: 'OfflineRate',
+            label: '线下费率',
+            width: 120,
+            align: 'center',
+            formatter: function (cellValue, options, rowObject) {
+                return rowObject.OfflineRate == null ? "" : otcformat.trading.premiumRateP(rowObject.OfflineRate);
+            }
         }, {
             name: 'opt_name',
             label: '操作人',