From cd82633fc62dcfe2ee608491a7c8050e9df6a3e6 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Mon, 27 May 2024 10:57:01 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=B7=A5?=
 =?UTF-8?q?=E8=B5=84=E6=9D=A1=E7=AE=A1=E7=90=86=EF=BC=9A=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/WageSchedule/Form.cshtml            | 175 +++++++++---------
 .../Views/WageSchedule/Index.js               |   4 +-
 2 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml
index 45640907a..328504119 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Form.cshtml	
@@ -2,7 +2,23 @@
     ViewBag.Title = "工资条";
     Layout = "~/Views/Shared/_Form.cshtml";
 }
+<style>
+    .lr-form-item-title{
+        width:130px;
+    }
+    .lr-form-item{
+        padding-left:130px;
+    }
+</style>
 <div class="lr-form-wrap" id="form">
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">发放年份<font face="宋体">*</font></div>
+        <div id="IssueYear" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">发放月份<font face="宋体">*</font></div>
+        <div id="IssueMonth" isvalid="yes" checkexpession="NotNull"></div>
+    </div>
     <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">序号</div>
         <input id="No" type="text" class="form-control" />
@@ -11,109 +27,84 @@
         <div class="lr-form-item-title">姓名<font face="宋体">*</font></div>
         <div id="EmpName" isvalid="yes" checkexpession="NotNull"></div>
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">人员类别</div>
-        <input id="PeopleType" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">岗位等级</div>
-        <input id="PostType" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">薪级</div>
-        <input id="PayGrade" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">身份证号<font face="宋体">*</font></div>
+        <input id="WageCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-4 lr-form-item">
+    <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">岗位工资</div>
         <input id="PostWage" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
+    <div class="col-xs-6 lr-form-item">
         <div class="lr-form-item-title">薪级工资</div>
         <input id="PayGradeWage" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">百分之十</div>
-        <input id="TenPercent" type="text" class="form-control" />
-    </div>
-
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" style="width: 40%;">基础性绩效(绩效)</div>
-        <input id="BasicsPerformance" type="text" class="form-control" style="width: 80%; float: right;" />
+        <div class="lr-form-item-title">基础绩效奖</div>
+        <input id="BasicsPerformance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">奖励绩效(绩效)</div>
-        <input id="AwardPerformance" type="text" class="form-control" />
+        <div class="lr-form-item-title">保留地区补贴</div>
+        <input id="WorkKeep" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title" style="width: 40%;">基础性绩效(单列)</div>
-        <input id="SeparateBasicsPerformance" type="text" class="form-control" style="width: 80%; float: right;" />
+        <div class="lr-form-item-title">保留地区补贴保留额</div>
+        <input id="NationAllowance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">奖励绩效(单列)</div>
-        <input id="SeparateAwardPerformance" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-3 lr-form-item">
-        <div class="lr-form-item-title">艰边津贴</div>
+        <div class="lr-form-item-title">艰苦边远地区津贴</div>
         <input id="RoughEdgeAllowance" type="text" class="form-control" />
     </div>
-    <div class="col-xs-3 lr-form-item">
-        <div class="lr-form-item-title">民族津贴</div>
-        <input id="NationAllowance" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-3 lr-form-item">
-        <div class="lr-form-item-title">教龄津贴</div>
-        <input id="TeachAllowance" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-3 lr-form-item">
-        <div class="lr-form-item-title">特级教师津贴</div>
-        <input id="SuperfineTeacherResearch" type="text" class="form-control" />
-    </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">交通补贴</div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">增补抵交临时性补贴</div>
         <input id="Transportation" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">物业补贴</div>
-        <input id="RealeState" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">(备选3)</div>
+        <input id="Other" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">工改保留补贴</div>
-        <input id="WorkKeep" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">纳入绩效工资的活工资</div>
+        <input id="AwardPerformance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">女职工卫生费</div>
-        <input id="GirlStaffSanitation" type="text" class="form-control" />
+        <div class="lr-form-item-title">基础性绩效工资</div>
+        <input id="SeparateBasicsPerformance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">乡镇补贴</div>
-        <input id="TeacherAndTown" type="text" class="form-control" />
+        <div class="lr-form-item-title">岗位津贴补贴</div>
+        <input id="TeachAllowance" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">住房补贴</div>
-        <input id="HousingAllowance" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">其它津贴补贴</div>
+        <input id="RealeState" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">住房公积金</div>
-        <input id="HousingFundAllowance" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">奖励性绩效工资</div>
+        <input id="SeparateAwardPerformance" type="text" class="form-control" />
     </div>
