From a745b01447562348750a0c6fb55e7a7de36dcefa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=99=93=E7=90=AA?= <y1530857136@163.com>
Date: Wed, 9 Nov 2022 16:40:41 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=20=E5=B7=A5=E8=B5=84=E6=9D=A1=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/Payslip/Payslip/list.vue            |  16 +-
 .../pages/Payslip/Payslip/single.vue          |  26 +-
 .../pages/Payslip/recruitPayslip/list.vue     |  20 +-
 .../pages/Payslip/recruitPayslip/single.vue   | 253 ++++++++++--------
 .../pages/Payslip/welfarePayslip/list.vue     |  20 +-
 .../pages/Payslip/welfarePayslip/single.vue   | 253 ++++++++++--------
 6 files changed, 320 insertions(+), 268 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue
index 88df452cc..e67185753 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/list.vue	
@@ -10,6 +10,14 @@
         <l-customlist :tips="loadState" showTips>
           <!-- 单条记录 -->
           <view class="customlist-item" v-for="item of list" :key="item.F_InvoiceId">
+			  <view class="customlist-item-field">
+			    <text class="customlist-item-field-title">姓名：</text>
+			    {{ displayListItem(item, 'EmpName') }}
+			  </view>
+			  <view class="customlist-item-field">
+			    <text class="customlist-item-field-title">人员类别：</text>
+			    {{ displayListItem(item, 'PeopleType') }}
+			  </view>
             <view class="customlist-item-field">
               <text class="customlist-item-field-title">发放年份：</text>
               {{ displayListItem(item, 'IssueYear') }}
@@ -45,8 +53,8 @@
     <!-- 侧边栏 -->
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
       <view v-if="ready" class="padding">
-		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选" />
-		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选" />
+		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选,例:2022" />
+		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选,例:10" />
 		<l-input v-model="queryData.EmpName" @change="searchChange()" title="姓名" placeholder="按姓名筛选" />
 		<l-input v-model="queryData.PeopleType" @change="searchChange()" title="人员类别" placeholder="按人员类别筛选" />
         <view class="padding-tb">
