Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/WageScheduleController.cs

@@ -30,6 +30,15 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
             return View();
         }
         /// <summary>
+        /// 主页面
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexPrint()
+        {
+            return View();
+        }
+        /// <summary>
         /// 我的工资条
         /// </summary>
         /// <returns></returns>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexPrint.cshtml

@@ -0,0 +1,57 @@
+@{
+    ViewBag.Title = "工资条";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">年份</div>
+                                    <div id="IssueYear"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">月份</div>
+                                    <div id="IssueMonth"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">人员类别</div>
+                                    <div id="PeopleType"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">岗位等级</div>
+                                    <div id="PostType"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">薪级</div>
+                                    <div id="PayGrade"></div>
+                                </div>
+                                <div class="col-xs-6 lr-form-item">
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">银行卡号</div>
+                                    <input id="WageCardNo" type="text" class="form-control" />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    @*<div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    </div>*@
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/EducationalAdministration/Views/WageSchedule/IndexPrint.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/WageSchedule/IndexPrint.js

@@ -0,0 +1,269 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-11-07 11:54
+ * 描  述：工资条
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            //年份
+            $('#IssueYear').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/MP_ManagementPlan/GetAcademicYear',
+                value: 'value',
+                text: 'text'
+            });
+            $('#IssueMonth').lrDataItemSelect({ code: 'MPMonth' });
+            $('#PeopleType').lrselect({
+                placeholder: "请选择人员类别",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/PeopleType',
+                value: 'PeopleType',
+                text: 'PeopleType'
+            });
+            $('#PostType').lrselect({
+                placeholder: "请选择岗位等级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/PostType',
+                value: 'PostType',
+                text: 'PostType'
+            });
+            $('#PayGrade').lrselect({
+                placeholder: "请选择薪级",
+                allowSearch: true,
+                url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/PayGrade',
+                value: 'PayGrade',
+                text: 'PayGrade'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 新增
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '新增',
+                    url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form',
+                    width: 800,
+                    height: 800,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            // 编辑
+            $('#lr_edit').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                    if (CheckMark.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录中包含已审核项目！");
+                        return;
+                    }
+                    learun.layerForm({
+                        id: 'form',
+                        title: '编辑',
+                        url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/Form?keyValue=' + keyValue,
+                        width: 800,
+                        height: 800,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                }
+            });
+            // 删除
+            $('#lr_delete').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                if (learun.checkrow(keyValue)) {
+                    if (CheckMark.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录中包含已审核项目！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认删除该项！', function (res) {
+                        if (res) {
+                            learun.deleteForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/DeleteForm', { keyValue: keyValue }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核
+            $('#lr_check').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                    if (CheckMark.indexOf('1') != -1) {
+                        learun.alert.warning("选中记录中包含已审核项目！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认审核该项？', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/CheckForm', { keyValue: keyValue, Status: '1' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //去审
+            $('#lr_uncheck').on('click', function () {
+                var keyValue = $('#gridtable').jfGridValue('Id');
+                if (learun.checkrow(keyValue)) {
+                    var CheckMark = $('#gridtable').jfGridValue('F_EnabledMark');
+                    var CheckMarkArr = CheckMark.split(',');
+                    if ($.inArray('0', CheckMarkArr) != -1 || $.inArray('', CheckMarkArr) != -1) {
+                        learun.alert.warning("选中记录中包含未审核项目！");
+                        return;
+                    }
+                    learun.layerConfirm('是否确认取消审核该项？', function (res) {
+                        if (res) {
+                            learun.postForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/CheckForm', { keyValue: keyValue, Status: '2' }, function () {
+                                refreshGirdData();
+                            });
+                        }
+                    });
+                }
+            });
+            //审核全部
+            $('#lr_checkall').on('click', function () {
+                learun.layerConfirm('是否确认全部审核？', function (res) {
+                    if (res) {
+                        learun.postForm(top.$.rootUrl + '/EducationalAdministration/WageSchedule/CheckForm', { keyValue: null, Status: '0' }, function () {
+                            refreshGirdData();
+                        });
+                    }
+                });
+            });
+            ///上传
+            $('#lr_import').on('click',
+                function () {
+                    learun.layerForm({
+                        id: 'form',
+                        title: '导入',
+                        url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/ImportForm',
+                        width: 600,
+                        height: 400,
+                        btn: null,
+                        callBack: function (id) {
+                            return top[id].acceptClick(refreshGirdData);
+                        }
+                    });
+                });
+        },
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/WageSchedule/GetPageList',
+                headData: [
+                    { label: '序号', name: 'No', width: 70, align: "left" },
+                    { label: '姓名', name: 'EmpName', width: 70, align: "left" },
+                    { label: '工资卡号', name: 'WageCardNo', width: 130, align: "left" },
+                    { label: '人员类别', name: 'PeopleType', width: 70, align: "left" },
+                    { label: '岗位等级', name: 'PostType', width: 70, align: "left" },
+                    { label: '薪级', name: 'PayGrade', width: 50, align: "left" },
+                    { label: '应发合计', name: 'TotalGrossPay', width: 70, align: "left", statistics: true },
+                    //{
+                    //    label: '基本工资', name: '基本工资', width: 130, align: "center", statistics: true,
+                    //    children: [
+                    { label: '岗位工资', name: 'PostWage', width: 70, align: "left", statistics: true },
+                    { label: '薪级工资', name: 'PayGradeWage', width: 70, align: "left", statistics: true },
+                    { label: '百分之十', name: 'TenPercent', width: 70, align: "left", statistics: true },
+                    //{ label: '小计', name: 'BasePay', width: 70, align: "left", statistics: true }
+                    //    ]
+                    //},
+                    //{
+                    //    label: '绩效工资', name: '绩效工资', width: 70, align: "center", statistics: true,
+                    //    children: [
+                    { label: '基础绩效', name: 'BasicsPerformance', width: 70, align: "left", statistics: true },
+                    { label: '奖励绩效', name: 'AwardPerformance', width: 70, align: "left", statistics: true },
+                    //    ]
+                    //},
+                    //{
+                    //    label: '单列绩效', name: '单列绩效', width: 70, align: "center", statistics: true,
+                    //    children: [
+                    { label: '基础绩效', name: 'SeparateBasicsPerformance', width: 70, align: "left", statistics: true },
+                    { label: '奖励绩效', name: 'SeparateAwardPerformance', width: 70, align: "left", statistics: true },
+                    //    ]
+                    //},
+                    //{
+                    //    label: '津贴补贴', name: '津贴补贴', width: 130, align: "center", statistics: true,
+                    //    children: [
+                    { label: '艰边津贴', name: 'RoughEdgeAllowance', width: 70, align: "left", statistics: true },
+                    { label: '民族津贴', name: 'NationAllowance', width: 70, align: "left", statistics: true },
+                    { label: '教龄补贴', name: 'TeachAllowance', width: 70, align: "left", statistics: true },
+                    { label: '特级教师津贴', name: 'SuperfineTeacherResearch', width: 80, align: "left", statistics: true },
+                    //    ]
+                    //},
+                    //{
+                    //label: '改革性补贴', name: '改革性补贴', width: 70, align: "center", statistics: true,
+                    //children: [
+                    { label: '交通补贴', name: 'Transportation', width: 70, align: "left", statistics: true },
+                    { label: '物业补贴', name: 'RealeState', width: 70, align: "left", statistics: true },
+                    { label: '工改保留补贴', name: 'WorkKeep', width: 90, align: "left", statistics: true },
+                    //    ]
+                    //},
+                    { label: '女职工卫生费', name: 'GirlStaffSanitation', width: 90, align: "left", statistics: true },
+                    { label: '乡镇补贴', name: 'TownshipSubsidy', width: 130, align: "center", statistics: true },
+                    { label: '住房补贴', name: 'HousingAllowance', width: 80, align: "left", statistics: true },
+                    { label: '住房公积金', name: 'HousingFundAllowance', width: 80, align: "left", statistics: true },
+                    { label: '其他', name: 'OtherOne', width: 70, align: "left", statistics: true },
+                    { label: '代扣合计', name: 'DeductionsSubtotal', width: 70, align: "left", statistics: true },
+                    //{
+                    //    label: '代扣代缴', name: '代扣代缴', width: 130, align: "center", statistics: true,
+                    //    children: [
+                    { label: '公积金', name: 'AccumulationFund', width: 70, align: "left", statistics: true },
+                    { label: '养老保险', name: 'EndowmentInsurance', width: 70, align: "left", statistics: true },
+                    { label: '职业年金', name: 'OccupationalAnnuities', width: 70, align: "left", statistics: true },
+                    { label: '医疗保险', name: 'MedicalInsurance', width: 70, align: "left", statistics: true },
+                    { label: '失业保险', name: 'UnemploymentInsurance', width: 70, align: "left", statistics: true },
+                    { label: '工会工费', name: 'LaborUnionWage', width: 70, align: "left", statistics: true },
+                    { label: '个人所得税', name: 'PersonalIncomeTax', width: 70, align: "left", statistics: true },
+                    { label: '其他', name: 'Other', width: 70, align: "left", statistics: true },
+                    //    ]
+                    //},
+                    //{ label: '财政直达', name: 'FiscalDirect', width: 70, align: "left", statistics: true },
+                    //{ label: '银行代扣', name: 'BankWithholding', width: 70, align: "left", statistics: true },
+                    { label: '实发合计', name: 'NetCombined', width: 70, align: "left", statistics: true },
+                    //{ label: '创建用户', name: 'CreateUser', width: 70, align: "left" },
+                    //{ label: '创建时间', name: 'CreateTime', width: 130, align: "left" },
+                    { label: '发放月份', name: 'IssueMonth', width: 70, align: "left" },
+                    { label: '发放年份', name: 'IssueYear', width: 70, align: "left" },
+                    {
+                        label: "审核状态", name: "F_EnabledMark", width: 70, align: "center",
+                        formatter: function (cellvalue) {
+                            return cellvalue == "1" ? "<span class=\"label label-success\">已审核</span>" : "<span class=\"label label-danger\">未审核</span>";
+                        }
+                    },
+                ],
+                mainId: 'Id',
+                isPage: true,
+                rows: 300,
+                sidx: 'IssueYear desc, IssueMonth desc, CreateTime desc ',
+                isMultiselect: true
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            param.Sqlparam = "";
+            $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1430,6 +1430,7 @@
     <Content Include="Areas\EducationalAdministration\Views\WageSchedule\ImportForm.css" />
     <Content Include="Areas\EducationalAdministration\Views\WageSchedule\ImportForm.js" />
     <Content Include="Areas\EducationalAdministration\Views\WageSchedule\IndexMy.js" />
+    <Content Include="Areas\EducationalAdministration\Views\WageSchedule\IndexPrint.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\AnswerIndex.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex2.js" />
     <Content Include="Areas\EvaluationTeach\Views\Eval_Main\TeacherIndex.js" />
@@ -8023,6 +8024,7 @@
     <Content Include="Areas\EducationalAdministration\Views\WageSchedule\IndexMy.cshtml" />
     <Content Include="Content\excel\SalarySheetImport.xls" />
     <Content Include="Areas\EducationalAdministration\Views\WageSchedule\ImportForm.cshtml" />
+    <Content Include="Areas\EducationalAdministration\Views\WageSchedule\IndexPrint.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/WageSchedule/WageScheduleService.cs

@@ -70,7 +70,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var strSql = new StringBuilder();
                 strSql.Append(" SELECT t.*,u.F_Account,u.F_RealName  FROM WageSchedule t ");
                 strSql.Append($"  left join {baseDataName}.dbo.LR_Base_User u on t.empname=u.F_RealName ");
-                strSql.Append("  where 1=1  ");
+                strSql.Append("  where 1=1 and  u.F_Description='教师' and u.F_DeleteMark = 0");
                 var userInfo = LoginUserInfo.Get();
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数
@@ -354,22 +354,25 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                         try
                         {
                             //检测是否有空值
-                            if (dr[1].ToString() == "" || dr[2].ToString() == "" || dr[3].ToString() == "" || dr[4].ToString() == "" || dr[5].ToString() == "" || dr[6].ToString() == "" || dr[26].ToString() == "" || dr[35].ToString() == "")
+                            if (dr[1].ToString() == "" || dr[3].ToString() == "" || dr[4].ToString() == "" || dr[5].ToString() == "" || dr[6].ToString() == "" || dr[26].ToString() == "" || dr[35].ToString() == "")
                             {
                                 throw (new Exception("行内必填项数据有空值，不能为空！"));
                             }
-                            if (dr[36].ToString() == "" || dr[37].ToString() == "")
-                            {
-                                throw (new Exception("发放年月不能为空"));
-                            }
                             if (EmpInfoEntities.Count(m => m.EmpName.ToUpper() == dr[1].ToString().ToUpper()) == 0)
                             {
                                 throw (new Exception("【姓名】不存在，请核对！"));
                             }
-
+                            if (dr[2].ToString() == "")
+                            {
+                                throw (new Exception("【工资卡号】不能为空"));
+                            }
+                            if (dr[36].ToString() == "" || dr[37].ToString() == "")
+                            {
+                                throw (new Exception("发放【年、月】不能为空"));
+                            }
                             if (wageScheduleEntityList.Count(x => x.IssueYear == dr[37].ToString() && x.IssueMonth == dr[36].ToInt() && x.EmpName == dr[1].ToString()) > 0)
                             {
-                                throw (new Exception("当月信息已重复,信息已忽略"));
+                                throw (new Exception("导入信息已重复,信息已忽略"));
                             }
 
                             //写入要导入的数据
@@ -418,8 +421,8 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                             };
 
                             wageScheduleEntityList.Add(wageScheduleEntity);
-                            //删除表中原有姓名,月份,年的数据
-                            //db.Delete<WageScheduleEntity>(x => x.EmpName == wageScheduleEntity.EmpName && x.IssueMonth == wageScheduleEntity.IssueMonth && x.IssueYear == wageScheduleEntity.IssueYear);
+                            //删除表中旧数据 及同年同月同名同姓之人
+                            db.Delete<WageScheduleEntity>(x => x.EmpName == wageScheduleEntity.EmpName && x.IssueMonth == wageScheduleEntity.IssueMonth && x.IssueYear == wageScheduleEntity.IssueYear);
                             snum++;
                         }
                         catch (Exception ex)

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -1158,13 +1158,13 @@
 		{
 			"path": "pages/Payslip/Payslip/list",
 			"style": {
-				"navigationBarTitleText": "财政工资条"
+				"navigationBarTitleText": "我的工资"
 			}
 		},
 		{
 			"path": "pages/Payslip/Payslip/single",
 			"style": {
-				"navigationBarTitleText": "财政工资条"
+				"navigationBarTitleText": "我的工资"
 			}
 		},
 		// 外聘工资条

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue

@@ -25,15 +25,29 @@
 				</view>
 				
 			</view>
+			
+			<view>
+				<view class="item-titlewrap" @click="GoTosingle(1)">
+					<text>应发合计</text>
+					<text>￥{{list.length > 0 ? list[0].TotalGrossPay || 0 : 0}}  <text class="text-xxl cuIcon cuIcon-right" style="font-size: 16px;" ></text>  </text>
+				</view>
+				
+				<view class="item-titlewrap" @click="GoTosingle(2)">
+					<text>代扣合计</text>
+					<text>￥{{list.length > 0 ? list[0].DeductionsSubtotal || 0 : 0}} <text class="text-xxl cuIcon cuIcon-right" style="font-size: 16px;" ></text> </text>
+				</view>
+				
+			</view>
+			
+			
  			<!-- 顶部条目/分页信息栏 -->
  			<!-- <l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner> -->
  
  			<!-- 滚动列表，跨端支持上拉/下拉 -->
- 			<l-scroll-list style="height: calc(100% - 250rpx);"  v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
+ 			<!-- <l-scroll-list style="height: calc(100% - 250rpx);"  v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
  				<l-customlist :tips="loadState" showTips>
- 					<!-- 单条记录 -->
  					<view class="customlist-item" v-for="item of list" :key="item.F_InvoiceId">
- 						<!-- <view class="customlist-item-field">
+ 						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">工资卡号：</text>
  							{{ displayListItem(item, 'WageCardNo') }}
  						</view>
@@ -52,7 +66,7 @@
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">应发合计：</text>
  							{{ displayListItem(item, 'TotalGrossPay') }}
- 						</view> -->
+ 						</view>
  						<view class="item-title">基本工资</view>
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">岗位工资：</text>
@@ -66,7 +80,7 @@
  							<text class="customlist-item-field-title">百分之十：</text>
  							{{ displayListItem(item, 'TenPercent') }}
  						</view>
- 						<!-- <view class="item-title">绩效工资</view> -->
+ 						<view class="item-title">绩效工资</view>
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">基础绩效：</text>
  							{{ displayListItem(item, 'BasicsPerformance') }}
@@ -75,7 +89,7 @@
  							<text class="customlist-item-field-title">奖励绩效：</text>
  							{{ displayListItem(item, 'AwardPerformance') }}
  						</view>
- 						<!-- <view class="item-title">单列绩效</view> -->
+ 						<view class="item-title">单列绩效</view>
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">基础绩效：</text>
  							{{ displayListItem(item, 'SeparateBasicsPerformance') }}
@@ -84,7 +98,7 @@
  							<text class="customlist-item-field-title">奖励绩效：</text>
  							{{ displayListItem(item, 'SeparateAwardPerformance') }}
  						</view>
- 						<!-- <view class="item-title">津贴补贴</view> -->
+ 						<view class="item-title">津贴补贴</view>
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">艰边津贴：</text>
  							{{ displayListItem(item, 'RoughEdgeAllowance') }}
@@ -101,7 +115,7 @@
  							<text class="customlist-item-field-title">特级教师津贴：</text>
  							{{ displayListItem(item, 'SuperfineTeacherResearch') }}
  						</view>
- 						<!-- <view class="item-title">改革性补贴</view> -->
+ 						<view class="item-title">改革性补贴</view>
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">交通补贴：</text>
  							{{ displayListItem(item, 'Transportation') }}
@@ -171,7 +185,7 @@
  							<text class="customlist-item-field-title">其他：</text>
  							{{ displayListItem(item, 'Other') }}
  						</view>
- 						<!-- <view class="customlist-item-field">
+ 						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">姓名：</text>
  							{{ displayListItem(item, 'EmpName') }}
  						</view>
@@ -197,14 +211,13 @@
  						<view class="customlist-item-field">
  							<text class="customlist-item-field-title">实发合计：</text>
  							{{ displayListItem(item, 'NetCombined') }}
- 						</view> -->
+ 						</view>
  
- 						<!-- 操作按钮组 -->
- 						<!-- <l-customlist-action @view="action('view', item)" @edit="action('edit', item)"
- 							:showEdit="false" /> -->
+ 						<l-customlist-action @view="action('view', item)" @edit="action('edit', item)"
+ 							:showEdit="false" />
  					</view>
  				</l-customlist>
- 			</l-scroll-list>
+ 			</l-scroll-list> -->
  		</view>
  
  		<!-- 关闭筛选栏按钮 -->
@@ -572,7 +585,15 @@
  			reset() {
  				this.queryData = this.COPY(this.defaultQueryData)
  				this.searchChange()
- 			}
+ 			},
+			
+			// 点击跳转到详情页
+			GoTosingle(type){
+				let _this = this
+				uni.navigateTo({
+				    url: './single?type='+type+'&item='+encodeURIComponent(JSON.stringify(_this.list))
+				});
+			}
  		}
  	}
  </script>
