工资条新增改下拉框

优化工资条导入功能

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.cshtml

@@ -3,201 +3,201 @@
     Layout = "~/Views/Shared/_Form.cshtml";
 }
 <div class="lr-form-wrap" id="form">
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">姓名</div>
-        <input id="SalaryName" type="text" class="form-control"  />
+        <div id="UserId"></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">岗位工资</div>
-        <input id="PostSalary" type="text" class="form-control"  />
+        <input id="PostSalary" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">薪级工资</div>
-        <input id="PayWages" type="text" class="form-control"  />
+        <input id="PayWages" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">提高百分之十</div>
-        <input id="UpTenpercent" type="text" class="form-control"  />
+        <input id="UpTenpercent" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">校内补贴</div>
-        <input id="SchoolSub" type="text" class="form-control"  />
+        <input id="SchoolSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">临时性补贴</div>
-        <input id="TemporarySub" type="text" class="form-control"  />
+        <input id="TemporarySub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">职级工资</div>
-        <input id="RankWage" type="text" class="form-control"  />
+        <input id="RankWage" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">级差补贴</div>
-        <input id="DifferentialSub" type="text" class="form-control"  />
+        <input id="DifferentialSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">绩效工资</div>
-        <input id="MeritPay" type="text" class="form-control"  />
+        <input id="MeritPay" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">绩效工资减少额</div>
-        <input id="MeritPayLess" type="text" class="form-control"  />
+        <input id="MeritPayLess" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">月发一次性绩效</div>
-        <input id="MonthlyoneMerit" type="text" class="form-control"  />
+        <input id="MonthlyoneMerit" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">倾斜</div>
-        <input id="Tilt" type="text" class="form-control"  />
+        <input id="Tilt" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">课时费</div>
-        <input id="Classfees" type="text" class="form-control"  />
+        <input id="Classfees" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">超课时</div>
-        <input id="SuperClass" type="text" class="form-control"  />
+        <input id="SuperClass" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">培训课酬</div>
-        <input id="TrainingDollars" type="text" class="form-control"  />
+        <input id="TrainingDollars" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">奖金</div>
-        <input id="Bonus" type="text" class="form-control"  />
+        <input id="Bonus" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">婴补</div>
-        <input id="BabySubsidies" type="text" class="form-control"  />
+        <input id="BabySubsidies" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">班主任</div>
-        <input id="ClassTeacher" type="text" class="form-control"  />
+        <input id="ClassTeacher" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">骨干津贴</div>
-        <input id="KeyBenefits" type="text" class="form-control"  />
+        <input id="KeyBenefits" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">职务补</div>
-        <input id="PositionFill" type="text" class="form-control"  />
+        <input id="PositionFill" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">加班费</div>
-        <input id="OvertimePay" type="text" class="form-control"  />
+        <input id="OvertimePay" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">值班费</div>
-        <input id="OnDutyfee" type="text" class="form-control"  />
+        <input id="OnDutyfee" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">考务费</div>
-        <input id="ExaminationFee" type="text" class="form-control"  />
+        <input id="ExaminationFee" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">安全绩效</div>
-        <input id="SecurityPay" type="text" class="form-control"  />
+        <input id="SecurityPay" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">医药费</div>
-        <input id="MedicalBills" type="text" class="form-control"  />
+        <input id="MedicalBills" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">防暑降温</div>
-        <input id="CoolingPurposes" type="text" class="form-control"  />
+        <input id="CoolingPurposes" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">房补</div>
-        <input id="HousSub" type="text" class="form-control"  />
+        <input id="HousSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">物业补贴</div>
-        <input id="PropertySub" type="text" class="form-control"  />
+        <input id="PropertySub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">采暖补贴</div>
-        <input id="HeatingSub" type="text" class="form-control"  />
+        <input id="HeatingSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">综合补助</div>
-        <input id="ComprehensiveSub" type="text" class="form-control"  />
+        <input id="ComprehensiveSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">综治奖</div>
-        <input id="ControlSub" type="text" class="form-control"  />
+        <input id="ControlSub" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">补发</div>
-        <input id="Replacement" type="text" class="form-control"  />
+        <input id="Replacement" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">应发合计</div>
-        <input id="SendSum" type="text" class="form-control"  />
+        <input id="SendSum" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">失保</div>
-        <input id="LossInsurance" type="text" class="form-control"  />
+        <input id="LossInsurance" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">养保</div>
-        <input id="Bartender" type="text" class="form-control"  />
+        <input id="Bartender" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">职业年金</div>
-        <input id="OcPension" type="text" class="form-control"  />
+        <input id="OcPension" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">房积金</div>
-        <input id="HousFund" type="text" class="form-control"  />
+        <input id="HousFund" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">医保</div>
-        <input id="HealthCare" type="text" class="form-control"  />
+        <input id="HealthCare" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">房租</div>
-        <input id="TheRent" type="text" class="form-control"  />
+        <input id="TheRent" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">网费</div>
-        <input id="InternetFee" type="text" class="form-control"  />
+        <input id="InternetFee" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">考核扣款</div>
-        <input id="AssDeductions" type="text" class="form-control"  />
+        <input id="AssDeductions" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">其他扣款</div>
-        <input id="OtherDeductions" type="text" class="form-control"  />
+        <input id="OtherDeductions" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">代扣个税</div>
-        <input id="WithBuckletax" type="text" class="form-control"  />
+        <input id="WithBuckletax" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">扣款合计</div>
-        <input id="DeductionsSum" type="text" class="form-control"  />
+        <input id="DeductionsSum" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">纳税收入</div>
-        <input id="TaxRevenue" type="text" class="form-control"  />
+        <input id="TaxRevenue" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">免税收入</div>
-        <input id="TaxIncome" type="text" class="form-control"  />
+        <input id="TaxIncome" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">应发合计</div>
-        <input id="NetCombined" type="text" class="form-control"  />
+        <input id="NetCombined" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">发放月份</div>
-        <input id="IssueMonth" type="text" class="form-control"  />
+        <input id="IssueMonth" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="EMP_Payroll" >
+    <div class="col-xs-6 lr-form-item" data-table="EMP_Payroll">
         <div class="lr-form-item-title">发放年份</div>
