From c028bd2286268e2563ed5cf33e095e5ef12b28b1 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Fri, 31 Mar 2023 09:49:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=97=85=E4=BA=8B=E5=81=87=E6=89=A3=E6=AC=BE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/SalaryInfo/Form.cshtml | 62 ++++++++++--------- .../Views/SalaryInfo/Index.js | 1 + .../Views/SalaryInfo/IndexPersonal.js | 1 + .../SalaryInfo/SalaryInfoEntity.cs | 6 ++ 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml index 2f3087000..6104c40b1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.cshtml @@ -25,119 +25,123 @@
岗位工资*
- +
薪级工资*
- +
高定工资*
- +
基础绩效*
- +
保留地区补贴@*及保留额*@*
- +
奖励性绩效*
- +
艰苦边远@*地区*@津贴*
- +
南疆工作补贴*
- +
教护龄津贴*
- +
核增绩效工资*
- +
班主任补贴*
- +
补发基本工资*
- +
补发津补贴*
- +
补发绩效工资*
- +
补发其它津补@*贴*@*
- +
补发其它工资*
- +
基础绩效奖*
- +
补发奖励@*性*@绩效*
- +
应发工资*
- +
个人所得税*
- +
预扣保险年金*
- +
住房公积金*
- +
养老保险*
- +
医疗保险*
- +
职业年金*
- +
失业保险金*
- +
大额医疗互助*
- + +
+
+
病事假扣款*
+
扣发工资*
- +
实发工资*
- +
@Html.AppendJsFile("/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js index 046f06abc..5176421a3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/Index.js @@ -136,6 +136,7 @@ var bootstrap = function ($, learun) { { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" }, { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" }, { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" }, + { label: "病事假扣款", name: "BingShiJiaKK", width: 100, align: "left" }, { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" }, { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" }, ], diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js index 570d6ab80..ebbde4a69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/SalaryInfo/IndexPersonal.js @@ -136,6 +136,7 @@ var bootstrap = function ($, learun) { { label: "职业年金", name: "ZhiYeNJ", width: 100, align: "left" }, { label: "失业保险金", name: "ShiYeBXJ", width: 100, align: "left" }, { label: "大额医疗互助", name: "YiLiao", width: 100, align: "left" }, + { label: "病事假扣款", name: "BingShiJiaKK", width: 100, align: "left" }, { label: "扣发工资", name: "KouFaGZ", width: 100, align: "left" }, { label: "实发工资", name: "ShiFaGZ", width: 100, align: "left" }, ], diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs index 4003cb52d..7eef96098 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/ReceiveSendFeeManagement/SalaryInfo/SalaryInfoEntity.cs @@ -179,6 +179,12 @@ namespace Learun.Application.TwoDevelopment.ReceiveSendFeeManagement /// [Column("YILIAO")] public decimal? YiLiao { get; set; } + /// + /// 病事假扣款 + /// + [Column("BingShiJiaKK")] + public decimal? BingShiJiaKK { get; set; } + /// /// 扣发工资 ///