@@ -586,6 +607,8 @@
  		padding-left: 0;
  		padding-right: 0;
 		padding-top: 0;
+		padding-bottom: 0;
+		border-top: none !important;
  	}
  	.customlist-item-field{
  		padding-left: 10px;
@@ -662,7 +685,16 @@
  		font-size: 16px;
  		line-height: 36px;
  		background: #f1f1f1;
- 		margin-top: 5px;
  		padding-left: 5px;
  	}
+	.item-titlewrap{
+		color: #000;
+		font-size: 16px;
+		line-height: 50px;
+		background: #f1f1f1;
+		padding:0 10px;
+		border-bottom: 1rpx solid #ddd;
+		display: flex;
+		justify-content: space-between;
+	}
  </style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue

@@ -1,43 +1,44 @@
 <template> 
   <view class="page"> 
     <view v-if="ready">
-	  <view class="item-title">基本信息</view>
-      <l-input 
+	  <!-- <view class="item-title">{{itemtitle}}</view> -->
+      <!-- <l-input 
         @input="setValue('WageSchedule.EmpName', $event)"
         :value="getValue('WageSchedule.EmpName')"
         :disabled="!edit"
         title="姓名"
-      /> 
+      /> -->
 	  <!-- <l-input
 	    @input="setValue('WageSchedule.IdCardNo', $event)"
 	    :value="getValue('WageSchedule.IdCardNo')"
 	    :disabled="!edit"
 	    title="身份证号"
 	  /> -->