-        <input id="IssueYear" type="text" class="form-control"  />
+        <input id="IssueYear" type="text" class="form-control" />
     </div>
 </div>
 @Html.AppendJsFile("/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Form.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); 
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_Payroll/Index.js

@@ -90,7 +90,20 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/Emp_Payroll/GetPageList',
                 headData: [
-                    { label: "姓名", name: "SalaryName", width: 100, align: "left" },
+                    //{ label: "姓名", name: "UserId", width: 100, align: "left" },
+                    {
+                        label: "名称", name: "UserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "岗位工资", name: "PostSalary", width: 100, align: "left", statistics: true },
                     { label: "薪级工资", name: "PayWages", width: 100, align: "left", statistics: true },
                     { label: "提高百分之十", name: "UpTenpercent", width: 100, align: "left", statistics: true },

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.cshtml

@@ -5,7 +5,7 @@
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
         <div class="lr-form-item-title">姓名</div>
-        <input id="SalaryName" type="text" class="form-control" />
+        <div id="UserId"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="EMP_PayrollOnce">
         <div class="lr-form-item-title">发放月份</div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Form.js

@@ -15,6 +15,7 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
+            $('#UserId').lrDataSourceSelect({ code: 'TeacherInfo', value: 'f_userid', text: 'f_realname' }); 
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/Emp_PayrollOnce/Index.js

@@ -90,7 +90,20 @@ var bootstrap = function ($, learun) {
             $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/PersonnelManagement/Emp_PayrollOnce/GetPageList',
                 headData: [
-                    { label: "姓名", name: "SalaryName", width: 100, align: "left" },
+                    //{ label: "姓名", name: "UserId", width: 100, align: "left" },
+                    {
+                        label: "名称", name: "UserId", width: 100, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'TeacherInfo',
+                                key: value,
+                                keyId: 'f_userid',
+                                callback: function (_data) {
+                                    callback(_data['f_realname']);
+                                }
+                            });
+                        }
+                    },
                     { label: "应发金额", name: "TotalPayAmount", width: 100, align: "left", statistics: true },
                     { label: "实发金额", name: "FinalPayAmount", width: 100, align: "left", statistics: true },
                     { label: "发放月份", name: "IssueMonth", width: 100, align: "left" },

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_Payroll/EMP_PayrollEntity.cs

@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("SALARYID")]
         public string SalaryID { get; set; }
+        /// <summary> 
+        /// 教师编码 
+        /// </summary> 
+        [Column("USERID")]
+        public string UserId { get; set; } 
         /// <summary>
         /// SalaryName
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/Emp_PayrollOnce/EMP_PayrollOnceEntity.cs

@@ -20,6 +20,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("SALARYID")]
         public string SalaryID { get; set; }
+        /// <summary> 
+        /// 教师编码 
+        /// </summary> 
+        [Column("USERID")]
+        public string UserId { get; set; }
         /// <summary>
         /// 姓名
         /// </summary>