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 94e38c436..ff72e83cc 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
@@ -34,190 +34,11 @@
代扣合计
- ￥{{list.length > 0 ? list[0].DeductionsSubtotal || 0 : 0}}
+ ￥{{list.length > 0 ? (list[0].DeductionsSubtotal + list[0].BankWithholding) || 0 : 0}}
-
-
-
-
-
-
@@ -231,15 +52,13 @@
-
+
重置筛选条件
-
-
@@ -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'
- },
-
},
// 筛选菜单值
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 2adcdde4e..a3d9b4bf9 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
@@ -1,45 +1,8 @@
-
-
-
-
-
-
-
+
- 基本工资
-
- 绩效工资
-
- 单列绩效
- 津贴补贴
+
- 改革性补贴
+ title="其它津贴补贴"
+ />
+ title="补发工资"
+ />
+
-
-
+
+ 基本代扣
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 代扣代缴
-
-
+ 单位扣款
-
-
-
-
-
+ title="单位扣款7"
+ />
+
+
+
-
@@ -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) {