-	  <l-input
+	  <!-- <l-input
 	    @input="setValue('WageSchedule.PeopleType', $event)"
 	    :value="getValue('WageSchedule.PeopleType')"
 	    :disabled="!edit"
 	    title="人员类别"
-	  /> 
-	  <l-input
+	  /> -->
+	  <!-- <l-input
 	    @input="setValue('WageSchedule.PostType', $event)"
 	    :value="getValue('WageSchedule.PostType')"
 	    :disabled="!edit"
 	    title="岗位等级"
-	  /> 
-	  <l-input
+	  /> -->
+	  <!-- <l-input
 	    @input="setValue('WageSchedule.PayGrade', $event)"
 	    :value="getValue('WageSchedule.PayGrade')"
 	    :disabled="!edit"
 	    title="薪级"
-	  /> 
+	  /> -->
 	  <!-- <l-input
 	    @input="setValue('WageSchedule.TotalGrossPay', $event)"
 	    :value="getValue('WageSchedule.TotalGrossPay')"
 	    :disabled="!edit"
 	    title="应发合计"
 	  /> -->
+	  <view v-if="itemtype == 1">
 	  <view class="item-title">基本工资</view>
 	  <l-input
 	    @input="setValue('WageSchedule.PostWage', $event)"
@@ -57,19 +58,39 @@
 	    :disabled="!edit"
 	    title="百分之十"
 	  /> 
