增加字段

src/views/property/case-allocation/index.vue

@@ -315,6 +315,18 @@
         showOverflow: 'tooltip',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'cpe.username',
         title: 'CPE',

src/views/property/case-allocationCpe/index.vue

@@ -316,6 +316,18 @@
         showOverflow: 'tooltip',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'cpe.username',
         title: 'CPE',

src/views/property/case-back/index.vue

@@ -415,6 +415,18 @@
         showOverflow: 'tooltip',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'cpe.username',
         title: 'CPE',

src/views/property/case-detail/index.vue

@@ -187,11 +187,11 @@
                             <td>{{ row?.sumReductionAmount }}</td>
                             <td class="label">剩余待还金额</td>
                             <td>{{ row?.remainingAmount }}</td>
-                            <td class="label">折扣后金额</td>
+                            <td class="label">委案金额折扣值</td>
                             <td>{{
-                              row?.remainingAmount && row?.discount
-                                ? Decimal(row?.remainingAmount).mul(Decimal(row?.discount))
-                                : row?.remainingAmount
+                              row?.commissionAmount && row?.discount
+                                ? Decimal(row?.commissionAmount).mul(Decimal(row?.discount)).div(Decimal(10))
+                                : row?.commissionAmount
                             }}</td>
                           </tr>
                           <tr>
@@ -201,14 +201,12 @@
                             <td>{{ row?.cpeDate }}</td>
                             <td class="label">本金余额</td>
                             <td>{{ row?.principalBalance }}</td>
-                            <td class="label">案件状态</td>
-                            <td>
-                              {{
-                                row?.caseStatus
-                                  ? CaseStatus.find((v) => v.value === row?.caseStatus)?.label
-                                  : ''
-                              }}</td
-                            >
+                            <td class="label">本金余额折扣值</td>
+                            <td>{{
+                              row?.principalBalance && row?.discount
+                                ? Decimal(row?.principalBalance).mul(Decimal(row?.discount)).div(Decimal(10))
+                                : row?.principalBalance
+                            }}</td>
                           </tr>
                           <tr>
                             <td class="label">手续费</td>
@@ -226,6 +224,14 @@
                                     ?.label
                                 : ''
                             }}</td>
+                            <td class="label">案件状态</td>
+                            <td>
+                              {{
+                                row?.caseStatus
+                                  ? CaseStatus.find((v) => v.value === row?.caseStatus)?.label
+                                  : ''
+                              }}</td
+                            >
                           </tr>
                           <tr>
                             <td class="label">借款时间</td>
@@ -287,6 +293,12 @@
                             <td class="label">垫付费用</td>
                             <td>{{ row?.credit?.disbursement }}</td>
                           </tr>
+                          <tr>
+                            <td class="label">当前逾期违约金</td>
+                            <td>{{ row?.weiyuejin }}</td>
+                            <td class="label">当前逾期罚息</td>
+                            <td>{{ row?.faxi }}</td>
+                          </tr>
                         </tbody>
                       </table>
                     </div>

src/views/property/case-manage/index.vue

@@ -400,6 +400,18 @@
         showOverflow: 'tooltip',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'repayStatus',
         title: '还款状态',

src/views/property/case-return/index.vue

@@ -417,6 +417,18 @@
         showOverflow: 'tooltip',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'cpe.username',
         title: 'CPE',

src/views/property/import/components/caseDetailModal.vue

@@ -12,8 +12,8 @@
     <vxe-button @click="exportEvent">直接导出 CSV 文件</vxe-button>
     <ProTable
       :config="config"
-      :data="data"
-      :showPagination="false"
+      :paramCallback="paramCallback"
+      :api="pengLoanExcel"
       ref="ProTableRef"
       :showToolBar="false"
     />
@@ -23,7 +23,7 @@
 
 <script setup lang="jsx">
   import { computed } from 'vue';
-  import { reactive, ref } from 'vue';
+  import { reactive, ref, nextTick } from 'vue';
   import { pengLoanExcel } from '@/api/import';
   import { useDict } from '@/hooks/useDict';
   const { PhoneResultStatus, ReduceType, FlowStatus, FollowStatus, AuditStatus, CaseStatus } =
@@ -48,6 +48,7 @@
   };
   const config = reactive({
     exportConfig: {},
+    maxHeight: 500,
     toolbarConfig: { enabled: false },
     columns: [
       {
@@ -106,6 +107,18 @@
         title: '折扣',
         width: 80,
       },
+      {
+        field: 'weiyuejin',
+        title: '当前逾期违约金',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
+      {
+        field: 'faxi',
+        title: '当前逾期罚息',
+        showOverflow: 'tooltip',
+        width: 80,
+      },
       {
         field: 'commissionAmount',
         title: '委案金额',
@@ -246,12 +259,6 @@
         showOverflow: 'tooltip',
         width: 80,
       },
-      {
-        field: 'credit.closingStatus',
-        title: '结案状态',
-        showOverflow: 'tooltip',
-        width: 80,
-      },
       {
         field: 'credit.constantNo',
         title: '合同编号',
@@ -368,22 +375,22 @@
       },
     ],
   });
-
+  const paramCallback = (param) => {
+    const obj = JSON.parse(JSON.stringify(param));
+    console.log('asdasd', obj)
+    obj['batchCode'] = currentAccount.value.code
+    return obj;
+  }
   const onHide = () => {
     currentAccount.value = null;
   };
+  const query = () => ProTableRef.value?.search();
   const openModal = (account) => {
     showModal.value = true;
     currentAccount.value = account;
-    pengLoanExcel({
-      batchCode: account.code,
-      current: 1,
-      size: 9999999,
-    }).then((res) => {
-      if (res.result) {
-        data.value = res.result.content;
-      }
-    });
+    nextTick(() => {
+      query()
+    })
   };
 
   defineExpose({

src/views/workplace/case/index.vue

@@ -421,6 +421,18 @@
           showOverflow: 'tooltip',
           width: 80,
         },
+        {
+          field: 'weiyuejin',
+          title: '当前逾期违约金',
+          showOverflow: 'tooltip',
+          width: 80,
+        },
+        {
+          field: 'faxi',
+          title: '当前逾期罚息',
+          showOverflow: 'tooltip',
+          width: 80,
+        },
         {
           field: 'commissionAmount',
           title: '委案金额',