还款申请

src/views/business-approval/audit-apply/index.vue

@@ -169,7 +169,7 @@
           search: { el: 'input', props: { clearable: true }, labelWidth: 78 },
           slots: {
             default: ({ row }) => {
-              return <>{row.loans.map((v) => v.caseId).join(',')}</>;
+              return <>{Array.from(new Set(row.loans.map((v) => v.caseId))).join(',')}</>;
             },
           },
         },

src/views/business-approval/by-stages-apply/index.vue

@@ -247,7 +247,7 @@
           search: { el: 'input', labelWidth: 80 },
           slots: {
             default: ({ row }) => {
-              return <>{row.loans.map((v) => v.caseId).join(',')}</>;
+              return <>{Array.from(new Set(row.loans.map((v) => v.caseId))).join(',')}</>;
             },
           },
           width: 80,
@@ -258,7 +258,7 @@
           title: '借款机构',
           slots: {
             default: ({ row }) => {
-              return <>{row.loans.map((v) => v.loanPlatform.name).join(',')}</>;
+              return <>{Array.from(new Set(row.loans.map((v) => v.loanPlatform.name))).join(',')}</>;
             },
           },
           search: { el: 'input', labelWidth: 80 },

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

@@ -147,7 +147,7 @@
           search: { el: 'input', props: { clearable: true }, labelWidth: 78 },
           slots: {
             default: ({ row }) => {
-              return <>{row.loans.map((v) => v.caseId).join(',')}</>;
+              return <>{Array.from(new Set(row.loans.map((v) => v.caseId))).join(',')}</>;
             },
           },
         },

src/views/property/case-detail/components/returnModal.vue