-	  <!-- <l-input
-	    @input="setValue('WageSchedule.BasePay', $event)"
-	    :value="getValue('WageSchedule.BasePay')"
+	  <view class="item-title">绩效工资</view>
+	  <l-input
+	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
+	    :value="getValue('WageSchedule.BasicsPerformance')"
 	    :disabled="!edit"
-	    title="小计"
-	  /> -->
+	    title="基础性绩效"
+	  /> 
+	  <l-input
+	    @input="setValue('WageSchedule.AwardPerformance', $event)"
+	    :value="getValue('WageSchedule.AwardPerformance')"
+	    :disabled="!edit"
+	    title="奖励绩效"
+	  /> 
+	  <view class="item-title">单列绩效</view>
+	  <l-input
+	    @input="setValue('WageSchedule.SeparateBasicsPerformance', $event)"
+	    :value="getValue('WageSchedule.SeparateBasicsPerformance')"
+	    :disabled="!edit"
+	    title="基础绩效"
+	  /> 
+	  <l-input
+	    @input="setValue('WageSchedule.SeparateAwardPerformance', $event)"
+	    :value="getValue('WageSchedule.SeparateAwardPerformance')"
+	    :disabled="!edit"
+	    title="奖励绩效"
+	  /> 
 	  <view class="item-title">津贴补贴</view>
 	  <l-input
 	    @input="setValue('WageSchedule.RoughEdgeAllowance', $event)"
 	    :value="getValue('WageSchedule.RoughEdgeAllowance')"
 	    :disabled="!edit"
 	    title="艰边津贴"
