页面对接

src/api/financial/commission.js

@@ -256,7 +256,7 @@ export function expectedFortuneStatistics(data) {
     data: data
     data: data
   })
   })
 }
 }
-// 入账记录查询
+// 入账比对记录查询
 export function commissionEntryRecord(data) {
 export function commissionEntryRecord(data) {
   return request({
   return request({
     url: '/csf/api/commission/compare/records',
     url: '/csf/api/commission/compare/records',
@@ -300,3 +300,12 @@ export function exportReceivedFortune(data) {
     responseType: 'blob'
     responseType: 'blob'
   })
   })
 }
 }
+
+// 入账记录查询
+export function commissionExpectedRecord(data) {
+  return request({
+    url: '/csf/api/commission/pageByCommissionexpectedBizId',
+    method: 'post',
+    data: data
+  })
+}

src/components/FileUpload/index.vue

@@ -14,6 +14,7 @@
       :headers="headers"
       :headers="headers"
       class="upload-file-uploader"
       class="upload-file-uploader"
       ref="fileUpload"
       ref="fileUpload"
+      :drag="drag"
       v-if="!disabled"
       v-if="!disabled"
     >
     >
       <!-- 上传按钮 -->
       <!-- 上传按钮 -->

src/components/SearchForm/SearchForm.vue

@@ -54,8 +54,8 @@
                 <el-col :xs="24" :sm="12" :md="6" :lg="6" v-else-if="item.type === 'date'">
                 <el-col :xs="24" :sm="12" :md="6" :lg="6" v-else-if="item.type === 'date'">
                     <el-form-item :label="item.label" :prop="item.prop">
                     <el-form-item :label="item.label" :prop="item.prop">
                         <el-date-picker v-model="formModel[item.prop]" type="date"
                         <el-date-picker v-model="formModel[item.prop]" type="date"
-                            :placeholder="item.placeholder || `请选择${item.label}`" format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD" style="width: 100%" clearable />
+                            :placeholder="item.placeholder || `请选择${item.label}`" :format="item.format || 'YYYY-MM-DD'"
+                            :value-format="item.valueFormat || 'YYYY-MM-DD'" style="width: 100%" clearable />
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
 
 
@@ -69,6 +69,7 @@
                             value-format="YYYY-MM-DD" clearable />
                             value-format="YYYY-MM-DD" clearable />
                     </el-form-item>
                     </el-form-item>
                 </el-col>
                 </el-col>
+                
             </template>
             </template>
         </el-row>
         </el-row>
     </el-form>
     </el-form>

src/views/financialCenter/receivables.vue

@@ -163,7 +163,7 @@ import CommonDialog from '@/components/commonDialog'
 import { ref, reactive, onMounted } from 'vue'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { MoreFilled } from '@element-plus/icons-vue'
 import { MoreFilled } from '@element-plus/icons-vue'
-import { receivedFortuneList, commissionEntryRecord, commissionEntryEditRecords, exportReceivedFortune } from '@/api/financial/commission'
+import { receivedFortuneList, commissionEntryRecord, commissionEntryEditRecords, exportReceivedFortune, commissionExpectedRecord } from '@/api/financial/commission'
 import { numberWithCommas } from '@/utils/index'
 import { numberWithCommas } from '@/utils/index'
 import SearchForm from '@/components/SearchForm/SearchForm.vue'
 import SearchForm from '@/components/SearchForm/SearchForm.vue'
 import { getDictLabel } from '@/utils/useDict';
 import { getDictLabel } from '@/utils/useDict';
@@ -417,8 +417,8 @@ const loadTableData = async (searchParams = {}) => {
 const loadEntryRecordData = async (cbd) => {
 const loadEntryRecordData = async (cbd) => {
     loading.value = true
     loading.value = true
     try {
     try {
-        const params = { commissionBizId: cbd }
-        const response = await commissionEntryRecord(params)
+        const params = { commissionExpectedBizId: cbd }
+        const response = await commissionExpectedRecord(params)
         return response.data.records || []
         return response.data.records || []
     } catch (error) {
     } catch (error) {
         console.error('加载入账记录失败:', error)
         console.error('加载入账记录失败:', error)
@@ -451,27 +451,19 @@ const handleSelect = async (e, row) => {
     if (e === 'entryRecord') {
     if (e === 'entryRecord') {
         entryRecordDialogTableVisible.value = true
         entryRecordDialogTableVisible.value = true
         entryRecordDialogTableColumns.value = [
         entryRecordDialogTableColumns.value = [
+            { property: 'reconciliationYearMonth', label: '检核年月', width: '100' },
             { property: 'commissionPeriod', label: '佣金期数', width: '100' },
             { property: 'commissionPeriod', label: '佣金期数', width: '100' },
             { property: 'totalPeriod', label: '总期数', width: '150' },
             { property: 'totalPeriod', label: '总期数', width: '150' },
             { property: 'exchangeRate', label: '结算汇率（实）', width: '150' },
             { property: 'exchangeRate', label: '结算汇率（实）', width: '150' },
             { property: 'currency', label: '入账币种', width: '150' },
             { property: 'currency', label: '入账币种', width: '150' },
             { property: 'amount', label: '入账金额', width: '150' },
             { property: 'amount', label: '入账金额', width: '150' },
-            { property: 'commissionRatio', label: '入账比例', width: '150' },
+            { property: 'currentCommissionRatio', label: '入账比例', width: '150' },
             { property: 'commissionDate', label: '入账日', width: '150' },
             { property: 'commissionDate', label: '入账日', width: '150' },
             { property: 'status', label: '入账状态', width: '150' }
             { property: 'status', label: '入账状态', width: '150' }
         ]
         ]
         // 加载真实数据
         // 加载真实数据
         const records = await loadEntryRecordData(row.commissionExpectedBizId)
         const records = await loadEntryRecordData(row.commissionExpectedBizId)
-        entryRecordDialogTableData.value = records.length ? records : [{
-            commissionPeriod: '2023-08',
-            totalPeriod: '10',
-            exchangeRate: '1.2345',
-            currency: 'CNY',
-            amount: '10000.00',
-            commissionRatio: '10%',
-            commissionDate: '2023-08-01',
-            status: '已入账'
-        }]
+        entryRecordDialogTableData.value = records.length ? records : []
     } else if (e === 'setStatus') {
     } else if (e === 'setStatus') {
         // 回显当前行状态
         // 回显当前行状态
         form.status = row.status
         form.status = row.status