@@ -74,6 +82,10 @@ export default {
       scheme: {
         // F_CustomerId: { type: 'select', dataSource: '1', dataSourceId: 'crmCustomer,f_fullname,f_customerid' },
         // F_InvoiceContent: { type: 'texteditor' },
+		// 姓名EmpName
+		EmpName: { type: 'text' },
+		// 人员类别PeopleType
+		PeopleType: { type: 'text' },
 		// 发放年份IssueYear
 		IssueYear: { type: 'text' },
 		// 发放月份IssueMonth
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue
index 5c578de11..02e7b80f1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue	
@@ -201,10 +201,10 @@
 	    :disabled="!edit"
 	    title="失业保险"
 	  /> 
-	  <l-input
+	  <l-textarea
 	    @input="setValue('WageSchedule.Other', $event)"
 	    :value="getValue('WageSchedule.Other')"
-	    :disabled="!edit"
+	    :readonly="!edit"
 	    title="其他"
 	  /> 
 	  
@@ -257,26 +257,6 @@
 	    :disabled="!edit"
 	    title="发放月份"
 	  /> 
-      <!-- <l-select 
-        @input="setValue('JournalSend.JTypeId', $event)"
-        :value="getValue('JournalSend.JTypeId')"
-        :disabled="!edit"
-        :range="dataSource.JournalSend.JTypeId"
-        title="日志类型"
-      /> 
-      <l-organize-picker 
-        @input="setValue('JournalSend.JReceiveId', $event)"
-        :value="getValue('JournalSend.JReceiveId')"
-        :readonly="!edit"
-        type="user"
-        title="接收人"
-      /> 
-      <l-textarea 
-        @input="setValue('JournalSend.JContent', $event)"
-        :value="getValue('JournalSend.JContent')"
-        :readonly="!edit"
-        title="日志内容"
-      /> -->
     </view> 
   
     <!-- <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
@@ -418,7 +398,9 @@ export default {
 		  // 工资卡号WageCardNo
 		  WageCardNo: { type: 'text', title: '工资卡号'},
 		  // CreateUser
+		  CreateUser: { type: 'text', title: '创建用户'},
 		  // CreateTime
+		  CreateTime: { type: 'text', title: '创建时间'},
 		  // UpdateUser
 		  // UpdateTime
 		  // 发放月份IssueMonth
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/list.vue
index 88df452cc..866b91cb2 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/list.vue	
@@ -10,6 +10,14 @@
         <l-customlist :tips="loadState" showTips>
           <!-- 单条记录 -->
           <view class="customlist-item" v-for="item of list" :key="item.F_InvoiceId">
+			  <view class="customlist-item-field">
+			    <text class="customlist-item-field-title">姓名：</text>
+			    {{ displayListItem(item, 'EmpName') }}
+			  </view>
+			  <view class="customlist-item-field">
+			    <text class="customlist-item-field-title">人员类别：</text>
+			    {{ displayListItem(item, 'PeopleType') }}
+			  </view>
             <view class="customlist-item-field">
               <text class="customlist-item-field-title">发放年份：</text>
               {{ displayListItem(item, 'IssueYear') }}
@@ -45,8 +53,8 @@
     <!-- 侧边栏 -->
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
       <view v-if="ready" class="padding">
-		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选" />
-		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选" />
+		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选,例:2022" />
+		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选,例:10" />
 		<l-input v-model="queryData.EmpName" @change="searchChange()" title="姓名" placeholder="按姓名筛选" />
 		<l-input v-model="queryData.PeopleType" @change="searchChange()" title="人员类别" placeholder="按人员类别筛选" />
         <view class="padding-tb">
@@ -74,6 +82,10 @@ export default {
       scheme: {
         // F_CustomerId: { type: 'select', dataSource: '1', dataSourceId: 'crmCustomer,f_fullname,f_customerid' },
         // F_InvoiceContent: { type: 'texteditor' },
+		// 姓名EmpName
+		EmpName: { type: 'text' },
+		// 人员类别PeopleType
+		PeopleType: { type: 'text' },
 		// 发放年份IssueYear
 		IssueYear: { type: 'text' },
 		// 发放月份IssueMonth
@@ -143,7 +155,7 @@ export default {
       }
 
       const result = await this.HTTP_GET(
-        'learun/adms/WageSchedule/getlist',
+        'learun/adms/Ououtsourcing/getlist',
         {
           pagination: { rows: 10, page: this.page, sidx: 'CreateTime', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
@@ -188,7 +200,7 @@ export default {
           return
 
         case 'view':
-          this.NAV_TO('./single?type=view&&id='+item.Id, item, true)
+          this.NAV_TO('./single?type=view&&id='+item.WPID, item, true)
           return
 
         case 'edit':
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue
index 5c578de11..684931955 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue	
@@ -3,260 +3,273 @@
     <view v-if="ready">
 	  <view class="item-title">基本信息</view>
       <l-input 
-        @input="setValue('WageSchedule.EmpName', $event)"
-        :value="getValue('WageSchedule.EmpName')"
+        @input="setValue('Ououtsourcing.EmpName', $event)"
+        :value="getValue('Ououtsourcing.EmpName')"
         :disabled="!edit"
         title="姓名"
       /> 
 	  <l-input
-	    @input="setValue('WageSchedule.IdCardNo', $event)"
-	    :value="getValue('WageSchedule.IdCardNo')"
+	    @input="setValue('Ououtsourcing.IdCardNo', $event)"
+	    :value="getValue('Ououtsourcing.IdCardNo')"
 	    :disabled="!edit"
 	    title="身份证号"
 	  /> 
+	 <l-input
+	    @input="setValue('Ououtsourcing.WageCardNo', $event)"
+	    :value="getValue('Ououtsourcing.WageCardNo')"
+	    :disabled="!edit"
+	    title="工资卡号"
+	  />
 	  <l-input
-	    @input="setValue('WageSchedule.PeopleType', $event)"
-	    :value="getValue('WageSchedule.PeopleType')"
+	    @input="setValue('Ououtsourcing.PeopleType', $event)"
+	    :value="getValue('Ououtsourcing.PeopleType')"
 	    :disabled="!edit"
 	    title="人员类别"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PostType', $event)"
-	    :value="getValue('WageSchedule.PostType')"
+	    @input="setValue('Ououtsourcing.PostType', $event)"
+	    :value="getValue('Ououtsourcing.PostType')"
 	    :disabled="!edit"
 	    title="岗位等级"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PayGrade', $event)"
-	    :value="getValue('WageSchedule.PayGrade')"
+	    @input="setValue('Ououtsourcing.PayGrade', $event)"
+	    :value="getValue('Ououtsourcing.PayGrade')"
 	    :disabled="!edit"
 	    title="薪级"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TotalGrossPay', $event)"
-	    :value="getValue('WageSchedule.TotalGrossPay')"
+	    @input="setValue('Ououtsourcing.TotalGrossPay', $event)"
+	    :value="getValue('Ououtsourcing.TotalGrossPay')"
 	    :disabled="!edit"
 	    title="应发合计"
 	  /> 
 	  <view class="item-title">基本工资</view>
 	  <l-input
-	    @input="setValue('WageSchedule.PostWage', $event)"
-	    :value="getValue('WageSchedule.PostWage')"
+	    @input="setValue('Ououtsourcing.PostWage', $event)"
+	    :value="getValue('Ououtsourcing.PostWage')"
 	    :disabled="!edit"
 	    title="岗位工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PayGradeWage', $event)"
-	    :value="getValue('WageSchedule.PayGradeWage')"
+	    @input="setValue('Ououtsourcing.PayGradeWage', $event)"
+	    :value="getValue('Ououtsourcing.PayGradeWage')"
 	    :disabled="!edit"
 	    title="薪级工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TenPercent', $event)"
-	    :value="getValue('WageSchedule.TenPercent')"
+	    @input="setValue('Ououtsourcing.TenPercent', $event)"
+	    :value="getValue('Ououtsourcing.TenPercent')"
 	    :disabled="!edit"
 	    title="百分之十"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.BasePay', $event)"
-	    :value="getValue('WageSchedule.BasePay')"
+	 <!-- <l-input
+	    @input="setValue('Ououtsourcing.BasePay', $event)"
+	    :value="getValue('Ououtsourcing.BasePay')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  <view class="item-title">津贴补贴</view>
 	  <l-input
-	    @input="setValue('WageSchedule.RoughEdgeAllowance', $event)"
-	    :value="getValue('WageSchedule.RoughEdgeAllowance')"
+	    @input="setValue('Ououtsourcing.RoughEdgeAllowance', $event)"
+	    :value="getValue('Ououtsourcing.RoughEdgeAllowance')"
 	    :disabled="!edit"
 	    title="艰边津贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.NationAllowance', $event)"
-	    :value="getValue('WageSchedule.NationAllowance')"
+	    @input="setValue('Ououtsourcing.NationAllowance', $event)"
+	    :value="getValue('Ououtsourcing.NationAllowance')"
 	    :disabled="!edit"
 	    title="民族津贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TeachAllowance', $event)"
-	    :value="getValue('WageSchedule.TeachAllowance')"
+	    @input="setValue('Ououtsourcing.TeachAllowance', $event)"
+	    :value="getValue('Ououtsourcing.TeachAllowance')"
 	    :disabled="!edit"
 	    title="教师津贴"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.SubsidiesAllowances', $event)"
-	    :value="getValue('WageSchedule.SubsidiesAllowances')"
+	 <!-- <l-input
+	    @input="setValue('Ououtsourcing.SubsidiesAllowances', $event)"
+	    :value="getValue('Ououtsourcing.SubsidiesAllowances')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
-	    :value="getValue('WageSchedule.BasicsPerformance')"
+	    @input="setValue('Ououtsourcing.BasicsPerformance', $event)"
+	    :value="getValue('Ououtsourcing.BasicsPerformance')"
 	    :disabled="!edit"
 	    title="基础性绩效"
 	  /> 
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
-	    :value="getValue('WageSchedule.GirlStaffSanitation')"
+	    @input="setValue('Ououtsourcing.GirlStaffSanitation', $event)"
+	    :value="getValue('Ououtsourcing.GirlStaffSanitation')"
 	    :disabled="!edit"
 	    title="女职工卫生费"
 	  /> 
 	  
 	  <view class="item-title">改革性补贴</view>
 	  <l-input
-	    @input="setValue('WageSchedule.Transportation', $event)"
-	    :value="getValue('WageSchedule.Transportation')"
+	    @input="setValue('Ououtsourcing.Transportation', $event)"
+	    :value="getValue('Ououtsourcing.Transportation')"
 	    :disabled="!edit"
 	    title="交通补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.RealeState', $event)"
-	    :value="getValue('WageSchedule.RealeState')"
+	    @input="setValue('Ououtsourcing.RealeState', $event)"
+	    :value="getValue('Ououtsourcing.RealeState')"
 	    :disabled="!edit"
 	    title="物业补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.WorkKeep', $event)"
-	    :value="getValue('WageSchedule.WorkKeep')"
+	    @input="setValue('Ououtsourcing.WorkKeep', $event)"
+	    :value="getValue('Ououtsourcing.WorkKeep')"
 	    :disabled="!edit"
 	    title="工改保留补贴"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.ReformSubsidySum', $event)"
-	    :value="getValue('WageSchedule.ReformSubsidySum')"
+	  <!-- <l-input
+	    @input="setValue('Ououtsourcing.ReformSubsidySum', $event)"
+	    :value="getValue('Ououtsourcing.ReformSubsidySum')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.HousingAllowance', $event)"
-	    :value="getValue('WageSchedule.HousingAllowance')"
+	    @input="setValue('Ououtsourcing.HousingAllowance', $event)"
+	    :value="getValue('Ououtsourcing.HousingAllowance')"
 	    :disabled="!edit"
 	    title="住房补贴"
 	  /> 
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.HousingFundAllowance', $event)"
-	    :value="getValue('WageSchedule.HousingFundAllowance')"
+	    @input="setValue('Ououtsourcing.ProvidentFundPayment', $event)"
+	    :value="getValue('Ououtsourcing.ProvidentFundPayment')"
 	    :disabled="!edit"
-	    title="住房公积金"
+	    title="缴纳公积金"
 	  /> 
 	  <l-input
+	  	class="top-15"
+	    @input="setValue('Ououtsourcing.AssessmentWages', $event)"
+	    :value="getValue('Ououtsourcing.AssessmentWages')"
+	    :disabled="!edit"
+	    title="考核工资"
+	  /> 
+	  <!-- <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.TeacherAndTown', $event)"
-	    :value="getValue('WageSchedule.TeacherAndTown')"
+	    @input="setValue('Ououtsourcing.TeacherAndTown', $event)"
+	    :value="getValue('Ououtsourcing.TeacherAndTown')"
 	    :disabled="!edit"
 	    title="特级教师津贴和乡镇补贴"
-	  /> 
+	  /> -->
 	  <view class="item-title">扣款</view>
 	  <l-input
-	    @input="setValue('WageSchedule.DeductionsSubtotal', $event)"
-	    :value="getValue('WageSchedule.DeductionsSubtotal')"
+	    @input="setValue('Ououtsourcing.DeductionsCombined', $event)"
+	    :value="getValue('Ououtsourcing.DeductionsCombined')"
 	    :disabled="!edit"
 	    title="小计"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.AccumulationFund', $event)"
-	    :value="getValue('WageSchedule.AccumulationFund')"
+	    @input="setValue('Ououtsourcing.ProvidentFundPayment', $event)"
+	    :value="getValue('Ououtsourcing.ProvidentFundPayment')"
 	    :disabled="!edit"
-	    title="公积金"
+	    title="(缴纳)公积金"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
-	    :value="getValue('WageSchedule.LaborUnionWage')"
+	    @input="setValue('Ououtsourcing.LaborUnionWage', $event)"
+	    :value="getValue('Ououtsourcing.LaborUnionWage')"
 	    :disabled="!edit"
 	    title="工会工费"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
-	    :value="getValue('WageSchedule.PersonalIncomeTax')"
+	    @input="setValue('Ououtsourcing.PersonalIncomeTax', $event)"
+	    :value="getValue('Ououtsourcing.PersonalIncomeTax')"
 	    :disabled="!edit"
 	    title="个人所得税"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.EndowmentInsurance', $event)"
-	    :value="getValue('WageSchedule.EndowmentInsurance')"
+	    @input="setValue('Ououtsourcing.EndowmentInsurance', $event)"
+	    :value="getValue('Ououtsourcing.EndowmentInsurance')"
 	    :disabled="!edit"
 	    title="养老保险"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.OccupationalAnnuities', $event)"
-	    :value="getValue('WageSchedule.OccupationalAnnuities')"
+	<!--  <l-input
+	    @input="setValue('Ououtsourcing.OccupationalAnnuities', $event)"
+	    :value="getValue('Ououtsourcing.OccupationalAnnuities')"
 	    :disabled="!edit"
 	    title="职业年金"
-	  /> 
+	  /> -->
 	  <l-input
-	    @input="setValue('WageSchedule.MedicalInsurance', $event)"
-	    :value="getValue('WageSchedule.MedicalInsurance')"
+	    @input="setValue('Ououtsourcing.MedicalInsurance', $event)"
+	    :value="getValue('Ououtsourcing.MedicalInsurance')"
 	    :disabled="!edit"
 	    title="医疗保险"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.UnemploymentInsurance', $event)"
-	    :value="getValue('WageSchedule.UnemploymentInsurance')"
+	    @input="setValue('Ououtsourcing.UnemploymentInsurance', $event)"
+	    :value="getValue('Ououtsourcing.UnemploymentInsurance')"
 	    :disabled="!edit"
 	    title="失业保险"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.Other', $event)"
-	    :value="getValue('WageSchedule.Other')"
-	    :disabled="!edit"
+	  <l-textarea
+	    @input="setValue('Ououtsourcing.Other', $event)"
+	    :value="getValue('Ououtsourcing.Other')"
+	    :readonly="!edit"
 	    title="其他"
 	  /> 
 	  
-	  <l-input
+	<!--  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.FiscalDirect', $event)"
-	    :value="getValue('WageSchedule.FiscalDirect')"
+	    @input="setValue('Ououtsourcing.FiscalDirect', $event)"
+	    :value="getValue('Ououtsourcing.FiscalDirect')"
 	    :disabled="!edit"
 	    title="财政直达"
 	  /> 
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.BankWithholding', $event)"
-	    :value="getValue('WageSchedule.BankWithholding')"
+	    @input="setValue('Ououtsourcing.BankWithholding', $event)"
+	    :value="getValue('Ououtsourcing.BankWithholding')"
 	    :disabled="!edit"
 	    title="银行代扣"
-	  /> 
+	  /> -->
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.NetCombined', $event)"
-	    :value="getValue('WageSchedule.NetCombined')"
+	    @input="setValue('Ououtsourcing.NetCombined', $event)"
+	    :value="getValue('Ououtsourcing.NetCombined')"
 	    :disabled="!edit"
 	    title="实发合计"
 	  /> 
-	  <l-input
+	 <!-- <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.WageCardNo', $event)"
-	    :value="getValue('WageSchedule.WageCardNo')"
-	    :disabled="!edit"
-	    title="工资卡号"
-	  /> 
-	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.CreateUser', $event)"
-	    :value="getValue('WageSchedule.CreateUser')"
+	    @input="setValue('Ououtsourcing.CreateUser', $event)"
+	    :value="getValue('Ououtsourcing.CreateUser')"
 	    :disabled="!edit"
 	    title="创建用户"
 	  /> 
 	  <l-datetime-picker
 	  	class="top-15"
-	    @input="setValue('WageSchedule.CreateTime', $event)"
-	    :value="getValue('WageSchedule.CreateTime')"
+	    @input="setValue('Ououtsourcing.CreateTime', $event)"
+	    :value="getValue('Ououtsourcing.CreateTime')"
 	    :disabled="!edit"
 	    title="创建时间"
-	  />
+	  /> -->
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.IssueMonth', $event)"
-	    :value="getValue('WageSchedule.IssueMonth')"
+	    @input="setValue('Ououtsourcing.IssueMonth', $event)"
+	    :value="getValue('Ououtsourcing.IssueMonth')"
 	    :disabled="!edit"
 	    title="发放月份"
 	  /> 
+	  <l-input
+	  	class="top-15"
+	    @input="setValue('Ououtsourcing.IssueYear', $event)"
+	    :value="getValue('Ououtsourcing.IssueYear')"
+	    :disabled="!edit"
+	    title="发放年份"
+	  /> 
       <!-- <l-select 
         @input="setValue('JournalSend.JTypeId', $event)"
         :value="getValue('JournalSend.JTypeId')"
@@ -309,7 +322,7 @@
 /** 
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
  * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ * { "path": "pages/OuoutsourcingSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
  *  
  * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
  * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
@@ -337,7 +350,7 @@ export default {
   
       // 表单项数据结构 
       scheme: { 
-        WageSchedule: { 
+        Ououtsourcing: { 
           // JTitle: { type: 'text', title: '日志主题' }, 
           // JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
           // JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
@@ -364,7 +377,7 @@ export default {
 		  // 百分之十TenPercent
 		  TenPercent: { type: 'text', title: '百分之十'},
 		  // 基本工资小计BasePay
-		  BasePay: { type: 'text', title: '基本工资小计'},
+		  // BasePay: { type: 'text', title: '基本工资小计'},
 		  // 艰边津贴RoughEdgeAllowance
 		  RoughEdgeAllowance: { type: 'text', title: '艰边津贴'},
 		  // 民族津贴NationAllowance
@@ -372,7 +385,7 @@ export default {
 		  // 教师津贴TeachAllowance
 		  TeachAllowance: { type: 'text', title: '教师津贴'},
 		  // 津贴补贴小计SubsidiesAllowances
-		  SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
+		  // SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
 		  // 基础性绩效BasicsPerformance
 		  BasicsPerformance: { type: 'text', title: '基础性绩效'},
 		  // 女职工卫生费GirlStaffSanitation
@@ -384,17 +397,19 @@ export default {
 		  // 工改保留补贴WorkKeep
 		  WorkKeep: { type: 'text', title: '工改保留补贴'},
 		  // 改革性补贴小计ReformSubsidySum
-		  ReformSubsidySum: { type: 'text', title: '改革性补贴小计'},
+		  // ReformSubsidySum: { type: 'text', title: '改革性补贴小计'},
 		  // 住房补贴HousingAllowance
 		  HousingAllowance: { type: 'text', title: '住房补贴'},
-		  // 住房公积金HousingFundAllowance
-		  HousingFundAllowance: { type: 'text', title: '住房公积金'},
+		  // 公积金ProvidentFundPayment
+		  ProvidentFundPayment: { type: 'text', title: '公积金'},
+		  // 考核工资AssessmentWages
+		  AssessmentWages: { type: 'text', title: '考核工资'},
 		  // 特级教师津贴和乡镇补贴TeacherAndTown
-		  TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
-		  // 扣款小计DeductionsSubtotal
-		  DeductionsSubtotal: { type: 'text', title: '扣款小计'},
-		  // 公积金AccumulationFund
-		  AccumulationFund: { type: 'text', title: '公积金'},
+		  // TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
+		  // 扣款小计DeductionsCombined
+		  DeductionsCombined: { type: 'text', title: '扣款小计'},
+		  // 公积金ProvidentFundPayment
+		  ProvidentFundPayment: { type: 'text', title: '(缴纳)公积金'},
 		  // 工会工费LaborUnionWage
 		  LaborUnionWage: { type: 'text', title: '工会工费'},
 		  // 个人所得税PersonalIncomeTax
@@ -402,7 +417,7 @@ export default {
 		  // 养老保险EndowmentInsurance
 		  EndowmentInsurance: { type: 'text', title: '养老保险'},
 		  // 职业年金OccupationalAnnuities
-		  OccupationalAnnuities: { type: 'text', title: '职业年金'},
+		  // OccupationalAnnuities: { type: 'text', title: '职业年金'},
 		  // 医疗保险MedicalInsurance
 		  MedicalInsurance: { type: 'text', title: '医疗保险'},
 		  // 失业保险UnemploymentInsurance
@@ -410,15 +425,17 @@ export default {
 		  // 其他Other
 		  Other: { type: 'text', title: '其他'},
 		  // 财政直达FiscalDirect
-		  FiscalDirect: { type: 'text', title: '财政直达'},
+		  // FiscalDirect: { type: 'text', title: '财政直达'},
 		  // 银行代扣BankWithholding
-		  BankWithholding: { type: 'text', title: '银行代扣'},
+		  // BankWithholding: { type: 'text', title: '银行代扣'},
 		  // 实发合计NetCombined
 		  NetCombined: { type: 'text', title: '实发合计'},
 		  // 工资卡号WageCardNo
 		  WageCardNo: { type: 'text', title: '工资卡号'},
 		  // CreateUser
+		  // CreateUser: { type: 'text', title: '创建用户'},
 		  // CreateTime
+		  // CreateTime: { type: 'text', title: '创建时间'},
 		  // UpdateUser
 		  // UpdateTime
 		  // 发放月份IssueMonth
@@ -469,7 +486,7 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('learun/adms/WageSchedule/form', this.id) 
+        const result = await this.HTTP_GET('learun/adms/Ououtsourcing/form', this.id) 
         this.origin = await this.formatFormData(result) 
       } 
       this.current = this.COPY(this.origin) 
@@ -501,7 +518,7 @@ export default {
           this.LOADING('正在提交...') 
           const postData = await this.getPostData(this.id) 
   
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
+          this.HTTP_POST('learun/adms/Ououtsourcing/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
@@ -519,7 +536,7 @@ export default {
           } 
   
           this.LOADING('提交删除中...') 
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
+          this.HTTP_POST('learun/adms/Ououtsourcing/delete', this.id, '删除失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/list.vue
index 88df452cc..681135728 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/list.vue	
@@ -10,6 +10,14 @@
         <l-customlist :tips="loadState" showTips>
           <!-- 单条记录 -->
           <view class="customlist-item" v-for="item of list" :key="item.F_InvoiceId">
+			  <view class="customlist-item-field">
+				<text class="customlist-item-field-title">姓名：</text>
+				{{ displayListItem(item, 'EmpName') }}
+			  </view>
+			  <view class="customlist-item-field">
+				<text class="customlist-item-field-title">人员类别：</text>
+				{{ displayListItem(item, 'PeopleType') }}
+			  </view>
             <view class="customlist-item-field">
               <text class="customlist-item-field-title">发放年份：</text>
               {{ displayListItem(item, 'IssueYear') }}
@@ -45,8 +53,8 @@
     <!-- 侧边栏 -->
     <scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
       <view v-if="ready" class="padding">
-		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选" />
-		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选" />
+		<l-input v-model="queryData.IssueYear" @change="searchChange()" title="年份" placeholder="按年份筛选,例:2022" />
+		<l-input v-model="queryData.IssueMonth" @change="searchChange()" title="月份" placeholder="按月份筛选,例:10" />
 		<l-input v-model="queryData.EmpName" @change="searchChange()" title="姓名" placeholder="按姓名筛选" />
 		<l-input v-model="queryData.PeopleType" @change="searchChange()" title="人员类别" placeholder="按人员类别筛选" />
         <view class="padding-tb">
@@ -74,6 +82,10 @@ export default {
       scheme: {
         // F_CustomerId: { type: 'select', dataSource: '1', dataSourceId: 'crmCustomer,f_fullname,f_customerid' },
         // F_InvoiceContent: { type: 'texteditor' },
+		// 姓名EmpName
+		EmpName: { type: 'text' },
+		// 人员类别PeopleType
+		PeopleType: { type: 'text' },
 		// 发放年份IssueYear
 		IssueYear: { type: 'text' },
 		// 发放月份IssueMonth
@@ -143,7 +155,7 @@ export default {
       }
 
       const result = await this.HTTP_GET(
-        'learun/adms/WageSchedule/getlist',
+        'learun/adms/WelfarePosition/getlist',
         {
           pagination: { rows: 10, page: this.page, sidx: 'CreateTime', sord: 'DESC' },
           queryJson: JSON.stringify(this.searchData)
@@ -188,7 +200,7 @@ export default {
           return
 
         case 'view':
-          this.NAV_TO('./single?type=view&&id='+item.Id, item, true)
+          this.NAV_TO('./single?type=view&&id='+item.GYID, item, true)
           return
 
         case 'edit':
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue
index 5c578de11..7b831a783 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue	
@@ -3,260 +3,273 @@
     <view v-if="ready">
 	  <view class="item-title">基本信息</view>
       <l-input 
-        @input="setValue('WageSchedule.EmpName', $event)"
-        :value="getValue('WageSchedule.EmpName')"
+        @input="setValue('WelfarePosition.EmpName', $event)"
+        :value="getValue('WelfarePosition.EmpName')"
         :disabled="!edit"
         title="姓名"
       /> 
 	  <l-input
-	    @input="setValue('WageSchedule.IdCardNo', $event)"
-	    :value="getValue('WageSchedule.IdCardNo')"
+	    @input="setValue('WelfarePosition.IdCardNo', $event)"
+	    :value="getValue('WelfarePosition.IdCardNo')"
 	    :disabled="!edit"
 	    title="身份证号"
 	  /> 
+	 <l-input
+	    @input="setValue('WelfarePosition.WageCardNo', $event)"
+	    :value="getValue('WelfarePosition.WageCardNo')"
+	    :disabled="!edit"
+	    title="工资卡号"
+	  />
 	  <l-input
-	    @input="setValue('WageSchedule.PeopleType', $event)"
-	    :value="getValue('WageSchedule.PeopleType')"
+	    @input="setValue('WelfarePosition.PeopleType', $event)"
+	    :value="getValue('WelfarePosition.PeopleType')"
 	    :disabled="!edit"
 	    title="人员类别"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PostType', $event)"
-	    :value="getValue('WageSchedule.PostType')"
+	    @input="setValue('WelfarePosition.PostType', $event)"
+	    :value="getValue('WelfarePosition.PostType')"
 	    :disabled="!edit"
 	    title="岗位等级"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PayGrade', $event)"
-	    :value="getValue('WageSchedule.PayGrade')"
+	    @input="setValue('WelfarePosition.PayGrade', $event)"
+	    :value="getValue('WelfarePosition.PayGrade')"
 	    :disabled="!edit"
 	    title="薪级"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TotalGrossPay', $event)"
-	    :value="getValue('WageSchedule.TotalGrossPay')"
+	    @input="setValue('WelfarePosition.TotalGrossPay', $event)"
+	    :value="getValue('WelfarePosition.TotalGrossPay')"
 	    :disabled="!edit"
 	    title="应发合计"
 	  /> 
 	  <view class="item-title">基本工资</view>
 	  <l-input
-	    @input="setValue('WageSchedule.PostWage', $event)"
-	    :value="getValue('WageSchedule.PostWage')"
+	    @input="setValue('WelfarePosition.PostWage', $event)"
+	    :value="getValue('WelfarePosition.PostWage')"
 	    :disabled="!edit"
 	    title="岗位工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PayGradeWage', $event)"
-	    :value="getValue('WageSchedule.PayGradeWage')"
+	    @input="setValue('WelfarePosition.PayGradeWage', $event)"
+	    :value="getValue('WelfarePosition.PayGradeWage')"
 	    :disabled="!edit"
 	    title="薪级工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TenPercent', $event)"
-	    :value="getValue('WageSchedule.TenPercent')"
+	    @input="setValue('WelfarePosition.TenPercent', $event)"
+	    :value="getValue('WelfarePosition.TenPercent')"
 	    :disabled="!edit"
 	    title="百分之十"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.BasePay', $event)"
-	    :value="getValue('WageSchedule.BasePay')"
+	 <!-- <l-input
+	    @input="setValue('WelfarePosition.BasePay', $event)"
+	    :value="getValue('WelfarePosition.BasePay')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  <view class="item-title">津贴补贴</view>
 	  <l-input
-	    @input="setValue('WageSchedule.RoughEdgeAllowance', $event)"
-	    :value="getValue('WageSchedule.RoughEdgeAllowance')"
+	    @input="setValue('WelfarePosition.RoughEdgeAllowance', $event)"
+	    :value="getValue('WelfarePosition.RoughEdgeAllowance')"
 	    :disabled="!edit"
 	    title="艰边津贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.NationAllowance', $event)"
-	    :value="getValue('WageSchedule.NationAllowance')"
+	    @input="setValue('WelfarePosition.NationAllowance', $event)"
+	    :value="getValue('WelfarePosition.NationAllowance')"
 	    :disabled="!edit"
 	    title="民族津贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TeachAllowance', $event)"
-	    :value="getValue('WageSchedule.TeachAllowance')"
+	    @input="setValue('WelfarePosition.TeachAllowance', $event)"
+	    :value="getValue('WelfarePosition.TeachAllowance')"
 	    :disabled="!edit"
 	    title="教师津贴"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.SubsidiesAllowances', $event)"
-	    :value="getValue('WageSchedule.SubsidiesAllowances')"
+	 <!-- <l-input
+	    @input="setValue('WelfarePosition.SubsidiesAllowances', $event)"
+	    :value="getValue('WelfarePosition.SubsidiesAllowances')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
-	    :value="getValue('WageSchedule.BasicsPerformance')"
+	    @input="setValue('WelfarePosition.BasicsPerformance', $event)"
+	    :value="getValue('WelfarePosition.BasicsPerformance')"
 	    :disabled="!edit"
 	    title="基础性绩效"
 	  /> 
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
-	    :value="getValue('WageSchedule.GirlStaffSanitation')"
+	    @input="setValue('WelfarePosition.GirlStaffSanitation', $event)"
+	    :value="getValue('WelfarePosition.GirlStaffSanitation')"
 	    :disabled="!edit"
 	    title="女职工卫生费"
 	  /> 
 	  
 	  <view class="item-title">改革性补贴</view>
 	  <l-input
-	    @input="setValue('WageSchedule.Transportation', $event)"
-	    :value="getValue('WageSchedule.Transportation')"
+	    @input="setValue('WelfarePosition.Transportation', $event)"
+	    :value="getValue('WelfarePosition.Transportation')"
 	    :disabled="!edit"
 	    title="交通补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.RealeState', $event)"
-	    :value="getValue('WageSchedule.RealeState')"
+	    @input="setValue('WelfarePosition.RealeState', $event)"
+	    :value="getValue('WelfarePosition.RealeState')"
 	    :disabled="!edit"
 	    title="物业补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.WorkKeep', $event)"
-	    :value="getValue('WageSchedule.WorkKeep')"
+	    @input="setValue('WelfarePosition.WorkKeep', $event)"
+	    :value="getValue('WelfarePosition.WorkKeep')"
 	    :disabled="!edit"
 	    title="工改保留补贴"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.ReformSubsidySum', $event)"
-	    :value="getValue('WageSchedule.ReformSubsidySum')"
+	  <!-- <l-input
+	    @input="setValue('WelfarePosition.ReformSubsidySum', $event)"
+	    :value="getValue('WelfarePosition.ReformSubsidySum')"
 	    :disabled="!edit"
 	    title="小计"
-	  /> 
+	  /> -->
 	  
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.HousingAllowance', $event)"
-	    :value="getValue('WageSchedule.HousingAllowance')"
+	    @input="setValue('WelfarePosition.HousingAllowance', $event)"
+	    :value="getValue('WelfarePosition.HousingAllowance')"
 	    :disabled="!edit"
 	    title="住房补贴"
 	  /> 
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.HousingFundAllowance', $event)"
-	    :value="getValue('WageSchedule.HousingFundAllowance')"
+	    @input="setValue('WelfarePosition.ProvidentFundPayment', $event)"
+	    :value="getValue('WelfarePosition.ProvidentFundPayment')"
 	    :disabled="!edit"
-	    title="住房公积金"
+	    title="缴纳公积金"
 	  /> 
 	  <l-input
+	  	class="top-15"
+	    @input="setValue('WelfarePosition.AssessmentWages', $event)"
+	    :value="getValue('WelfarePosition.AssessmentWages')"
+	    :disabled="!edit"
+	    title="考核工资"
+	  /> 
+	  <!-- <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.TeacherAndTown', $event)"
-	    :value="getValue('WageSchedule.TeacherAndTown')"
+	    @input="setValue('WelfarePosition.TeacherAndTown', $event)"
+	    :value="getValue('WelfarePosition.TeacherAndTown')"
 	    :disabled="!edit"
 	    title="特级教师津贴和乡镇补贴"
-	  /> 
+	  /> -->
 	  <view class="item-title">扣款</view>
 	  <l-input
-	    @input="setValue('WageSchedule.DeductionsSubtotal', $event)"
-	    :value="getValue('WageSchedule.DeductionsSubtotal')"
+	    @input="setValue('WelfarePosition.DeductionsCombined', $event)"
+	    :value="getValue('WelfarePosition.DeductionsCombined')"
 	    :disabled="!edit"
 	    title="小计"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.AccumulationFund', $event)"
-	    :value="getValue('WageSchedule.AccumulationFund')"
+	    @input="setValue('WelfarePosition.ProvidentFundPayment', $event)"
+	    :value="getValue('WelfarePosition.ProvidentFundPayment')"
 	    :disabled="!edit"
-	    title="公积金"
+	    title="(缴纳)公积金"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
-	    :value="getValue('WageSchedule.LaborUnionWage')"
+	    @input="setValue('WelfarePosition.LaborUnionWage', $event)"
+	    :value="getValue('WelfarePosition.LaborUnionWage')"
 	    :disabled="!edit"
 	    title="工会工费"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
-	    :value="getValue('WageSchedule.PersonalIncomeTax')"
+	    @input="setValue('WelfarePosition.PersonalIncomeTax', $event)"
+	    :value="getValue('WelfarePosition.PersonalIncomeTax')"
 	    :disabled="!edit"
 	    title="个人所得税"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.EndowmentInsurance', $event)"
-	    :value="getValue('WageSchedule.EndowmentInsurance')"
+	    @input="setValue('WelfarePosition.EndowmentInsurance', $event)"
+	    :value="getValue('WelfarePosition.EndowmentInsurance')"
 	    :disabled="!edit"
 	    title="养老保险"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.OccupationalAnnuities', $event)"
-	    :value="getValue('WageSchedule.OccupationalAnnuities')"
+	<!--  <l-input
+	    @input="setValue('WelfarePosition.OccupationalAnnuities', $event)"
+	    :value="getValue('WelfarePosition.OccupationalAnnuities')"
 	    :disabled="!edit"
 	    title="职业年金"
-	  /> 
+	  /> -->
 	  <l-input
-	    @input="setValue('WageSchedule.MedicalInsurance', $event)"
-	    :value="getValue('WageSchedule.MedicalInsurance')"
+	    @input="setValue('WelfarePosition.MedicalInsurance', $event)"
+	    :value="getValue('WelfarePosition.MedicalInsurance')"
 	    :disabled="!edit"
 	    title="医疗保险"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.UnemploymentInsurance', $event)"
-	    :value="getValue('WageSchedule.UnemploymentInsurance')"
+	    @input="setValue('WelfarePosition.UnemploymentInsurance', $event)"
+	    :value="getValue('WelfarePosition.UnemploymentInsurance')"
 	    :disabled="!edit"
 	    title="失业保险"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.Other', $event)"
-	    :value="getValue('WageSchedule.Other')"
-	    :disabled="!edit"
+	  <l-textarea
+	    @input="setValue('WelfarePosition.Other', $event)"
+	    :value="getValue('WelfarePosition.Other')"
+	    :readonly="!edit"
 	    title="其他"
 	  /> 
 	  
-	  <l-input
+	<!--  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.FiscalDirect', $event)"
-	    :value="getValue('WageSchedule.FiscalDirect')"
+	    @input="setValue('WelfarePosition.FiscalDirect', $event)"
+	    :value="getValue('WelfarePosition.FiscalDirect')"
 	    :disabled="!edit"
 	    title="财政直达"
 	  /> 
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.BankWithholding', $event)"
-	    :value="getValue('WageSchedule.BankWithholding')"
+	    @input="setValue('WelfarePosition.BankWithholding', $event)"
+	    :value="getValue('WelfarePosition.BankWithholding')"
 	    :disabled="!edit"
 	    title="银行代扣"
-	  /> 
+	  /> -->
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.NetCombined', $event)"
-	    :value="getValue('WageSchedule.NetCombined')"
+	    @input="setValue('WelfarePosition.NetCombined', $event)"
+	    :value="getValue('WelfarePosition.NetCombined')"
 	    :disabled="!edit"
 	    title="实发合计"
 	  /> 
-	  <l-input
+	 <!-- <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.WageCardNo', $event)"
-	    :value="getValue('WageSchedule.WageCardNo')"
-	    :disabled="!edit"
-	    title="工资卡号"
-	  /> 
-	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.CreateUser', $event)"
-	    :value="getValue('WageSchedule.CreateUser')"
+	    @input="setValue('WelfarePosition.CreateUser', $event)"
+	    :value="getValue('WelfarePosition.CreateUser')"
 	    :disabled="!edit"
 	    title="创建用户"
 	  /> 
 	  <l-datetime-picker
 	  	class="top-15"
-	    @input="setValue('WageSchedule.CreateTime', $event)"
-	    :value="getValue('WageSchedule.CreateTime')"
+	    @input="setValue('WelfarePosition.CreateTime', $event)"
+	    :value="getValue('WelfarePosition.CreateTime')"
 	    :disabled="!edit"
 	    title="创建时间"
-	  />
+	  /> -->
 	  <l-input
 		class="top-15"
-	    @input="setValue('WageSchedule.IssueMonth', $event)"
-	    :value="getValue('WageSchedule.IssueMonth')"
+	    @input="setValue('WelfarePosition.IssueMonth', $event)"
+	    :value="getValue('WelfarePosition.IssueMonth')"
 	    :disabled="!edit"
 	    title="发放月份"
 	  /> 
+	  <l-input
+	  	class="top-15"
+	    @input="setValue('WelfarePosition.IssueYear', $event)"
+	    :value="getValue('WelfarePosition.IssueYear')"
+	    :disabled="!edit"
+	    title="发放年份"
+	  /> 
       <!-- <l-select 
         @input="setValue('JournalSend.JTypeId', $event)"
         :value="getValue('JournalSend.JTypeId')"
@@ -309,7 +322,7 @@
 /** 
  * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
  * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
- * { "path": "pages/EducationalAdministration/JournalSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
+ * { "path": "pages/WelfarePositionSend/single", "style": { "navigationBarTitleText": "表单详情页" } } 
  *  
  * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
  * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
@@ -337,7 +350,7 @@ export default {
   
       // 表单项数据结构 
       scheme: { 
-        WageSchedule: { 
+        WelfarePosition: { 
           // JTitle: { type: 'text', title: '日志主题' }, 
           // JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
           // JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
@@ -364,7 +377,7 @@ export default {
 		  // 百分之十TenPercent
 		  TenPercent: { type: 'text', title: '百分之十'},
 		  // 基本工资小计BasePay
-		  BasePay: { type: 'text', title: '基本工资小计'},
+		  // BasePay: { type: 'text', title: '基本工资小计'},
 		  // 艰边津贴RoughEdgeAllowance
 		  RoughEdgeAllowance: { type: 'text', title: '艰边津贴'},
 		  // 民族津贴NationAllowance
@@ -372,7 +385,7 @@ export default {
 		  // 教师津贴TeachAllowance
 		  TeachAllowance: { type: 'text', title: '教师津贴'},
 		  // 津贴补贴小计SubsidiesAllowances
-		  SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
+		  // SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
 		  // 基础性绩效BasicsPerformance
 		  BasicsPerformance: { type: 'text', title: '基础性绩效'},
 		  // 女职工卫生费GirlStaffSanitation
@@ -384,17 +397,19 @@ export default {
 		  // 工改保留补贴WorkKeep
 		  WorkKeep: { type: 'text', title: '工改保留补贴'},
 		  // 改革性补贴小计ReformSubsidySum
-		  ReformSubsidySum: { type: 'text', title: '改革性补贴小计'},
+		  // ReformSubsidySum: { type: 'text', title: '改革性补贴小计'},
 		  // 住房补贴HousingAllowance
 		  HousingAllowance: { type: 'text', title: '住房补贴'},
-		  // 住房公积金HousingFundAllowance
-		  HousingFundAllowance: { type: 'text', title: '住房公积金'},
+		  // 公积金ProvidentFundPayment
+		  ProvidentFundPayment: { type: 'text', title: '公积金'},
+		  // 考核工资AssessmentWages
+		  AssessmentWages: { type: 'text', title: '考核工资'},
 		  // 特级教师津贴和乡镇补贴TeacherAndTown
-		  TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
-		  // 扣款小计DeductionsSubtotal
-		  DeductionsSubtotal: { type: 'text', title: '扣款小计'},
-		  // 公积金AccumulationFund
-		  AccumulationFund: { type: 'text', title: '公积金'},
+		  // TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
+		  // 扣款小计DeductionsCombined
+		  DeductionsCombined: { type: 'text', title: '扣款小计'},
+		  // 公积金ProvidentFundPayment
+		  ProvidentFundPayment: { type: 'text', title: '(缴纳)公积金'},
 		  // 工会工费LaborUnionWage
 		  LaborUnionWage: { type: 'text', title: '工会工费'},
 		  // 个人所得税PersonalIncomeTax
@@ -402,7 +417,7 @@ export default {
 		  // 养老保险EndowmentInsurance
 		  EndowmentInsurance: { type: 'text', title: '养老保险'},
 		  // 职业年金OccupationalAnnuities
-		  OccupationalAnnuities: { type: 'text', title: '职业年金'},
+		  // OccupationalAnnuities: { type: 'text', title: '职业年金'},
 		  // 医疗保险MedicalInsurance
 		  MedicalInsurance: { type: 'text', title: '医疗保险'},
 		  // 失业保险UnemploymentInsurance
@@ -410,15 +425,17 @@ export default {
 		  // 其他Other
 		  Other: { type: 'text', title: '其他'},
 		  // 财政直达FiscalDirect
-		  FiscalDirect: { type: 'text', title: '财政直达'},
+		  // FiscalDirect: { type: 'text', title: '财政直达'},
 		  // 银行代扣BankWithholding
-		  BankWithholding: { type: 'text', title: '银行代扣'},
+		  // BankWithholding: { type: 'text', title: '银行代扣'},
 		  // 实发合计NetCombined
 		  NetCombined: { type: 'text', title: '实发合计'},
 		  // 工资卡号WageCardNo
 		  WageCardNo: { type: 'text', title: '工资卡号'},
 		  // CreateUser
+		  // CreateUser: { type: 'text', title: '创建用户'},
 		  // CreateTime
+		  // CreateTime: { type: 'text', title: '创建时间'},
 		  // UpdateUser
 		  // UpdateTime
 		  // 发放月份IssueMonth
@@ -469,7 +486,7 @@ export default {
       if (this.mode === 'create') { 
         this.origin = await this.getDefaultForm() 
       } else { 
-        const result = await this.HTTP_GET('learun/adms/WageSchedule/form', this.id) 
+        const result = await this.HTTP_GET('learun/adms/WelfarePosition/form', this.id) 
         this.origin = await this.formatFormData(result) 
       } 
       this.current = this.COPY(this.origin) 
@@ -501,7 +518,7 @@ export default {
           this.LOADING('正在提交...') 
           const postData = await this.getPostData(this.id) 
   
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
+          this.HTTP_POST('learun/adms/WelfarePosition/save', postData, '表单提交保存失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return
@@ -519,7 +536,7 @@ export default {
           } 
   
           this.LOADING('提交删除中...') 
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
+          this.HTTP_POST('learun/adms/WelfarePosition/delete', this.id, '删除失败').then(success => { 
             this.HIDE_LOADING() 
             if (!success) { 
               return