-	  /> 
+	  />
 	  <l-input
 	    @input="setValue('WageSchedule.NationAllowance', $event)"
 	    :value="getValue('WageSchedule.NationAllowance')"
@@ -80,31 +101,14 @@
 	    @input="setValue('WageSchedule.TeachAllowance', $event)"
 	    :value="getValue('WageSchedule.TeachAllowance')"
 	    :disabled="!edit"
-	    title="教师津贴"
-	  /> 
-	  <!-- <l-input
-	    @input="setValue('WageSchedule.SubsidiesAllowances', $event)"
-	    :value="getValue('WageSchedule.SubsidiesAllowances')"
-	    :disabled="!edit"
-	    title="小计"
-	  /> -->
-	  
-	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
-	    :value="getValue('WageSchedule.BasicsPerformance')"
-	    :disabled="!edit"
-	    title="基础性绩效"
+	    title="教龄津贴"
 	  /> 
-	  
 	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
-	    :value="getValue('WageSchedule.GirlStaffSanitation')"
+	    @input="setValue('WageSchedule.SuperfineTeacherResearch', $event)"
+	    :value="getValue('WageSchedule.SuperfineTeacherResearch')"
 	    :disabled="!edit"
-	    title="女职工卫生费"
+	    title="特级教师津贴"
 	  /> 
