Merge remote-tracking branch 'origin/dev' into prod

src/api/salary/index.js

@@ -118,6 +118,15 @@ export function checkSalaryApi(data) {
     data: data
   })
 }
+// 电子薪资单导出
+export function electronicExport(data) {
+  return request({
+    url: '/csf/api/salary/salary/export',
+    method: 'post',
+    data: data
+  })
+}
+
 // 下载选中的发佣数据
 
 export function downloadPolicyFortune(data) {

src/components/Table/editTable.vue

@@ -551,6 +551,7 @@ function handleCellChange(row, col, newValue, rowIndex) {
 function handleSelectChange(row, col, value, rowIndex) {
   const newTableData = [...props.tableData]
   const updatedRow = { ...row, [col.prop]: value }
+
   // 处理额外字段赋值
   if (col.onChangeExtraFields) {
     const options = getSelectOptions(col, row)

src/views/financialCenter/financialSalary.vue

@@ -758,6 +758,8 @@ const setCurrentPageSelection = () => {
 
   // 设置当前页应该选中的行
   tableData.value.forEach(row => {
+    console.log('薪资发放row', allSelectedRows.value)
+
     if (allSelectedRows.value.has(row.fortuneAccountBizId)) {
       tableRef.value.toggleRowSelection(row, true)
     }

src/views/financialCenter/receivables.vue

@@ -783,7 +783,7 @@ const loadTableData = async () => {
   try {
     console.log('searchParams.entryDate', searchParams.entryDate)
 
-    if (searchParams.entryDate.length > 0) {
+    if (searchParams.entryDate && searchParams.entryDate.length > 0) {
       searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
       searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
     } else {
@@ -793,7 +793,6 @@ const loadTableData = async () => {
 
     const params = {
       ...searchParams,
-
       commissionDateStart: searchParams.commissionDateStart || undefined,
       commissionDateEnd: searchParams.commissionDateEnd || undefined,
 
@@ -827,7 +826,7 @@ const getStatics = async () => {
   const searchParams = searchFormRef.value.getFormData() || {}
 
   try {
-    if (searchParams.entryDate.length > 0) {
+    if (searchParams.entryDate && searchParams.entryDate.length > 0) {
       searchParams.commissionDateStart = `${searchParams.entryDate[0]}-01`
       searchParams.commissionDateEnd = `${searchParams.entryDate[1]}-01`
     } else {