From 04326fc42b6d4c60663e184ab750c705ddd267e3 Mon Sep 17 00:00:00 2001 From: "zheng.zhang" Date: Fri, 26 Dec 2025 14:00:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=BA=BF=E4=B8=8B?= =?UTF-8?q?=E8=B4=B9=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Framework/YLErp.Core/DBModels/SwapRate.cs | 8 ++++++++ YLErpDAL/Model/SwapRateExportModel.cs | 1 + .../Modules/SwapModule/SwapRateService.cs | 2 ++ .../App_Docs/导入模板/阶梯费率导入模板.xlsx | Bin 10340 -> 10409 bytes YLErpWeb/Views/SwapRate/Detail.cshtml | 4 ++++ YLErpWeb/Views/SwapRate/Edit.cshtml | 5 +++++ YLErpWeb/Views/SwapRate/Index.cshtml | 2 +- .../Scripts/app/swapRate/swapRateEdit.js | 3 ++- .../Scripts/app/swapRate/swapRateList.js | 8 ++++++++ 9 files changed, 31 insertions(+), 2 deletions(-) diff --git a/Framework/YLErp.Core/DBModels/SwapRate.cs b/Framework/YLErp.Core/DBModels/SwapRate.cs index dcb39bf4..dc4625f4 100644 --- a/Framework/YLErp.Core/DBModels/SwapRate.cs +++ b/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; + + /// + /// 线下协商费率 + /// + [DisplayName("线下费率")] + [Column("off_line_rate")] + [DataChange] + public decimal? OfflineRate { get; set; } } } diff --git a/YLErpDAL/Model/SwapRateExportModel.cs b/YLErpDAL/Model/SwapRateExportModel.cs index 535484ac..28ba220d 100644 --- a/YLErpDAL/Model/SwapRateExportModel.cs +++ b/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; } } } diff --git a/YLErpDAL/Modules/SwapModule/SwapRateService.cs b/YLErpDAL/Modules/SwapModule/SwapRateService.cs index bea46af2..6100ccb9 100644 --- a/YLErpDAL/Modules/SwapModule/SwapRateService.cs +++ b/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"); diff --git a/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx b/YLErpWeb/App_Docs/导入模板/阶梯费率导入模板.xlsx index fd6df59c07ac8097b6cb2738fd229bb90493f944..1cf1d83a9a248e144fb4b8395b098995064803fb 100644 GIT binary patch delta 3465 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 delta 3398 zcmZ8kc{CK<8#WsIzT{(!Wf;c3mWZmWvoN?U17*Rh#^Kb3@Snx z+1Df?j3htb_nq@~zTf@h-gDmf-t(Sw@AE#-b89SCZZy^bfI}h%0CXcj3OV*dUYis} ztOwJYaqegZw_Pk~g^v2~2$O+J9GiD@+Z?uU;D(RS_KVKInZs=uTBqJA+_-o-n=(d$d) zWWrXj*omihEn}g?{Vw88YnrON@n~Xq1Y&>A_G743+6?z~_17%PTcmpvavw*Y152ec zqUkQoW{aLYh&%~DGx%0IUf8fODgE=Qjmki>08mh{QBqKFoJZXQ+-?L11m2Z(3%wf>;3pI2=le86 z)3{%bJANnn46=eO79E-K=kp`v`wQ}emG5U~K65BDG|Du4Or9UfwNwimT_zmueZ$S? zNIQA3q~fQ{YQgbVP#yGi_@4G zvw7*J`tEAypXxYU&m^enQme^WZibl9)@Jade;cpOHD0l`}Wk zR)i93^QNa)Gq+CGjWQLzgsqB3FByqN<=5UCC!l`)Yi z@5>hUT$xYzixim_&PFO#mDy{G{l#% zpgIo1ypq6~KR8OfWAXVx&rNXn5masWn)f0v>1i)Hm+$efAKM|zSUbc7yIS~^*UKwI zNUwpbU;gOy&+Sqin*e*ptNy&eE*E`qF%^U=zA||A`f}Je=3R*3OY$i}9dDp?HpaJ2e7wYGN_0)UR=dTHx z8{G2jaKD^5Dj@WJ`Rnpyzaesg7;Of>+_;clT-Jyvt&V*YcsiyghFBl%rg71S5x3y?kF|RwJmPwQ?^_rkz8_ z{oRMQ=krQ<^R470%@{mfV`UKvt!0;zpYb~YI)yco?r?Ti>+J+(5;nwVp)9mtW|mwWNB?pQffySWR<{RuU`Qc@d=iUFv=U>Qf!#o9p|g2NvN7!~S;)}0a06$~&q&c4 z$aY&HmLKe#j*)cQOwx^+DB$wvdVg%SXueP?Wsgz#LWu95O6Tssl}0r-b!-1@m6B$F zis=y#?Tx@W>GnPz>U^j1FDW$Rh-=pM1Q+7&LO9ei4SPTvA3nje1yX2d;vp7HYkaCZ zWo3wX??Scvd+kwkgn+P>w)^Ad{uEk+|xs%h0fXG`L;ihKsR@EO?2hg!8;RBW~sZ7wls zE0Sya_6!YBmDslru#_*Ro7Oa&^>#{aL>KqV0vO1#9JZGfv4g>H+>a=R#+={HR6prC zO=~=1_?y{TMSv~)^!(IxRV4g&)VXdJqd{zZNK<1zUb?k zk&kp?j)9(jo~TY97y527a&bIp0up@SoYyv$Go9yX9vS!S3u}Ey;rfx(ThKy{nTBXkx`_u}mGUpd7{RE1Ar|{zhlPF4lup7}_L) zOi~8NbS7QUqZBe@X0)`SQ_r_xgPBz81u|-t6J8%U%RxV5;vcapWhM+b$F!RYZOhT! ze}=cG6=R>|OcWdMbeoPs-Ksk2&s0Yb&*x{kq@8flj;J84ZI@-R65a`8H;n_wAmt8|m5UFq5M-AU;&i%~y^w*=`E zj^(Wn`Z5yONheOF-Mdwe>weyCZ(2V1Jg}RoAyY5<5R3VAR?du($CUr& zwJY0|2|v$YhX+VO!Sb8eTmu3Sf76+zX}||L?jGS?0jYThn0Jd3{6mc$ue^8Bv-*%g zEzuwlB9U)eW;0efc(wBsklM&FOI9r+^Gq3bU1TaNoWrG+9Q~=Ts5ZC4L)M6`EJPl^ z_jh1r<=V|{&StqSi?$C`2&oa*cC`(58AAB@h)?Y$w@>@*a)W+zFx}HA62QQ8oMZ*cyACbVfMfKh+t?aLddeR%lmhqEQo|qDko#`!IWR3))K~qfI4ZxV= zSFO#-zXWz~mW1hnGW$KWWtRqzedQ4Y*9v6j9OFy}m+jI{^xwD?l+X`ErNRF)!MTq9<*WZ101CnLd4Uxzz{Z6piAqr7 zIMFmP6+kmu6Q%^1Mu)*fdH)}yzt5r3FJNkb9P}X!!u#7s{-e;pclDzc#3XtDU%`Lp PAELv=B&h+=zasww0p2<> diff --git a/YLErpWeb/Views/SwapRate/Detail.cshtml b/YLErpWeb/Views/SwapRate/Detail.cshtml index 9480df1b..f2244aa4 100644 --- a/YLErpWeb/Views/SwapRate/Detail.cshtml +++ b/YLErpWeb/Views/SwapRate/Detail.cshtml @@ -72,6 +72,10 @@ 优惠累计量下限 @Model.DiscountAccDown.OtcFormatMoney(true) + + 线下费率 + @Model.OfflineRate.OtcFormatPercent(4) + diff --git a/YLErpWeb/Views/SwapRate/Edit.cshtml b/YLErpWeb/Views/SwapRate/Edit.cshtml index 358d6331..68ae2a18 100644 --- a/YLErpWeb/Views/SwapRate/Edit.cshtml +++ b/YLErpWeb/Views/SwapRate/Edit.cshtml @@ -73,6 +73,11 @@ * +
+ + + % +
diff --git a/YLErpWeb/Views/SwapRate/Index.cshtml b/YLErpWeb/Views/SwapRate/Index.cshtml index b101b3d9..1be928a2 100644 --- a/YLErpWeb/Views/SwapRate/Index.cshtml +++ b/YLErpWeb/Views/SwapRate/Index.cshtml @@ -52,7 +52,7 @@

阶梯费率导入模板下载

- + 阶梯费率模板下载
diff --git a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateEdit.js b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateEdit.js index 2dd99df8..bc8b32a9 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateEdit.js +++ b/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 }, diff --git a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateList.js b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateList.js index 5f5e42e5..109d6a08 100644 --- a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapRateList.js +++ b/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: '操作人',