-	  
 	  <view class="item-title">改革性补贴</view>
 	  <l-input
 	    @input="setValue('WageSchedule.Transportation', $event)"
@@ -124,35 +128,93 @@
 	    :disabled="!edit"
 	    title="工改保留补贴"
 	  /> 
-	  <!-- <l-input
-	    @input="setValue('WageSchedule.ReformSubsidySum', $event)"
-	    :value="getValue('WageSchedule.ReformSubsidySum')"
+	  <l-input
+	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
+	    :value="getValue('WageSchedule.GirlStaffSanitation')"
 	    :disabled="!edit"
-	    title="小计"
-	  /> -->
+	    title="女职工卫生费"
+	  /> 
 	  
 	  <l-input
-		class="top-15"
+	    @input="setValue('WageSchedule.TownshipSubsidy', $event)"
+	    :value="getValue('WageSchedule.TownshipSubsidy')"
+	    :disabled="!edit"
+	    title="乡镇补贴"
+	  /> 
+	  <l-input
 	    @input="setValue('WageSchedule.HousingAllowance', $event)"
 	    :value="getValue('WageSchedule.HousingAllowance')"
 	    :disabled="!edit"
 	    title="住房补贴"
 	  /> 
 	  <l-input
-		class="top-15"
 	    @input="setValue('WageSchedule.HousingFundAllowance', $event)"
 	    :value="getValue('WageSchedule.HousingFundAllowance')"
 	    :disabled="!edit"
 	    title="住房公积金"
 	  /> 
 	  <l-input
