ソースを参照

薪资管理-年月字段名

jingbb 1 年間 前
コミット
a7e85016b8

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

@@ -112,7 +112,7 @@
             {
               title: '月份',
               align:"center",
-              dataIndex: 'yearMonth', 
+              dataIndex: 'yearWithMonth', 
             },
             {
               title: '类型',

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

@@ -17,7 +17,7 @@
                     <a-row :gutter="24">
                         <a-col :md="24" >
                             <a-form-model-item label="年月"  prop="yearMonth ">
-                                <a-month-picker placeholder="请选择" :allowClear="false" v-model="formState.yearMonth" @change="onChange" style="width:100% !important"/>
+                                <a-month-picker placeholder="请选择" :allowClear="false" v-model="formState.yearWithMonth" @change="onChange" style="width:100% !important"/>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="24">
@@ -31,7 +31,7 @@
                         </a-col>
                         <a-col :md="24">
                             <a-form-model-item label="文件" >
-                                <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-upload name="file" :multiple="false"  action="/jeecg-boot/salary/salaryAttendance/importExcel" :before-upload="beforeUpload" @change="handleUploadChange" :data="{'yearWithMonth':formState.yearWithMonth,'type':formState.type}"  :headers="headers" >
                                     <a-button> <a-icon type="upload" /> 上  传 </a-button>
                                 </a-upload>
                             </a-form-model-item>
@@ -57,7 +57,7 @@
           return {
               formState:{
                 type:'考勤表',
-                yearMonth:moment().subtract(1, 'months')
+                yearWithMonth:moment().subtract(1, 'months')
               },
               dataSource: [{}],
               visible:false,
@@ -83,7 +83,7 @@
 
             },
             beforeUpload(){
-                this.formState.yearMonth=moment(this.formState.yearMonth).format('YYYY-MM')
+                this.formState.yearWithMonth=moment(this.formState.yearMonth).format('YYYY-MM')
             },
             handleUploadChange({ file, fileList }){
                 if (file.status === 'done') {