-    <div class="col-xs-4 lr-form-item">
-        <div class="lr-form-item-title">其他</div>
-        <input id="OtherOne" type="text" class="form-control" />
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">补发工资</div>
+        <input id="SuperfineTeacherResearch" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">应发合计</div>
+        <div class="lr-form-item-title">应发工资</div>
         <input id="TotalGrossPay" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">代扣合计</div>
-        <input id="DeductionsSubtotal" type="text" class="form-control" />
+        <div class="lr-form-item-title">住房公积金</div>
+        <input id="HousingFundAllowance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">公积金</div>
-        <input id="AccumulationFund" type="text" class="form-control" />
+        <div class="lr-form-item-title">个人所得税</div>
+        <input id="PersonalIncomeTax" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">养老保险</div>
+        <div class="lr-form-item-title">医疗保险金</div>
+        <input id="MedicalInsurance" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">养老保险金</div>
         <input id="EndowmentInsurance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
@@ -121,40 +112,52 @@
         <input id="OccupationalAnnuities" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">医疗保险</div>
-        <input id="MedicalInsurance" type="text" class="form-control" />
+        <div class="lr-form-item-title">失业保险金</div>
+        <input id="UnemploymentInsurance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">失业保险</div>
-        <input id="UnemploymentInsurance" type="text" class="form-control" />
+        <div class="lr-form-item-title">其它扣款2</div>
+        <input id="OtherOne" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">工会工费</div>
-        <input id="LaborUnionWage" type="text" class="form-control" />
+        <div class="lr-form-item-title">基本代扣合计</div>
+        <input id="DeductionsSubtotal" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">个人所得税</div>
-        <input id="PersonalIncomeTax" type="text" class="form-control" />
+        <div class="lr-form-item-title">单位扣款1</div>
+        <input id="TenPercent" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">其他</div>
-        <input id="Other" type="text" class="form-control" />
+        <div class="lr-form-item-title">单位扣款2</div>
+        <input id="GirlStaffSanitation" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">实发合计</div>
-        <input id="NetCombined" type="text" class="form-control" />
+        <div class="lr-form-item-title">单位扣款3</div>
+        <input id="TeacherAndTown" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">工资卡号<font face="宋体">*</font></div>
-        <input id="WageCardNo" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <div class="lr-form-item-title">单位扣款4</div>
+        <input id="HousingAllowance" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放年份<font face="宋体">*</font></div>
-        <div id="IssueYear" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">单位扣款5</div>
+        <input id="AccumulationFund" type="text" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item">
-        <div class="lr-form-item-title">发放月份<font face="宋体">*</font></div>
-        <div id="IssueMonth" isvalid="yes" checkexpession="NotNull"></div>
+        <div class="lr-form-item-title">单位扣款6</div>
+        <input id="LaborUnionWage" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">单位扣款7</div>
+        <input id="FiscalDirect" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">单位扣款合计</div>
+        <input id="BankWithholding" type="text" class="form-control" />
+    </div>
+    <div class="col-xs-6 lr-form-item">
+        <div class="lr-form-item-title">个人实发工资</div>
+        <input id="NetCombined" type="text" class="form-control" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/EducationalAdministration/Views/WageSchedule/Form.js")
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js
index d2c24414b..37551da90 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/Index.js	
@@ -55,7 +55,7 @@ var bootstrap = function ($, learun) {
                     id: 'form',
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form',
-                    width: 800,
+                    width: 1000,
                     height: 800,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
@@ -75,7 +75,7 @@ var bootstrap = function ($, learun) {
                         id: 'form',
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form?keyValue=' + keyValue,
-                        width: 800,
+                        width: 1000,
                         height: 800,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);