【修改】移动端工资条管理；

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

@@ -34,190 +34,11 @@
 				
 				<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>
+					<text>￥{{list.length > 0 ? (list[0].DeductionsSubtotal + list[0].BankWithholding) || 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-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, 'WageCardNo') }}
- 						</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, 'PostType') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">薪级：</text>
- 							{{ displayListItem(item, 'PayGrade') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">应发合计：</text>
- 							{{ displayListItem(item, 'TotalGrossPay') }}
- 						</view>
- 						<view class="item-title">基本工资</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">岗位工资：</text>
- 							{{ displayListItem(item, 'PostWage') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">薪级工资：</text>
- 							{{ displayListItem(item, 'PayGradeWage') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">百分之十：</text>
- 							{{ displayListItem(item, 'TenPercent') }}
- 						</view>
- 						<view class="item-title">绩效工资</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">基础绩效：</text>
- 							{{ displayListItem(item, 'BasicsPerformance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">奖励绩效：</text>
- 							{{ displayListItem(item, 'AwardPerformance') }}
- 						</view>
- 						<view class="item-title">单列绩效</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">基础绩效：</text>
- 							{{ displayListItem(item, 'SeparateBasicsPerformance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">奖励绩效：</text>
- 							{{ displayListItem(item, 'SeparateAwardPerformance') }}
- 						</view>
- 						<view class="item-title">津贴补贴</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">艰边津贴：</text>
- 							{{ displayListItem(item, 'RoughEdgeAllowance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">民族津贴：</text>
- 							{{ displayListItem(item, 'NationAllowance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">教龄补贴：</text>
- 							{{ displayListItem(item, 'TeachAllowance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">特级教师津贴：</text>
- 							{{ displayListItem(item, 'SuperfineTeacherResearch') }}
- 						</view>
- 						<view class="item-title">改革性补贴</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">交通补贴：</text>
- 							{{ displayListItem(item, 'Transportation') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">物业补贴：</text>
- 							{{ displayListItem(item, 'RealeState') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">工改保留补贴：</text>
- 							{{ displayListItem(item, 'WorkKeep') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">女职工卫生费：</text>
- 							{{ displayListItem(item, 'GirlStaffSanitation') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">乡镇补贴：</text>
- 							{{ displayListItem(item, 'TownshipSubsidy') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">住房补贴：</text>
- 							{{ displayListItem(item, 'HousingAllowance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">住房公积金：</text>
- 							{{ displayListItem(item, 'HousingFundAllowance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">其他：</text>
- 							{{ displayListItem(item, 'OtherOne') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">代扣合计：</text>
- 							{{ displayListItem(item, 'DeductionsSubtotal') }}
- 						</view>
- 						<view class="item-title">代扣代缴</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">公积金：</text>
- 							{{ displayListItem(item, 'AccumulationFund') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">养老保险：</text>
- 							{{ displayListItem(item, 'EndowmentInsurance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">职业年金：</text>
- 							{{ displayListItem(item, 'OccupationalAnnuities') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">医疗保险：</text>
- 							{{ displayListItem(item, 'MedicalInsurance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">失业保险：</text>
- 							{{ displayListItem(item, 'UnemploymentInsurance') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">工会工费：</text>
- 							{{ displayListItem(item, 'LaborUnionWage') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">个人所得税：</text>
- 							{{ displayListItem(item, 'PersonalIncomeTax') }}
- 						</view>
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">其他：</text>
- 							{{ displayListItem(item, 'Other') }}
- 						</view>
- 						<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') }}
- 						</view>
- 
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">发放月份：</text>
- 							{{ displayListItem(item, 'IssueMonth') }}
- 						</view>
- 
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">应发合计：</text>
- 							{{ displayListItem(item, 'TotalGrossPay') }}
- 						</view>
- 
- 						<view class="customlist-item-field">
- 							<text class="customlist-item-field-title">实发合计：</text>
- 							{{ displayListItem(item, 'NetCombined') }}
- 						</view>
- 
- 						<l-customlist-action @view="action('view', item)" @edit="action('edit', item)"
- 							:showEdit="false" />
- 					</view>
- 				</l-customlist>
- 			</l-scroll-list> -->
  		</view>
  
  		<!-- 关闭筛选栏按钮 -->
@@ -231,15 +52,13 @@
  				<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">
  					<l-button @click="reset" line="orange" class="block" block>重置筛选条件</l-button>
  				</view>
  			</view>
  		</scroll-view>
  
- 		<!-- 添加按钮 -->
- 		<!-- <l-customlist-add v-if="!sideOpen" @click="action('create')" /> -->
  	</view>
  </template>
  
@@ -255,129 +74,6 @@
  			return {
  				// 表单结构
  				scheme: {
- 					WageCardNo:{
- 						type:'text'
- 					},
- 					PeopleType:{
- 						type:'text'
- 					},
- 					PostType:{
- 						type:'text'
- 					},
- 					PayGrade:{
- 						type:'text'
- 					},
- 					TotalGrossPay:{
- 						type:'text'
- 					},
- 					PostWage:{
- 						type:'text'
- 					},
- 					PayGradeWage:{
- 						type:'text'
- 					},
- 					TenPercent:{
- 						type:'text'
- 					},
- 					BasicsPerformance:{
- 						type:'text'
- 					},
- 					AwardPerformance:{
- 						type:'text'
- 					},
- 					SeparateBasicsPerformance:{
- 						type:'text'
- 					},
- 					SeparateAwardPerformance:{
- 						type:'text'
- 					},
- 					RoughEdgeAllowance:{
- 						type: 'text'
- 					},
- 					NationAllowance:{
- 						type: 'text'
- 					},
- 					TeachAllowance:{
- 						type: 'text'
- 					},
- 					SuperfineTeacherResearch:{
- 						type: 'text'
- 					},
- 					Transportation:{
- 						type: 'text'
- 					},
- 					RealeState:{
- 						type: 'text'
- 					},
- 					WorkKeep:{
- 						type: 'text'
- 					},
- 					GirlStaffSanitation:{
- 						type: 'text'
- 					},
- 					TownshipSubsidy:{
- 						type: 'text'
- 					},
- 					HousingAllowance:{
- 						type: 'text'
- 					},
- 					HousingFundAllowance:{
- 						type: 'text'
- 					},
- 					OtherOne:{
- 						type: 'text'
- 					},
- 					DeductionsSubtotal:{
- 						type: 'text'
- 					},
- 					AccumulationFund:{
- 						type: 'text'
- 					},
- 					EndowmentInsurance:{
- 						type: 'text'
- 					},
- 					OccupationalAnnuities:{
- 						type: 'text'
- 					},
- 					MedicalInsurance:{
- 						type: 'text'
- 					},
- 					UnemploymentInsurance:{
- 						type: 'text'
- 					},
- 					LaborUnionWage:{
- 						type: 'text'
- 					},
- 					PersonalIncomeTax:{
- 						type: 'text'
- 					},
- 					Other:{
- 						type: 'text'
- 					},
- 					// F_CustomerId: { type: 'select', dataSource: '1', dataSourceId: 'crmCustomer,f_fullname,f_customerid' },
- 					// F_InvoiceContent: { type: 'texteditor' },
- 					// 姓名EmpName
- 					EmpName: {
- 						type: 'text'
- 					},
- 					
- 					// 发放年份IssueYear
- 					IssueYear: {
- 						type: 'text'
- 					},
- 					// 发放月份IssueMonth
- 					IssueMonth: {
- 						type: 'text'
- 					},
- 					// 应发合计TotalGrossPay
- 					TotalGrossPay: {
- 						type: 'text'
- 					},
- 					// 实发合计NetCombined
- 					NetCombined: {
- 						type: 'text'
- 					},
- 
  				},
  
  				// 筛选菜单值

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

@@ -1,45 +1,8 @@
 <template> 
   <view class="page"> 
     <view v-if="ready">
-	  <!-- <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
-	    @input="setValue('WageSchedule.PeopleType', $event)"
-	    :value="getValue('WageSchedule.PeopleType')"
-	    :disabled="!edit"
-	    title="人员类别"
-	  /> -->
-	  <!-- <l-input
-	    @input="setValue('WageSchedule.PostType', $event)"
-	    :value="getValue('WageSchedule.PostType')"
-	    :disabled="!edit"
-	    title="岗位等级"
-	  /> -->
-	  <!-- <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)"
 	    :value="getValue('WageSchedule.PostWage')"
@@ -52,101 +15,82 @@
 	    :disabled="!edit"
 	    title="薪级工资"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.TenPercent', $event)"
-	    :value="getValue('WageSchedule.TenPercent')"
-	    :disabled="!edit"
-	    title="百分之十"
-	  /> 
-	  <view class="item-title">绩效工资</view>
 	  <l-input
 	    @input="setValue('WageSchedule.BasicsPerformance', $event)"
 	    :value="getValue('WageSchedule.BasicsPerformance')"
 	    :disabled="!edit"
-	    title="基础性绩效"
-	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.AwardPerformance', $event)"
-	    :value="getValue('WageSchedule.AwardPerformance')"
-	    :disabled="!edit"
-	    title="奖励绩效"
+	    title="基础绩效奖"
 	  /> 
-	  <view class="item-title">单列绩效</view>
 	  <l-input
-	    @input="setValue('WageSchedule.SeparateBasicsPerformance', $event)"
-	    :value="getValue('WageSchedule.SeparateBasicsPerformance')"
+	    @input="setValue('WageSchedule.WorkKeep', $event)"
+	    :value="getValue('WageSchedule.WorkKeep')"
 	    :disabled="!edit"
-	    title="基础绩效"
+	    title="保留地区补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.SeparateAwardPerformance', $event)"
-	    :value="getValue('WageSchedule.SeparateAwardPerformance')"
+	    @input="setValue('WageSchedule.NationAllowance', $event)"
+	    :value="getValue('WageSchedule.NationAllowance')"
 	    :disabled="!edit"
-	    title="奖励绩效"
+	    title="保留地区补贴保留额"
 	  /> 
-	  <view class="item-title">津贴补贴</view>
 	  <l-input
 	    @input="setValue('WageSchedule.RoughEdgeAllowance', $event)"
 	    :value="getValue('WageSchedule.RoughEdgeAllowance')"
 	    :disabled="!edit"
-	    title="艰边津贴"
+	    title="艰苦边远地区津贴"
 	  />
 	  <l-input
-	    @input="setValue('WageSchedule.NationAllowance', $event)"
-	    :value="getValue('WageSchedule.NationAllowance')"
+	    @input="setValue('WageSchedule.Transportation', $event)"
+	    :value="getValue('WageSchedule.Transportation')"
 	    :disabled="!edit"
-	    title="民族津贴"
+	    title="增补抵交临时性补贴"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.TeachAllowance', $event)"
-	    :value="getValue('WageSchedule.TeachAllowance')"
+	    @input="setValue('WageSchedule.Other', $event)"
+	    :value="getValue('WageSchedule.Other')"
+		:disabled="!edit"
+	    title="(备选3)"
+	  /> 
+	  <l-input
+	    @input="setValue('WageSchedule.AwardPerformance', $event)"
+	    :value="getValue('WageSchedule.AwardPerformance')"
 	    :disabled="!edit"
-	    title="教龄津贴"
+	    title="纳入绩效工资的活工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.SuperfineTeacherResearch', $event)"
-	    :value="getValue('WageSchedule.SuperfineTeacherResearch')"
+	    @input="setValue('WageSchedule.SeparateBasicsPerformance', $event)"
+	    :value="getValue('WageSchedule.SeparateBasicsPerformance')"
 	    :disabled="!edit"
-	    title="特级教师津贴"
+	    title="基础性绩效工资"
 	  /> 
-	  <view class="item-title">改革性补贴</view>
 	  <l-input
-	    @input="setValue('WageSchedule.Transportation', $event)"
-	    :value="getValue('WageSchedule.Transportation')"
+	    @input="setValue('WageSchedule.TeachAllowance', $event)"
+	    :value="getValue('WageSchedule.TeachAllowance')"
 	    :disabled="!edit"
-	    title="交通补贴"
+	    title="岗位津贴补贴"
 	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.RealeState', $event)"
 	    :value="getValue('WageSchedule.RealeState')"
 	    :disabled="!edit"
-	    title="物业补贴"
-	  /> 
+	    title="其它津贴补贴"
+	  />
 	  <l-input
-	    @input="setValue('WageSchedule.WorkKeep', $event)"
-	    :value="getValue('WageSchedule.WorkKeep')"
+	    @input="setValue('WageSchedule.SeparateAwardPerformance', $event)"
+	    :value="getValue('WageSchedule.SeparateAwardPerformance')"
 	    :disabled="!edit"
-	    title="工改保留补贴"
+	    title="奖励性绩效工资"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
-	    :value="getValue('WageSchedule.GirlStaffSanitation')"
+	    @input="setValue('WageSchedule.SuperfineTeacherResearch', $event)"
+	    :value="getValue('WageSchedule.SuperfineTeacherResearch')"
 	    :disabled="!edit"
-	    title="女职工卫生费"
-	  /> 
+	    title="补发工资"
+	  />  
+	  </view>
 	  
-	  <l-input
-	    @input="setValue('WageSchedule.TeacherAndTown', $event)"
-	    :value="getValue('WageSchedule.TeacherAndTown')"
-	    :disabled="!edit"
-	    title="乡镇补贴"
-	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.HousingAllowance', $event)"
-	    :value="getValue('WageSchedule.HousingAllowance')"
-	    :disabled="!edit"
-	    title="住房补贴"
-	  /> 
+	  <view v-if="itemtype == 2">
+	  <view class="item-title">基本代扣</view>
 	  <l-input
 	    @input="setValue('WageSchedule.HousingFundAllowance', $event)"
 	    :value="getValue('WageSchedule.HousingFundAllowance')"
@@ -154,84 +98,22 @@
 	    title="住房公积金"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.OtherOne', $event)"
-	    :value="getValue('WageSchedule.OtherOne')"
+	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
+	    :value="getValue('WageSchedule.PersonalIncomeTax')"
 	    :disabled="!edit"
-	    title="其他"
+	    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 v-if="itemtype == 2">
-		  
-	 
-	  
-	  <view class="item-title">代扣代缴</view>
-	  <!-- <l-input
-	    @input="setValue('WageSchedule.DeductionsSubtotal', $event)"
-	    :value="getValue('WageSchedule.DeductionsSubtotal')"
-	    :disabled="!edit"
-	    title="小计"
-	  /> -->
 	  <l-input
-	    @input="setValue('WageSchedule.AccumulationFund', $event)"
-	    :value="getValue('WageSchedule.AccumulationFund')"
+	    @input="setValue('WageSchedule.MedicalInsurance', $event)"
+	    :value="getValue('WageSchedule.MedicalInsurance')"
 	    :disabled="!edit"
-	    title="公积金"
+	    title="医疗保险金"
 	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.EndowmentInsurance', $event)"
 	    :value="getValue('WageSchedule.EndowmentInsurance')"
 	    :disabled="!edit"
-	    title="养老保险"
+	    title="养老保险金"
 	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.OccupationalAnnuities', $event)"
@@ -239,109 +121,66 @@
 	    :disabled="!edit"
 	    title="职业年金"
 	  /> 
-	  <l-input
-	    @input="setValue('WageSchedule.MedicalInsurance', $event)"
-	    :value="getValue('WageSchedule.MedicalInsurance')"
-	    :disabled="!edit"
-	    title="医疗保险"
-	  /> 
 	  <l-input
 	    @input="setValue('WageSchedule.UnemploymentInsurance', $event)"
 	    :value="getValue('WageSchedule.UnemploymentInsurance')"
 	    :disabled="!edit"
-	    title="失业保险"
+	    title="失业保险金"
 	  /> 
 	  <l-input
-	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
-	    :value="getValue('WageSchedule.LaborUnionWage')"
+	    @input="setValue('WageSchedule.OtherOne', $event)"
+	    :value="getValue('WageSchedule.OtherOne')"
 	    :disabled="!edit"
-	    title="工会工费"
+	    title="其它扣款2"
 	  /> 
+	  <view class="item-title">单位扣款</view>
 	  <l-input
-	    @input="setValue('WageSchedule.PersonalIncomeTax', $event)"
-	    :value="getValue('WageSchedule.PersonalIncomeTax')"
+	    @input="setValue('WageSchedule.TenPercent', $event)"
+	    :value="getValue('WageSchedule.TenPercent')"
 	    :disabled="!edit"
-	    title="个人所得税"
+	    title="单位扣款1"
 	  /> 
 	  <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)"
-	    :value="getValue('WageSchedule.FiscalDirect')"
+	    @input="setValue('WageSchedule.GirlStaffSanitation', $event)"
+	    :value="getValue('WageSchedule.GirlStaffSanitation')"
 	    :disabled="!edit"
-	    title="财政直达"
+	    title="单位扣款2"
 	  /> 
 	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.BankWithholding', $event)"
-	    :value="getValue('WageSchedule.BankWithholding')"
-	    :disabled="!edit"
-	    title="银行代扣"
-	  /> -->
-	  <!-- <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.NetCombined', $event)"
-	    :value="getValue('WageSchedule.NetCombined')"
+	    @input="setValue('WageSchedule.TeacherAndTown', $event)"
+	    :value="getValue('WageSchedule.TeacherAndTown')"
 	    :disabled="!edit"
-	    title="实发合计"
+	    title="单位扣款3"
 	  /> 
 	  <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.WageCardNo', $event)"
-	    :value="getValue('WageSchedule.WageCardNo')"
+	    @input="setValue('WageSchedule.HousingAllowance', $event)"
+	    :value="getValue('WageSchedule.HousingAllowance')"
 	    :disabled="!edit"
-	    title="工资卡号"
-	  /> -->
-	  <!-- <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.CreateUser', $event)"
-	    :value="getValue('WageSchedule.CreateUser')"
+	    title="单位扣款4"
+	  />
+	  <l-input
+	    @input="setValue('WageSchedule.AccumulationFund', $event)"
+	    :value="getValue('WageSchedule.AccumulationFund')"
 	    :disabled="!edit"
-	    title="创建用户"
+	    title="单位扣款5"
 	  /> 
-	  <l-datetime-picker
-	  	class="top-15"
-	    @input="setValue('WageSchedule.CreateTime', $event)"
-	    :value="getValue('WageSchedule.CreateTime')"
-	    :disabled="!edit"
-	    title="创建时间"
-	  /> -->
-	  <!-- <l-input
-		class="top-15"
-	    @input="setValue('WageSchedule.IssueMonth', $event)"
-	    :value="getValue('WageSchedule.IssueMonth')"
+	  <l-input
+	    @input="setValue('WageSchedule.LaborUnionWage', $event)"
+	    :value="getValue('WageSchedule.LaborUnionWage')"
 	    :disabled="!edit"
-	    title="发放月份"
-	  /> 
+	    title="单位扣款6"
+	  />
 	  <l-input
-	  		class="top-15"
-	    @input="setValue('WageSchedule.IssueYear', $event)"
-	    :value="getValue('WageSchedule.IssueYear')"
+	    @input="setValue('WageSchedule.FiscalDirect', $event)"
+	    :value="getValue('WageSchedule.FiscalDirect')"
 	    :disabled="!edit"
-	    title="发放年份"
-	  /> -->
+	    title="单位扣款7"
+	  /> 
+	  
+	   </view>
+	  
     </view> 
   
-    <!-- <view v-if="ready" class="bg-white margin-tb padding" style="padding-top: 0; overflow: hidden;"> 
-      <l-button v-if="edit" @click="action('save')" size="lg" color="green" class="block margin-top" block> 
-        提交保存 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('edit')" size="lg" line="orange" class="block margin-top" block> 
-        编辑本页 
-      </l-button> 
-      <l-button v-if="edit && mode !== 'create'" @click="action('reset')" size="lg" line="red" class="block margin-top" block> 
-        取消编辑 
-      </l-button> 
-      <l-button v-if="!edit && mode !== 'create'" @click="action('delete')" size="lg" line="red" class="block margin-top" block> 
-        删除 
-      </l-button> 
-    </view> -->
   </view> 
 </template> 
   
@@ -387,109 +226,92 @@ export default {
       // 表单项数据结构 
       scheme: { 
         WageSchedule: { 
-          // JTitle: { type: 'text', title: '日志主题' }, 
-          // JTypeId: { type: 'select', title: '日志类型', dataSource: '0' }, 
-          // JReceiveId: { type: 'organize', title: '接收人', dataType: 'user' }, 
-          // JContent: { type: 'textarea', title: '日志内容' }, 
 		  // Id
 		  // 序号No
 		  No: { type: 'text', title: '序号' }, 
 		  // 姓名EmpName
 		  EmpName: { type: 'text', title: '姓名' }, 
-		  // 账号/身份证号IdCardNo
-		  IdCardNo: { type: 'text', title: '账号/身份证号' }, 
-		  // 人员类别PeopleType
-		  PeopleType: { type: 'text', title: '人员类别' }, 
-		  // 岗位等级PostType
-		  PostType: { type: 'text', title: '岗位等级'},
-		  // 薪级PayGrade
-		  PayGrade: { type: 'text', title: '薪级'},
 		  // 应发合计TotalGrossPay
 		  TotalGrossPay: { type: 'text', title: '应发合计'},
 		  // 岗位工资PostWage
 		  PostWage: { type: 'text', title: '岗位工资'},
 		  // 薪级工资PayGradeWage
 		  PayGradeWage: { type: 'text', title: '薪级工资'},
-		  // 百分之十TenPercent
-		  TenPercent: { type: 'text', title: '百分之十'},
-		  // 基本工资小计BasePay
-		  BasePay: { type: 'text', title: '基本工资小计'},
-		  // 艰边津贴RoughEdgeAllowance
-		  RoughEdgeAllowance: { type: 'text', title: '艰边津贴'},
-		  // 民族津贴NationAllowance
-		  NationAllowance: { type: 'text', title: '民族津贴'},
+		  // 单位扣款1TenPercent
+		  TenPercent: { type: 'text', title: '单位扣款1'},
+		  // 艰苦边远地区津贴RoughEdgeAllowance
+		  RoughEdgeAllowance: { type: 'text', title: '艰苦边远地区津贴'},
+		  // 保留地区补贴保留额NationAllowance
+		  NationAllowance: { type: 'text', title: '保留地区补贴保留额'},
 		  // 教师津贴TeachAllowance
 		  TeachAllowance: { type: 'text', title: '教师津贴'},
-		  SuperfineTeacherResearch:{ type: 'text', title: '特级教师津贴'},
+		  // 其它津贴补贴RealeState
+		  RealeState: { type: 'text', title: '其它津贴补贴'},
+		  SuperfineTeacherResearch:{ type: 'text', title: '补发工资'},
 		  // 津贴补贴小计SubsidiesAllowances
 		  SubsidiesAllowances: { type: 'text', title: '津贴补贴小计'},
-		  // 基础性绩效BasicsPerformance
-		  BasicsPerformance: { type: 'text', title: '基础性绩效'},
-		  // 女职工卫生费GirlStaffSanitation
-		  GirlStaffSanitation: { type: 'text', title: 'http://cyzjzx.gnway.cc:29904'},
-		  // 交通补贴Transportation
-		  Transportation: { type: 'text', title: '交通补贴'},
-		  // 奖励绩效RealeState
-		  AwardPerformance: { type: 'text', title: '奖励绩效'},
-		  SeparateAwardPerformance: { type: 'text', title: '奖励绩效'},
-		  SeparateBasicsPerformance:{ type: 'text', title: '基础绩效'},
-		  // 工改保留补贴WorkKeep
-		  WorkKeep: { type: 'text', title: '工改保留补贴'},
+		  // 基础绩效奖BasicsPerformance
+		  BasicsPerformance: { type: 'text', title: '基础绩效奖'},
+		  // 单位扣款2GirlStaffSanitation
+		  GirlStaffSanitation: { type: 'text', title: '单位扣款2'},
+		  // 增补抵交临时性补贴Transportation
+		  Transportation: { type: 'text', title: '增补抵交临时性补贴'},
+		  // 纳入绩效工资的活工资AwardPerformance
+		  AwardPerformance: { type: 'text', title: '纳入绩效工资的活工资'},
+		  SeparateAwardPerformance: { type: 'text', title: '奖励性绩效工资'},
+		  SeparateBasicsPerformance:{ type: 'text', title: '基础性绩效工资'},
+		  // 保留地区补贴WorkKeep
+		  WorkKeep: { type: 'text', title: '保留地区补贴'},
 		  // 改革性补贴小计ReformSubsidySum
 		  ReformSubsidySum: { type: 'text', title: '改革性补贴小计'},
-		  // 住房补贴HousingAllowance
-		  HousingAllowance: { type: 'text', title: '住房补贴'},
+		  // 单位扣款4HousingAllowance
+		  HousingAllowance: { type: 'text', title: '单位扣款4'},
 		  // 住房公积金HousingFundAllowance
 		  HousingFundAllowance: { type: 'text', title: '住房公积金'},
-		  // 特级教师津贴和乡镇补贴TeacherAndTown
-		  TeacherAndTown: { type: 'text', title: '特级教师津贴和乡镇补贴'},
+		  // 补发工资和单位扣款3TeacherAndTown
+		  TeacherAndTown: { type: 'text', title: '补发工资和单位扣款3'},
 		  // 扣款小计DeductionsSubtotal
 		  DeductionsSubtotal: { type: 'text', title: '扣款小计'},
-		  // 公积金AccumulationFund
-		  AccumulationFund: { type: 'text', title: '公积金'},
-		  // 工会工费LaborUnionWage
-		  LaborUnionWage: { type: 'text', title: '工会工费'},
+		  // 单位扣款5AccumulationFund
+		  AccumulationFund: { type: 'text', title: '单位扣款5'},
+		  // 单位扣款6LaborUnionWage
+		  LaborUnionWage: { type: 'text', title: '单位扣款6'},
 		  // 个人所得税PersonalIncomeTax
 		  PersonalIncomeTax: { type: 'text', title: '个人所得税'},
-		  // 养老保险EndowmentInsurance
-		  EndowmentInsurance: { type: 'text', title: '养老保险'},
+		  // 养老保险金EndowmentInsurance
+		  EndowmentInsurance: { type: 'text', title: '养老保险金'},
 		  // 职业年金OccupationalAnnuities
 		  OccupationalAnnuities: { type: 'text', title: '职业年金'},
-		  // 医疗保险MedicalInsurance
-		  MedicalInsurance: { type: 'text', title: '医疗保险'},
-		  // 失业保险UnemploymentInsurance
-		  UnemploymentInsurance: { type: 'text', title: '失业保险'},
-		  // 其他Other
-		  Other: { type: 'text', title: '其他'},
-		  // 财政直达FiscalDirect
-		  FiscalDirect: { type: 'text', title: '财政直达'},
+		  // 医疗保险金MedicalInsurance
+		  MedicalInsurance: { type: 'text', title: '医疗保险金'},
+		  // 失业保险金UnemploymentInsurance
+		  UnemploymentInsurance: { type: 'text', title: '失业保险金'},
+		  // (备选3)Other
+		  Other: { type: 'text', title: '(备选3)'},
+		  // 单位扣款7FiscalDirect
+		  FiscalDirect: { type: 'text', title: '单位扣款7'},
 		  // 银行代扣BankWithholding
 		  BankWithholding: { type: 'text', title: '银行代扣'},
 		  // 实发合计NetCombined
 		  NetCombined: { type: 'text', title: '实发合计'},
-		  // 工资卡号WageCardNo
-		  WageCardNo: { type: 'text', title: '工资卡号'},
+		  // 身份证号WageCardNo
+		  WageCardNo: { type: 'text', title: '身份证号'},
 		  // CreateUser
 		  CreateUser: { type: 'text', title: '创建用户'},
 		  // CreateTime
 		  CreateTime: { type: 'text', title: '创建时间'},
-		  // UpdateUser
-		  // UpdateTime
 		  // 发放月份IssueMonth
 		  IssueMonth: { type: 'text', title: '发放月份'},
 		  // 发放年份IssueYear
 		  IssueYear: { type: 'text', title: '发放年份'},
-		  TeacherAndTown:{ type: 'text', title: '乡镇补贴'},
-		  OtherOne:{ type: 'text', title: '其他'},
+		  TeacherAndTown:{ type: 'text', title: '单位扣款3'},
+		  OtherOne:{ type: 'text', title: '其它扣款2'},
         }, 
   
       }, 
   
       // 数据源 
       dataSource: { 
-        JournalSend: { 
-          JTypeId: [], 
-        }, 
   
       },
 	  itemtitle:'',
@@ -503,9 +325,9 @@ export default {
 	  this.itemtype = option.type
 	  this.itemfrom = item[0]
 	  if(this.itemtype == 1){
-		  this.itemtitle = '基本工资'
+		  this.itemtitle = '应发合计'
 	  }else{
-		  this.itemtitle = '代扣代缴'
+		  this.itemtitle = '代扣合计'
 	  }
 	  await this.init()
     // await this.init('edit', '787141ce-a504-4782-90e7-7b9e9e5e161e') 
@@ -549,65 +371,6 @@ export default {
       // this.current = this.COPY(this.origin) 
     }, 
   
-    // 点击 「编辑」、「重置」、「保存」、「删除」 按钮 
-    async action(type) { 
-      switch (type) { 
-        case 'edit': 
-          this.edit = true
-          break
-  
-        case 'reset': 
-          this.current = this.COPY(this.origin) 
-          this.edit = false
-          break
-  
-        case 'save': 
-          const verifyResult = this.verifyForm() 
-          if (verifyResult.length > 0) { 
-            this.CONFIRM('表单验证失败', verifyResult.join('\n')) 
-            return
-          } 
-  
-          if (!(await this.CONFIRM('提交确认', '确定要提交本页表单内容吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('正在提交...') 
-          const postData = await this.getPostData(this.id) 
-  
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/save', postData, '表单提交保存失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.TOAST('提交保存成功') 
-          }) 
-          break
-  
-        case 'delete': 
-          if (!(await this.CONFIRM('删除项目', '确定要删除本项吗？', true))) { 
-            return
-          } 
-  
-          this.LOADING('提交删除中...') 
-          this.HTTP_POST('learun/adms/EducationalAdministration/Journal/delete', this.id, '删除失败').then(success => { 
-            this.HIDE_LOADING() 
-            if (!success) { 
-              return
-            } 
-  
-            this.EMIT('EducationalAdministrationJournalSend-list-change') 
-            this.NAV_BACK() 
-            this.this.TOAST('删除成功', 'success') 
-          }) 
-          break
-  
-        default: break
-      } 
-    }, 
   
     // 获取表单值 
     getValue(path) {