123

src/views/oa/salary_management/Attendance/attendanceManagement.vue

@@ -67,7 +67,7 @@
   </template>
   
   <script>
-  
+    import JEllipsis from '@/components/jeecg/JEllipsis'
     import { JeecgListMixin } from '@/mixins/JeecgListMixin'
     import { getAction,downFile} from '@/api/manage'
     import moment from 'moment'
@@ -79,12 +79,14 @@
       name: "attendanceManagement",
       mixins: [JeecgListMixin],
       components: {
+        JEllipsis,
         AttendancelDetail,
         AnnualLeave,
         OvertimeDetail,
         uploadModal
       },
       data () {
+        let ellipsis = (v, l) => <j-ellipsis value={v} length={l} />
         return {
           description: '考勤管理',
           DateTime:[],
@@ -122,6 +124,13 @@
               align:"center",
               dataIndex: 'createTime'
             },
+            {
+              title: '备注',
+              align:"center",
+              width: 350,
+              customRender: (t) => ellipsis(t,22),
+              dataIndex: 'remarks'
+            },
             {
               title: '版本',
               align:"center",

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

@@ -261,13 +261,7 @@
                     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/personnelSalary/Payroll.vue

@@ -65,6 +65,7 @@
       <div class="table-operator">
         <a-button @click="createPayroll" type="primary" icon="plus">生成工资单</a-button>
         <a-button @click="addPayroll" type="primary" icon="plus">导入</a-button>
+        <a-button @click="daochu" type="primary" icon="plus">导出明细</a-button>
       </div>
 
   
@@ -254,6 +255,27 @@
           }
           
         },
+        daochu(){
+          downFile('/salary/salaryManagement/exportXls99',{}).then(data => {
+            if (!data) {
+              this.$message.warning('文件下载失败')
+              return
+            }
+            if (typeof window.navigator.msSaveBlob !== 'undefined') {
+                window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }),  record.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', '明细.xlsx')
+              document.body.appendChild(link)
+              link.click()
+              document.body.removeChild(link) // 下载完成移除元素
+              window.URL.revokeObjectURL(url) // 释放掉blob对象
+            }
+          })
+        },
         handleDownload(record){
           downFile('/salary/salaryManagement/exportXls',{id:record.id,type:record.type}).then(data => {
             if (!data) {