工资单-加班工资单

src/views/oa/salary_management/personnelSalary/Payroll.vue

@@ -208,9 +208,10 @@
           this.$refs.uploadModal.visible = true
         },
         handleDetail(record){
-          if(record.type=='加班费'){
+          if(record.type=='加班工资单'){
             this.$refs.OvertimePayroll.visible = true
-          }else if(record.type=='年休假补贴'){
+            this.$refs.OvertimePayroll.detail(record.id)
+          }else if(record.type=='年休工资单'){
             this.$refs.AnnualLeavePayroll.visible = true
           }else if(record.type=='月度工资'){
             this.$refs.PayrollDetail.visible = true

src/views/oa/salary_management/personnelSalary/modules/OvertimePayroll.vue

@@ -15,34 +15,23 @@
             <div class="table-page-search-wrapper">
                 <a-form-model layout="inline" ref="form" :model="formState" >
                     <a-row :gutter="24">
-                        <a-col :md="6" :sm="8">
-                            <a-form-model-item label="时间"  prop="totalNum">
-                                <a-input placeholder="" v-model="formState.DateTime" />
-                            </a-form-model-item>
-                        </a-col>
-                        <a-col :md="6" :sm="8">
-                            <a-form-model-item label="版本" >
-                                <a-input placeholder="请输入" v-model="formState.version"  />
-                            </a-form-model-item>
-                        </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-model-item label="姓名"  >
                                 <a-input placeholder="请输入" v-model="formState.name" />
                             </a-form-model-item>
                         </a-col>
+                        <a-col :xl="8" :lg="7" :md="8" :sm="24">
+                            <a-form-item label="部门">
+                                <j-search-select-tag v-model="formState.sysOrgCode" placeholder="请选择部门" 
+                                    dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
+                            </a-form-item>
+                        </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-model-item label=""  >
                                 <a-button type="primary" icon="search" @click="searchSonList">查询</a-button>
                             </a-form-model-item>
                         </a-col>
                     </a-row>
-                    <a-row :gutter="24">
-                        <a-col :md="24" :sm="8"> 
-                            <a-form-model-item label="备注"  class="nresume" style="height:100px !important">
-                                <a-input type="textarea" placeholder="请输入" v-model="formState.demo" />
-                            </a-form-model-item>
-                        </a-col>
-                    </a-row>
                 </a-form-model>
                 <a-table
                     bordered
@@ -63,10 +52,12 @@
       import pick from 'lodash.pick'
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { putAction,getAction } from '@/api/manage'
+      import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
       export default {
         name: 'OvertimePayroll',
         components: {
             moment,
+            JSearchSelectTag
         },
         data() {
           return {
@@ -87,7 +78,7 @@
                 {
                     title: '编号',
                     align: "center",
-                    dataIndex: 'number',
+                    dataIndex: 'code',
                     ellipsis: true,
                     width:'4%'
                 },
@@ -99,121 +90,107 @@
                     width:'4%'
                 },
                 {
-                    title: '基本薪资',
+                    title: '一月',
                     align: "center",
-                    dataIndex: 'organization',
+                    dataIndex: 'january',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '话费补贴',
+                    title: '二月',
                     align: "center",
-                    dataIndex: 'salaryCardNumber',
+                    dataIndex: 'february',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '午餐补贴',
+                    title: '三月',
                     align: "center",
-                    dataIndex: 'singlesWeekendsOff',
+                    dataIndex: 'march',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '住房补贴',
+                    title: '四月',
                     align: "center",
-                    dataIndex: 'workingHours',
+                    dataIndex: 'april',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '交通补贴',
+                    title: '五月',
                     align: "center",
-                    dataIndex: 'attendanceDays',
+                    dataIndex: 'may',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '全勤奖',
+                    title: '六月',
                     align: "center",
-                    dataIndex: 'telephoneSubsidy',
+                    dataIndex: 'june',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '合计应发',
+                    title: '七月',
                     align: "center",
-                    dataIndex: 'lunchSubsidy',
+                    dataIndex: 'july',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '社保',
+                    title: '八月',
                     align: "center",
-                    dataIndex: 'housingSubsidies',
+                    dataIndex: 'august',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '公积金',
+                    title: '九月',
                     align: "center",
-                    dataIndex: 'transportationSubsidies',
+                    dataIndex: 'september',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '个税',
+                    title: '十月',
                     align: "center",
-                    dataIndex: 'fullAttendanceAward',
+                    dataIndex: 'october',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '迟到',
+                    title: '十一月',
                     align: "center",
-                    dataIndex: 'endowmentInsurance',
+                    dataIndex: 'november',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '事假',
+                    title: '十二月',
                     align: "center",
-                    dataIndex: 'unemploymentInsurance',
+                    dataIndex: 'december',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '病假',
+                    title: '加班工资',
                     align: "center",
-                    dataIndex: 'medicalInsurance',
+                    dataIndex: 'workOvertimeCost',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
-                    title: '婚假',
-                    align: "center",
-                    dataIndex: 'accumulationFund',
-                    ellipsis: true,
-                    width:'4%'
-                },
-                {
-                    title: '丧假',
-                    align: "center",
-                    dataIndex: 'salaryDeduction',
-                    ellipsis: true,
-                    width:'4%'
-                },
-                {
-                    title: '合计应扣',
+                    title: '个税',
                     align: "center",
-                    dataIndex: 'latenessTimes',
+                    dataIndex: 'personalTax',
                     ellipsis: true,
                     width:'4%'
                 },
                 {
                     title: '实发合计',
                     align: "center",
-                    dataIndex: 'lateDeductionFees',
+                    dataIndex: 'actualOccurrence',
                     ellipsis: true,
                     width:'4%'
                 },
@@ -227,9 +204,27 @@
         methods: {
             handleCancel(){
                 this.visible = false
+                this.dataSource=[]
+                this.formState={}
+            },
+            detail(id){
+                this.formState = {}
+                this.formState.id = id
+                this.getTableList()
+            },
+            getTableList(){
+                this.loading = true
+                getAction('/salary/salaryManagement/querySalaryManagementWorkOvertimeListByMainId',this.formState).then(res=>{
+                    this.loading = false
+                    if(res.success){
+                        this.dataSource =res.result
+                    }else{
+                        this.$message.error(res.message);
+                    }
+                })
             },
             searchSonList(){
-
+                this.getTableList()
             }
         }
     }

src/views/oa/salary_management/personnelSalary/modules/PayrollDetail.vue

@@ -52,10 +52,12 @@
       import pick from 'lodash.pick'
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { putAction,getAction } from '@/api/manage'
+      import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
       export default {
         name: 'PayrollDetail',
         components: {
             moment,
+            JSearchSelectTag
         },
         data() {
           return {