Browse Source

考勤管理

jingbb 1 year ago
parent
commit
db74fea47a

+ 23 - 7
src/views/oa/salary_management/Attendance/attendanceManagement.vue

@@ -7,7 +7,12 @@
           <a-row :gutter="24">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="时间">
-                <a-range-picker v-model="DateTime"  style="width: 100%;" @change="changeStartDate" />
+                <a-range-picker
+                  :placeholder="['开始月份', '结束月份']"
+                  format="YYYY-MM"
+                  :value="DateTime"
+                  @change="changeStartDate"/>
+                <!-- <a-range-picker v-model="DateTime"  style="width: 100%;" @change="changeStartDate" /> -->
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -89,7 +94,20 @@
               title: '序号',
               width: 80,
               align:"center",
-              dataIndex: 'code'
+              dataIndex: 'index',
+              customRender:function (t, r, index) {
+                    return parseInt(index)+1;
+              }
+            },
+            {
+              title: '月份',
+              align:"center",
+              dataIndex: 'yearMonth', 
+            },
+            {
+              title: '类型',
+              align:"center",
+              dataIndex: 'yearMonth', 
             },
             {
               title: '名称   ',
@@ -99,7 +117,7 @@
             {
               title: '上传时间',
               align:"center",
-              dataIndex: 'uploadTime'
+              dataIndex: 'updateTime'
             },
             {
               title: '版本',
@@ -126,14 +144,12 @@
       methods: {
         changeStartDate(data){
             this.DateTime = data
-            this.queryParam.Date_begin = data.length==2?moment(data[0]).format('YYYY-MM-DD'):''
-            this.queryParam.Date_end = data.length==2?moment(data[1]).format('YYYY-MM-DD'):''
+            this.queryParam.yearMonth_begin = data.length==2?moment(data[0]).format('YYYY-MM-DD'):''
+            this.queryParam.yearMonth_end = data.length==2?moment(data[1]).format('YYYY-MM-DD'):''
         },
         getTableList(){
           getAction('/salary/salaryAttendance/list',this.queryParam).then(res=>{
-            debugger
             if(res.success){
-              debugger
                 this.dataSource =res.result.records
                 this.ipagination = {
                   total: res.result.total,

+ 276 - 0
src/views/oa/salary_management/Attendance/modules/AttendancelDetail.vue

@@ -0,0 +1,276 @@
+<template>
+    <div class="reply" ref = "replyModal">
+      <a-modal
+        title="考勤明细"
+        width="85%"
+        :visible="visible"
+        :confirmLoading="loading"
+        :getContainer ='()=>$refs.replyModal'
+        @cancel="handleCancel"
+        destroyOnClose
+       >
+            <template #footer>
+                <a-button  @click="handleCancel" style="margin-left: 8px;">取消</a-button>
+            </template>
+            <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="name">
+                                <a-input  v-model="formState.orgName" disabled/>
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-model-item label="考勤时间"  prop="totalNum">
+                                <a-input placeholder="" v-model="formState.DateTime" disabled/>
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-model-item label="版本" >
+                                <a-input placeholder="请输入" v-model="formState.version" disabled />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="6" :sm="8">
+                            <a-form-model-item label="姓名"  >
+                                <a-input placeholder="请输入" v-model="formState.name" disabled/>
+                            </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.remarks" disabled/>
+                            </a-form-model-item>
+                        </a-col>
+                    </a-row>
+                </a-form-model>
+                <a-table
+                    bordered
+                    :columns="columns"
+                    :data-source="dataSource"
+                    :loading="loading"
+                    :scroll="{x: 3500 ,y:300}"
+                    :pagination="false"
+                >
+                </a-table>
+            </div>
+      </a-modal>
+    </div>
+</template>
+<script>
+    
+      import moment from 'moment'
+      import pick from 'lodash.pick'
+      import { FormTypes } from '@/utils/JEditableTableUtil'
+      import { putAction,getAction } from '@/api/manage'
+      export default {
+        name: 'PayrollDetail',
+        components: {
+            moment,
+        },
+        data() {
+          return {
+              formState:{},
+              dataSource: [{}],
+              visible:false,
+              loading:false,
+              columns: [
+                {
+                    title: '编号',
+                    align: "center",
+                    dataIndex: 'code',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '姓名',
+                    align: "center",
+                    dataIndex: 'name',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '组织',
+                    align: "center",
+                    dataIndex: 'orgName',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '工资卡号',
+                    align: "center",
+                    dataIndex: 'cardNo',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '单双休',
+                    align: "center",
+                    dataIndex: 'restMode',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '工时/天',
+                    align: "center",
+                    dataIndex: 'workingHours',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '出勤天数',
+                    align: "center",
+                    dataIndex: 'attendanceDays',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '话费补贴',
+                    align: "center",
+                    dataIndex: 'phoneBill',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '午餐补贴',
+                    align: "center",
+                    dataIndex: 'lunch',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '住房补贴',
+                    align: "center",
+                    dataIndex: 'housingSubsidies',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '交通补贴',
+                    align: "center",
+                    dataIndex: 'transportation',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '全勤奖',
+                    align: "center",
+                    dataIndex: 'fullAttendance',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '养老保险',
+                    align: "center",
+                    dataIndex: 'endowmentInsurance',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '失业保险',
+                    align: "center",
+                    dataIndex: 'unemploymentInsurance',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '医疗保险',
+                    align: "center",
+                    dataIndex: 'medicalInsurance',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '公积金',
+                    align: "center",
+                    dataIndex: 'accumulationFund',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '工资抵扣',
+                    align: "center",
+                    dataIndex: 'deduction',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '迟到次数',
+                    align: "center",
+                    dataIndex: 'latenessTimes',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '迟到扣费',
+                    align: "center",
+                    dataIndex: 'latenessCost',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '事假时间',
+                    align: "center",
+                    dataIndex: 'personalLeave',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '病假时间',
+                    align: "center",
+                    dataIndex: 'sickLeave',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '婚假时间',
+                    align: "center",
+                    dataIndex: 'marriageLeave',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '丧假时间',
+                    align: "center",
+                    dataIndex: 'funeralLeave',
+                    ellipsis: true,
+                    width:'4%'
+                },
+                {
+                    title: '年假时间',
+                    align: "center",
+                    dataIndex: 'yearLeave',
+                    ellipsis: true,
+                    width:'4%'
+                },
+             ]
+          }
+        },
+        created(){
+        },
+        watch: {
+        },
+        methods: {
+            handleCancel(){
+                this.visible = false
+            }
+        }
+    }
+    </script>
+    
+    <style scoped lang="less">
+    /deep/ .nresume .ant-input{
+      height: 100px !important;
+    }
+
+    /deep/ .ant-select{
+      width: 100%;
+    }
+    .form-table-heard:before {
+          content: '*';
+          color: red;
+    }
+    /deep/ .ant-calendar-picker{
+      width: 113px !important;
+    }
+    </style>