+	    @input="setValue('WageSchedule.OtherOne', $event)"
+	    :value="getValue('WageSchedule.OtherOne')"
+	    :disabled="!edit"
+	    title="其他"
+	  /> 
+	  
+	  
+		  
+	  </view>
+	  
+	  
+	  
+	  <!-- <l-input
+	    @input="setValue('WageSchedule.BasePay', $event)"
+	    :value="getValue('WageSchedule.BasePay')"
+	    :disabled="!edit"
+	    title="小计"
+	  /> -->
+	  
+	  
+	  
+	  <!-- <l-input
+	    @input="setValue('WageSchedule.SubsidiesAllowances', $event)"
+	    :value="getValue('WageSchedule.SubsidiesAllowances')"
+	    :disabled="!edit"
+	    title="小计"
+	  /> -->
+	  
+	  <!-- <l-input
+		class="top-15"
+	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
+	    :value="getValue('WageSchedule.BasicsPerformance')"
+	    :disabled="!edit"
+	    title="基础性绩效"
+	  /> -->
+	  
+	 
+	  
+	 
+	  <!-- <l-input
+	    @input="setValue('WageSchedule.ReformSubsidySum', $event)"
+	    :value="getValue('WageSchedule.ReformSubsidySum')"
+	    :disabled="!edit"
+	    title="小计"
+	  /> -->
+	  
+	  
+	 
+	  <!-- <l-input
 		class="top-15"
 	    @input="setValue('WageSchedule.TeacherAndTown', $event)"
 	    :value="getValue('WageSchedule.TeacherAndTown')"
 	    :disabled="!edit"
 	    title="特级教师津贴和乡镇补贴"
-	  /> 
-	  <view class="item-title">扣款</view>
+	  /> -->
+	  
+	  <view v-if="itemtype == 2">
+		  
+	 
+	  
+	  <view class="item-title">代扣代缴</view>
 	  <!-- <l-input
 	    @input="setValue('WageSchedule.DeductionsSubtotal', $event)"
 	    :value="getValue('WageSchedule.DeductionsSubtotal')"
@@ -165,18 +227,6 @@
 	    :disabled="!edit"
 	    title="公积金"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
-	    :value="getValue('WageSchedule.LaborUnionWage')"
-	    :disabled="!edit"
-	    title="工会工费"
-	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
-	    :value="getValue('WageSchedule.PersonalIncomeTax')"
-	    :disabled="!edit"
-	    title="个人所得税"
-	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.EndowmentInsurance', $event)"
 	    :value="getValue('WageSchedule.EndowmentInsurance')"
@@ -201,13 +251,25 @@
 	    :disabled="!edit"
 	    title="失业保险"
 	  /> 
+	  <l-input
+	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
+	    :value="getValue('WageSchedule.LaborUnionWage')"
+	    :disabled="!edit"
+	    title="工会工费"
+	  /> 
+	  <l-input
+	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
+	    :value="getValue('WageSchedule.PersonalIncomeTax')"
+	    :disabled="!edit"
+	    title="个人所得税"
+	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.Other', $event)"
 	    :value="getValue('WageSchedule.Other')"
 		:disabled="!edit"
 	    title="其他"
 	  /> 
-	  
+	   </view>
 	  <!-- <l-input
 		class="top-15"
 	    @input="setValue('WageSchedule.FiscalDirect', $event)"
@@ -222,7 +284,7 @@
 	    :disabled="!edit"
 	    title="银行代扣"
 	  /> -->
-	  <l-input
+	  <!-- <l-input
 		class="top-15"
 	    @input="setValue('WageSchedule.NetCombined', $event)"
 	    :value="getValue('WageSchedule.NetCombined')"