@@ -273,7 +273,7 @@
     },
   ];
   const submitForm = () => {
-    console.log('currentInfo.value', currentInfo.value)
+    console.log('currentInfo.value', currentInfo.value, currentDetail.value, tabledata.value)
     formRef.value.validate((valid) => {
       if (valid) {
         const param = {
@@ -283,10 +283,20 @@
           flowStatus: 'pending',
           repayStatus: 'over',
           status: 'enable',
+          loanPlatform: currentInfo.value?.loanPlatform?.name
         };
+        if (currentType.value === '结清减免还款') {
+          param['loanPlatform'] = currentDetail.value.loanPlatform.name
+          param['reduce'] = {
+            id: currentInfo.value.id
+          }
+        }
         if (currentType.value === '分期还款') {
+          param['borrower'] = currentDetail.value.borrower
+          param['loanPlatform'] = currentDetail.value.loans[0].loanPlatform.name
           param['stages'] = {
-            borrower: currentInfo.value.borrower,
+            id: currentDetail.value.id,
+            borrower: currentDetail.value.borrower,
             totalPeriod: currentDetail.value.totalPeriod,
             remainingAmount: currentInfo.value.remainingAmount,
             totalRepayAmount: currentDetail.value.totalRepayAmount,
@@ -301,6 +311,7 @@
           );
           item['repayStatus'] = 'over';
           param['stages']['byStagesRecords'] = currentDetail.value.byStagesRecords;
+          param['byStagesRecord'] = item
         }
         saveRepayRecord(param).then((res) => {
           console.log('res', res);

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

@@ -75,35 +75,70 @@
               >
                 <template #expand_content="{ row }">
                   <div class="expand-box">
-                    <div>User Info</div>
+                    <div>案件明细</div>
                     <div class="expand-table">
                       <table
                         ><tbody>
                           <tr>
-                            <td>
-                              <span class="label">User Name：</span>
-                              <span>{{ row?.borrower?.name }}</span>
-                            </td>
-                            <td>
-                              <span class="label">Telephone：</span>
-                              <span>{{ row?.borrower?.phone }}</span>
-                            </td>
-                            <td>
-                              <span class="label">Live：</span>
-                              <span>{{
-                                row?.borrower?.domicileCity + ',' + row?.borrower?.domicileProvince
-                              }}</span>
-                            </td>
+                            <td class="label">案件ID：</td>
+                            <td>{{ row?.caseId }}</td>
+                            <td class="label">借款机构：</td>
+                            <td>{{ row?.loanPlatform?.name }}</td>
+                            <td class="label">资管公司：</td>
+                            <td>{{ row?.manageOrg.orgName }}</td>
+                          </tr>
+                          <tr>
+                            <td class="label">身份证：</td>
+                            <td>{{ row?.borrower?.idCard }}</td>
+                            <td class="label">手机号：</td>
+                            <td>{{ row?.borrower?.phone }}</td>
+                            <td class="label">折扣：</td>
+                            <td>{{ row?.discount }}</td>
+                            <td class="label">委案金额：</td>
+                            <td>{{ row?.commissionAmount }}</td>
+                          </tr>
+                          <tr>
+                            <td class="label">累计还款金额：</td>
+                            <td>{{ row?.sumRepayAmount }}</td>
+                            <td class="label">累计减免金额：</td>
+                            <td>{{ row?.sumReductionAmount }}</td>
+                            <td class="label">剩余待还金额：</td>
+                            <td>{{ row?.remainingAmount }}</td>
                           </tr>
                           <tr>
+                            <td class="label">CPE：</td>
+                            <td>{{ row?.cpe.username }}</td>
+                            <td class="label">分派CPE日期：</td>
+                            <td>{{ row?.cpeDate }}</td>
+                            <td class="label">本金余额：</td>
+                            <td>{{ row?.principalBalance }}</td>
+                            <td class="label">案件状态：</td>
                             <td>
-                              <span class="label">Remark：</span>
-                              <span>{{ row?.remark }}</span>
-                            </td>
-                            <td colspan="2">
-                              <span class="label">Address：</span>
-                              <span>{{ row?.borrower?.address }}</span>
-                            </td>
+                              {{
+                                row?.caseStatus
+                                  ? caseStatusOpt.find((v) => v.value === row?.caseStatus).label
+                                  : ''
+                              }}</td
+                            >
+                          </tr>
+                          <tr>
+                            <td class="label">欠息额：</td>
+                            <td>{{ row?.debitInterest }}</td>
+                            <td class="label">手续费：</td>
+                            <td>{{ row?.commission }}</td>
+                            <td class="label">跟进结果：</td>
+                            <td>{{
+                              row?.followStatus
+                                ? followStatusOpt.find((v) => v.value === row?.followStatus).label
+                                : ''
+                            }}</td>
+                            <td class="label">跟进状态：</td>
+                            <td>{{
+                              row?.phoneResultStatus
+                                ? phoneResultStatusOpt.find((v) => v.value === row?.phoneResultStatus)
+                                    .label
+                                : ''
+                            }}</td>
                           </tr>
                         </tbody>
                       </table>
@@ -324,6 +359,11 @@
     { label: '已还款', value: 'Repaired' },
     { label: '代履行还款', value: 'repayment_others' },
   ];
+  const caseStatusOpt = [
+    { label: '正常', value: 'normal' },
+    { label: '撤案', value: 'withdraw' },
+    { label: '留案', value: 'stay' },
+  ];
   const returnConfig = reactive({
     columns: [
       {
@@ -357,12 +397,12 @@
         showOverflow: 'tooltip',
       },
       {
-        field: 'reduce.totalPayAmount',
+        field: 'repayAmount',
         title: '应还金额',
         showOverflow: 'tooltip',
       },
       {
-        field: 'stages.loans.loanPlatform.name',
+        field: 'loanPlatform',
         title: '借款机构',
         showOverflow: 'tooltip',
       },
@@ -692,7 +732,7 @@
         width: 80,
         slots: {
           default: ({ row }) => {
-            return <>{row.loans.map((v) => v.caseId).join(',')}</>;
+            return <>{Array.from(new Set(row.loans.map((v) => v.caseId))).join(',')}</>;
           },
         },
       },
@@ -701,7 +741,7 @@
         title: '借款机构',
         slots: {
           default: ({ row }) => {
-            return <>{row.loans.map((v) => v.loanPlatform.name).join(',')}</>;
+            return <>{Array.from(new Set(row.loans.map((v) => v.loanPlatform.name))).join(',')}</>;
           },
         },
       },
@@ -839,7 +879,7 @@
         showOverflow: 'tooltip',
         slots: {
           default: ({ row }) => {
-            return <>{row.reduceRecords.map((v) => v.loan.caseId).join(',')}</>;
+            return <>{Array.from(new Set(row.reduceRecords.map((v) => v.loan.caseId))).join(',')}</>;
           },
         },
       },
@@ -849,7 +889,7 @@
         showOverflow: 'tooltip',
         slots: {
           default: ({ row }) => {
-            return <>{row.reduceRecords.map((v) => v.reduceAmount).join(',')}</>;
+            return <>{Array.from(new Set(row.reduceRecords.map((v) => v.reduceAmount))).join(',')}</>;
           },
         },
       },
@@ -1119,21 +1159,22 @@
   }
 
   .expand-box {
-    background: #f0eaea;
+    background: #fff;
     padding: 20px;
     .expand-table {
       color: #000;
       table {
         width: 100%;
-      }
-      tr {
-        line-height: 32px;
+        margin-top: 10px;
+        border-collapse: collapse;
       }
       td {
-        border: none;
-        span.label {
-          color: rgba(0, 0, 0, 0.45);
-          font-size: 14px;
+        border: 1px solid rgba(5, 5, 5, 0.06);
+        background: #fff;
+        padding: 8px;
+        width: 240px;
+        &.label {
+          background: #f5f7f9;
         }
       }
     }