完善

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

@@ -252,7 +252,7 @@
               let link = document.createElement('a')
               link.style.display = 'none'
               link.href = url
-              link.setAttribute('download',  record.type+'.xlsx')
+              link.setAttribute('download',  record.orgName+record.yearWithMonth+record.type+'.xlsx')
               document.body.appendChild(link)
               link.click()
               document.body.removeChild(link) // 下载完成移除元素

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

@@ -94,22 +94,22 @@
                     width:120,
                     fixed: 'left',
                 },
-                {
-                    title: '编号',
-                    align: "center",
-                    dataIndex: 'code',
-                    ellipsis: true,
-                    customRender: (t) => ellipsis(t,10),
-                    customCell: column => {
-                        return {
-                            style: {
-                                'min-width': "100px",
-                            }
-                         };
-                    },
-                    customHeaderCell: () => ({ style: { 'min-width': "100px" } }),
-                    // width:120,
-                },
+                // {
+                //     title: '编号',
+                //     align: "center",
+                //     dataIndex: 'code',
+                //     ellipsis: true,
+                //     customRender: (t) => ellipsis(t,10),
+                //     customCell: column => {
+                //         return {
+                //             style: {
+                //                 'min-width': "100px",
+                //             }
+                //          };
+                //     },
+                //     customHeaderCell: () => ({ style: { 'min-width': "100px" } }),
+                //     // width:120,
+                // },
                 {
                     title: '年假天数',
                     align: "center",

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

@@ -92,13 +92,13 @@
                     customRender: (t) => ellipsis(t,17),
                     width:'10%'
                 },
-                {
-                    title: '编号',
-                    align: "center",
-                    dataIndex: 'code',
-                    customRender: (t) => ellipsis(t,17),
-                    width:'10%'
-                },
+                // {
+                //     title: '编号',
+                //     align: "center",
+                //     dataIndex: 'code',
+                //     customRender: (t) => ellipsis(t,17),
+                //     width:'10%'
+                // },
                 
                 {
                     title: '加班工资',

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

@@ -2,7 +2,7 @@
     <div class="reply" ref = "replyModal">
       <a-modal
         title="月度工资单"
-        width="95%"
+        width="100%"
         :visible="visible"
         :confirmLoading="loading"
         :getContainer ='()=>$refs.replyModal'
@@ -94,19 +94,20 @@
                     width:110,
                     fixed:'left'
                 },
-                {
-                    title: '编号',
-                    align: "center",
-                    dataIndex: 'code',
-                    ellipsis: true,
-                    customRender: (t) => ellipsis(t,17),
-                    width:120,
-                },
+                // {
+                //     title: '编号',
+                //     align: "center",
+                //     dataIndex: 'code',
+                //     ellipsis: true,
+                //     customRender: (t) => ellipsis(t,17),
+                //     width:120,
+                // },
                 {
                     title: '基本薪资',
                     align: "center",
                     dataIndex: 'wages',
-                    width:110
+                    width:110,
+                    fixed:'left'
                 },
                 {
                     title: '话费补贴',
@@ -164,13 +165,7 @@
                     ellipsis: true,
                     width:100
                 },
-                {
-                    title: '个税',
-                    align: "center",
-                    dataIndex: 'personalTax',
-                    ellipsis: true,
-                    width:100
-                },
+                
                 {
                     title: '迟到',
                     align: "center",
@@ -206,12 +201,21 @@
                     ellipsis: true,
                     width:100
                 },
+                {
+                    title: '个税',
+                    align: "center",
+                    dataIndex: 'personalTax',
+                    ellipsis: true,
+                    width:100,
+                    fixed:'right'
+                },
                 {
                     title: '合计应扣',
                     align: "center",
                     dataIndex: 'totalDeduction',
                     ellipsis: true,
-                    width:110
+                    width:110,
+                    fixed:'right'
                 },
                 {
                     title: '实发合计',

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

@@ -153,7 +153,7 @@
                                    that.handleDownload(res.data.MFY,that.formState.type,"马菲羊");
                                 }
                                 if(res.data.NBSY){
-                                   that.handleDownload(res.data.NBSY,that.formState.type,"宁波森宇");
+                                   that.handleDownload(res.data.NBSY,that.formState.type,"宁波森语");
                                 }
                                 
                                 this.$message.success(res.message);
@@ -178,14 +178,22 @@
                   this.$message.warning('文件下载失败')
                   return
                 }
+                
+                let datePar = "";
+                if(type == '年休工资单'){
+                  datePar = moment(this.formState.yearWith).format('YYYY');
+                }else{
+                  datePar = moment(this.formState.yearWithMonth).format('YYYY-MM');
+                }
+                
                 if (typeof window.navigator.msSaveBlob !== 'undefined') {
-                    window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), name+type + '.xlsx')
+                    window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), name+datePar+type + '.xlsx')
                 } else {
                   let url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
                   let link = document.createElement('a')
                   link.style.display = 'none'
                   link.href = url
-                  link.setAttribute('download',  name+type+'.xlsx')
+                  link.setAttribute('download',  name+datePar+type+'.xlsx')
                   document.body.appendChild(link)
                   link.click()
                   document.body.removeChild(link) // 下载完成移除元素