调整

src/views/oa/salary_management/Attendance/modules/AttendancelDetail.vue

@@ -221,35 +221,35 @@
                     width:'3%'
                 },
                 {
-                    title: '事假时间',
+                    title: '事假时间(分)',
                     align: "center",
                     dataIndex: 'personalLeave',
                     customRender: (t) => ellipsis(t,4),
                     width:'3%'
                 },
                 {
-                    title: '病假时间',
+                    title: '病假时间(分)',
                     align: "center",
                     dataIndex: 'sickLeave',
                     customRender: (t) => ellipsis(t,4),
                     width:'3%'
                 },
                 {
-                    title: '婚假时间',
+                    title: '婚假时间(分)',
                     align: "center",
                     dataIndex: 'marriageLeave',
                     customRender: (t) => ellipsis(t,4),
                     width:'3%'
                 },
                 {
-                    title: '丧假时间',
+                    title: '丧假时间(分)',
                     align: "center",
                     dataIndex: 'funeralLeave',
                     customRender: (t) => ellipsis(t,4),
                     width:'3%'
                 },
                 {
-                    title: '年假时间',
+                    title: '年假时间(天)',
                     align: "center",
                     dataIndex: 'yearLeave',
                     customRender: (t) => ellipsis(t,5),
@@ -261,6 +261,12 @@
                     dataIndex: 'workOvertime',
                     customRender: (t) => ellipsis(t,3),
                     width:'3%'
+                },{
+                    title: '备注',
+                    align: "center",
+                    dataIndex: 'remarks',
+                    customRender: (t) => ellipsis(t,10),
+                    width:'5%'
                 },
              ]
           }

src/views/oa/salary_management/Attendance/modules/uploadModal.vue

@@ -101,11 +101,13 @@
                 if (file.status === 'done'&&file.response.success) {
                     this.showUploadList = true
                     this.$message.success(file.response.message)
+                    this.checked = false
                     this.$emit('ok')
                     this.handleCancel()
                 }else if(file.status === 'done'&&!file.response.success){
                     this.showUploadList = false
                     this.$message.error(file.response.message)
+                    this.checked = false
                 }
                 
             }

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

@@ -102,7 +102,7 @@
           DateTime:[],
           loading:false,
           isorter: {
-            column: 'updateTime',
+            column: 'orgName',
             order: 'desc'
           },
           // 表头
@@ -116,11 +116,11 @@
                     return parseInt(index)+1;
               }
             },
-            {
-              title: '编号',
-              align:"center",
-              dataIndex: 'code'
-            },
+            // {
+            //   title: '编号',
+            //   align:"center",
+            //   dataIndex: 'code'
+            // },
             {
               title: '部门',
               align:"center",
@@ -159,7 +159,7 @@
             },
           ],
           queryParam:{
-            syHireType:['在职','退休反聘']
+            syHireType:['在职','退休返聘']
           },
           dataSource:[{}],
           ipagination:{},
@@ -208,7 +208,7 @@
         },
         searchReset(){
           this.queryParam={
-            syHireType:['在职','退休反聘']
+            syHireType:['在职','退休返聘']
           }
           this.getTableList()
         },

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

@@ -77,6 +77,13 @@
                     align:"center",
                     width:'5%',
                     dataIndex: 'index',
+                   customRender:function (t, record, index) {
+                       if(record.name=='合计'){
+                           return ''
+                       }else{
+                           return parseInt(index)+1;
+                       } 
+                   },
                 },
                 {
                     title: '姓名',

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

@@ -183,13 +183,13 @@
                 postAction('/salary/salaryManagement/generatePayroll',data).then((res) => {
                     if (res.success) {
                         if(res.data&&res.data.ZZ){
-                             that.handleDownload(res.data.ZZ,that.formState.type,"正织");
+                             that.handleDownload(res.data.ZZ,that.formState.type,"正织",data);
                         }
                         if(res.data&&res.data.MFY){
-                             that.handleDownload(res.data.MFY,that.formState.type,"马菲羊");
+                             that.handleDownload(res.data.MFY,that.formState.type,"马菲羊",data);
                         }
                         if(res.data&&res.data.NBSY){
-                            that.handleDownload(res.data.NBSY,that.formState.type,"宁波森语");
+                            that.handleDownload(res.data.NBSY,that.formState.type,"宁波森语",data);
                         } 
                         this.$message.success(res.message);
                         this.handleCancel()
@@ -201,7 +201,7 @@
                     this.loading = false
                 })
             },
-            handleDownload(id,type,name){
+            handleDownload(id,type,name,datas){
               downFile('/salary/salaryManagement/exportXls2',{id:id,type:type}).then(data => {
                 
                 this.$message.success(name+type+"数据导出中，请稍等");
@@ -213,9 +213,11 @@
                 
                 let datePar = "";
                 if(type == '年休工资单'){
-                  datePar = moment(this.formState.yearWith).format('YYYY');
+                  datePar = datas.yearWith;
+                  // datePar = moment(data.yearWith).format('YYYY');
                 }else{
-                  datePar = moment(this.formState.yearWithMonth).format('YYYY-MM');
+                  datePar = datas.yearWithMonth;
+                  // datePar = moment(data.yearWithMonth).format('YYYY-MM');
                 }
                 
                 if (typeof window.navigator.msSaveBlob !== 'undefined') {

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

@@ -97,9 +97,11 @@
                     this.showUploadList = true
                     this.$message.success(file.response.message)
                     this.$emit('ok')
+                    this.checked = false
                     this.handleCancel()
                 }else if(file.status === 'done'&&!file.response.success){
                     this.showUploadList = false
+                    this.checked = false
                     this.$message.error(file.response.message)
                 }