Merge branch 'wyz' into 'test'

优化2

See merge request !183

src/views/financialCenter/financialBilling.vue

@@ -95,7 +95,7 @@
             sortable
             sortable
             :formatter="row => formatCurrency(row.commissionPaidAmount || 0)"
             :formatter="row => formatCurrency(row.commissionPaidAmount || 0)"
           />
           />
-
+          <el-table-column prop="reconciliationYearMonth" label="检核年月" width="130" sortable />
           <el-table-column
           <el-table-column
             prop="commissionPendingRatio"
             prop="commissionPendingRatio"
             label="达成率缺口"
             label="达成率缺口"
@@ -368,7 +368,7 @@ const loading = ref(false)
 const selectedRow = ref(null)
 const selectedRow = ref(null)
 const searchFormRef = ref(null)
 const searchFormRef = ref(null)
 const searchParams = ref({})
 const searchParams = ref({})
-let oldStaticData = ref({})
+const oldStaticData = ref({})
 // 动态生成操作菜单项（根据行数据）
 // 动态生成操作菜单项（根据行数据）
 const getOperateItems = row => {
 const getOperateItems = row => {
   const items = []
   const items = []
@@ -446,6 +446,13 @@ const searchConfig = ref([
     }
     }
   },
   },
   {
   {
+    type: 'month',
+    prop: 'reconciliationYearMonth',
+    label: '检核年月',
+    startPlaceholder: '开始时间',
+    endPlaceholder: '结束时间'
+  },
+  {
     type: 'monthrange',
     type: 'monthrange',
     prop: 'actualPayoutDate',
     prop: 'actualPayoutDate',
     label: '出账月（实）',
     label: '出账月（实）',
@@ -1066,12 +1073,6 @@ const addCheckRecordFormModel = ref({})
 const addCheckRecordFormRef = ref(null)
 const addCheckRecordFormRef = ref(null)
 const addCheckRecordFormDialogFlag = ref(false)
 const addCheckRecordFormDialogFlag = ref(false)
 const addCheckRecordConfig = [
 const addCheckRecordConfig = [
-  // {
-  //   type: 'month',
-  //   prop: 'reconciliationYearMonth',
-  //   label: '检核年月',
-  //   placeholder: '检核年月'
-  // },
   {
   {
     type: 'select',
     type: 'select',
     prop: 'fortuneBizType',
     prop: 'fortuneBizType',

src/views/financialCenter/financialSalary.vue

@@ -407,6 +407,7 @@ const searchConfig = ref([
     defaultValue: ['6'] //默认查询待出账，已检核的数据
     defaultValue: ['6'] //默认查询待出账，已检核的数据
   }
   }
 ])
 ])
+const oldStaticData = ref({})
 // 添加表格引用
 // 添加表格引用
 const tableRef = ref()
 const tableRef = ref()
 // 存储所有选中的行数据（用于跨页保持选择）
 // 存储所有选中的行数据（用于跨页保持选择）
@@ -886,7 +887,7 @@ const getStaticData = async data => {
     console.log('统计数据', res)
     console.log('统计数据', res)
     console.log('====================================')
     console.log('====================================')
     if (res.code === 200) {
     if (res.code === 200) {
-      statisticsData.value = res.data || {}
+      statisticInfo.value = res.data || {}
     } else {
     } else {
       ElMessage.error(res.msg || '获取统计数据失败')
       ElMessage.error(res.msg || '获取统计数据失败')
     }
     }
@@ -901,7 +902,7 @@ const handleSelectionChange = selection => {
   if (fortuneAccountIdList.length > 0) {
   if (fortuneAccountIdList.length > 0) {
     getStaticData({ fortuneAccountIdList })
     getStaticData({ fortuneAccountIdList })
   } else {
   } else {
-    statisticsData.value = JSON.parse(JSON.stringify(oldStaticData.value))
+    statisticInfo.value = JSON.parse(JSON.stringify(oldStaticData.value))
   }
   }
   selectedRows.value = selection
   selectedRows.value = selection
   // 更新全局选中状态
   // 更新全局选中状态