@@ -235,7 +297,7 @@
 	    :value="getValue('WageSchedule.WageCardNo')"
 	    :disabled="!edit"
 	    title="工资卡号"
-	  /> 
+	  /> -->
 	  <!-- <l-input
 		class="top-15"
 	    @input="setValue('WageSchedule.CreateUser', $event)"
@@ -358,6 +420,7 @@ export default {
 		  NationAllowance: { type: 'text', title: '民族津贴'},
 		  // 教师津贴TeachAllowance
 		  TeachAllowance: { type: 'text', title: '教师津贴'},
+		  SuperfineTeacherResearch:{ type: 'text', title: '特级教师津贴'},
 		  // 津贴补贴小计SubsidiesAllowances
 		  SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
 		  // 基础性绩效BasicsPerformance
@@ -366,8 +429,10 @@ export default {
 		  GirlStaffSanitation: { type: 'text', title: 'http://cyzjzx.gnway.cc:29904'},
 		  // 交通补贴Transportation
 		  Transportation: { type: 'text', title: '交通补贴'},
-		  // 物业补贴RealeState
-		  BasicsPerformance: { type: 'text', title: '基础性绩效'},
+		  // 奖励绩效RealeState
+		  AwardPerformance: { type: 'text', title: '奖励绩效'},
+		  SeparateAwardPerformance: { type: 'text', title: '奖励绩效'},
+		  SeparateBasicsPerformance:{ type: 'text', title: '基础绩效'},
 		  // 工改保留补贴WorkKeep
 		  WorkKeep: { type: 'text', title: '工改保留补贴'},
 		  // 改革性补贴小计ReformSubsidySum
@@ -414,6 +479,8 @@ export default {
 		  IssueMonth: { type: 'text', title: '发放月份'},
 		  // 发放年份IssueYear
 		  IssueYear: { type: 'text', title: '发放年份'},
+		  TownshipSubsidy:{ type: 'text', title: '乡镇补贴'},
+		  OtherOne:{ type: 'text', title: '其他'},
         }, 
   
       }, 
@@ -424,12 +491,24 @@ export default {
           JTypeId: [], 
         }, 
   
-      } 
+      },
+	  itemtitle:'',
+	  itemfrom:'',
+	  itemtype:''
     } 
   }, 
   
-  async onLoad({ type, id }) { 
-    await this.init(type, id) 
+  async onLoad(option) {
+	  const item = JSON.parse(decodeURIComponent(option.item));
+	  this.itemtype = option.type
+	  this.itemfrom = item[0]
+	  if(this.itemtype == 1){
+		  this.itemtitle = '基本工资'
+	  }else{
+		  this.itemtitle = '代扣代缴'
+	  }
+	  await this.init()
+    // await this.init('edit', '787141ce-a504-4782-90e7-7b9e9e5e161e') 
   }, 
   
   methods: { 
@@ -437,16 +516,15 @@ export default {
     async init(type, id) { 
       this.LOADING('加载数据中...') 
   
-      this.id = id 
-      this.mode = type 
+      // this.id = id 
+      // this.mode = type 
       // this.edit = ['create', 'edit'].includes(this.mode) 
   
       // 拉取表单数据，同时拉取所有来自数据源的选单数据 
       await Promise.all([ 
-  
-  
         () => {} 
       ]) 
+	  
       await this.fetchForm() 
   
       this.ready = true
@@ -455,13 +533,20 @@ export default {
   
     // 加载表单数据 
     async fetchForm() { 
-      if (this.mode === 'create') { 
-        this.origin = await this.getDefaultForm() 
-      } else { 
-        const result = await this.HTTP_GET('learun/adms/WageSchedule/form', this.id) 
-        this.origin = await this.formatFormData(result) 
-      } 
-      this.current = this.COPY(this.origin) 
+		
+		let originitem = {
+			WageSchedule : this.itemfrom
+		}
+		this.origin = await this.formatFormData(originitem) 
+		this.current = this.COPY(this.origin)
+		
+      // if (this.mode === 'create') { 
+      //   this.origin = await this.getDefaultForm() 
+      // } else { 
+      //   const result = await this.HTTP_GET('learun/adms/WageSchedule/form', this.id) 
+      //   this.origin = await this.formatFormData(result)
+      // } 
+      // this.current = this.COPY(this.origin) 
     }, 
   
     // 点击 「编辑」、「重置」、「保存」、「删除」 按钮