Browse Source

考勤管理

jingbb 1 year ago
parent
commit
28d5683c48

+ 10 - 1
src/views/oa/salary_management/Attendance/attendanceManagement.vue

@@ -10,6 +10,7 @@
                 <a-range-picker
                   :placeholder="['开始月份', '结束月份']"
                   format="YYYY-MM"
+                  valueFormat="YYYY-MM"
                   :value="DateTime"
                   @change="changeStartDate"/>
                 <!-- <a-range-picker v-model="DateTime"  style="width: 100%;" @change="changeStartDate" /> -->
@@ -69,7 +70,7 @@
       <AttendancelDetail ref="AttendancelDetail"></AttendancelDetail>
       <OvertimeDetail ref="OvertimeDetail"></OvertimeDetail>
       <AnnualLeave ref="AnnualLeave"></AnnualLeave>
-      <uploadModal ref="uploadModal"></uploadModal>
+      <uploadModal ref="uploadModal" @ok="searchQuery"></uploadModal>
     </a-card>
   </template>
   
@@ -156,6 +157,14 @@
             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'):''
         },
+        searchQuery(){
+          this.queryParam.pageNo =1
+          this.getTableList()
+        },
+        searchReset(){
+          this.queryParam={}
+          this.getTableList()
+        },
         getTableList(){
           getAction('/salary/salaryAttendance/list',this.queryParam).then(res=>{
             if(res.success){

+ 16 - 9
src/views/oa/salary_management/Attendance/modules/uploadModal.vue

@@ -11,14 +11,13 @@
        >
             <template #footer>
                 <a-button  @click="handleCancel" style="margin-left: 8px;">取消</a-button>
-                <a-button  @click="handleOk" type="primary" 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="24" >
-                            <a-form-model-item label="年月"  prop="name">
-                                <a-month-picker placeholder="请选择" v-model="formState.yearMonth" @change="onChange" style="width:100% !important"/>
+                            <a-form-model-item label="年月"  prop="yearMonth ">
+                                <a-month-picker placeholder="请选择" :allowClear="false" v-model="formState.yearMonth" @change="onChange" style="width:100% !important"/>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="24">
@@ -32,7 +31,7 @@
                         </a-col>
                         <a-col :md="24">
                             <a-form-model-item label="文件" >
-                                <a-upload name="file" :multiple="false"  action="https://www.mocky.io/v2/5cc8019d300000980a055e76"  :headers="headers"   @change="handleChange" >
+                                <a-upload name="file" :multiple="false"  action="/salary/salaryAttendance/importExcel" :before-upload="beforeUpload" @change="handleUploadChange" :data="{'yearMonth':formState.yearMonth,'type':formState.type}"  :headers="headers" >
                                     <a-button> <a-icon type="upload" /> 上  传 </a-button>
                                 </a-upload>
                             </a-form-model-item>
@@ -56,7 +55,10 @@
         },
         data() {
           return {
-              formState:{},
+              formState:{
+                type:'考勤表',
+                yearMonth:moment().subtract(1, 'months')
+              },
               dataSource: [{}],
               visible:false,
               loading:false,
@@ -78,11 +80,16 @@
 
             },
             onChange(data){
-                console.log(this.formState.yearMonth);
-                debugger
-            },
-            handleChange(){
 
+            },
+            beforeUpload(){
+                this.formState.yearMonth=moment(this.formState.yearMonth).format('YYYY-MM')
+            },
+            handleUploadChange({ file, fileList }){
+                if (file.status === 'done') {
+                    this.$emit('ok')
+                    this.handleCancel()
+                }
             }
         }
     }