财政工资条修改 点击跳转页面查看详情

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) 
     }, 
   
     // 点击 「编辑」、「重置」、「保存」、「删除」 按钮