修复bug

src/views/business-approval/audit-apply/components/callDrawer.vue

@@ -440,12 +440,6 @@
           },
         },
       },
-      {
-        field: 'product',
-        width: 120,
-        showOverflow: 'tooltip',
-        title: '产品',
-      },
       {
         field: 'loanPlatform.name',
         showOverflow: 'tooltip',

src/views/business-approval/by-stages-apply/components/splitDrawer.vue

@@ -46,7 +46,7 @@
                 <td>{{ currentDetail?.borrower?.idCard }}</td>
               </tr>
               <tr>
-                <td class="label">产品</td>
+                <td class="label">借款平台</td>
                 <td>
                   <VxeTooltip
                   :content="Array.from(new Set(currentDetail?.loans.map((v) => v.loanPlatform.name))).join(',')"
@@ -529,12 +529,6 @@
           },
         },
       },
-      {
-        field: 'product',
-        title: '产品',
-        width: 120,
-        showOverflow: 'tooltip',
-      },
       {
         field: 'loanPlatform.name',
         title: '借款平台',

src/views/business-approval/reduction-apply/components/reduceDrawer.vue

@@ -58,7 +58,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item class="w-full" label="产品：" prop="name" label-width="120px">
+              <el-form-item class="w-full" label="借款平台：" prop="name" label-width="120px">
                 {{Array.from(new Set(currentDetail?.reduceRecords.map((v) => v?.loan?.loanPlatform.name))).join(',')}}
               </el-form-item>
             </el-col>
@@ -359,12 +359,6 @@
           },
         },
       },
-      {
-        field: 'loan.product',
-        width: 100,
-        showOverflow: 'tooltip',
-        title: '产品',
-      },
       {
         field: 'loan.loanPlatform.name',
         showOverflow: 'tooltip',

src/views/property/audit-manage/components/callDrawer.vue

@@ -440,12 +440,6 @@
           },
         },
       },
-      {
-        field: 'product',
-        width: 120,
-        showOverflow: 'tooltip',
-        title: '产品',
-      },
       {
         field: 'loanPlatform.name',
         width: 120,

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

@@ -399,9 +399,9 @@
   const config = reactive({
     minHeight: 200,
     checkboxConfig: {
-      // checkMethod: ({ row }) => {
-      //   return props.mergerCase !== 'Y';
-      // },
+      checkMethod: ({ row }) => {
+        return row.repayStatus !== 'over';
+      },
     },
     columns: [
       { type: 'checkbox', width: 60, fixed: 'left' },
@@ -425,24 +425,18 @@
         },
         showOverflow: 'tooltip',
       },
-      {
-        field: 'mergerCase',
-        title: '是否共案处理',
-        visible: authButtonListGet.includes('allcation_for_tenant'),
-        showOverflow: 'tooltip',
-        width: 120,
-        slots: {
-          default: ({ row }) => {
-            return <ElTag>{row.mergerCase == 'Y' ? '是' : '否'}</ElTag>;
-          },
-        },
-      },
-      {
-        field: 'product',
-        title: '产品',
-        width: 120,
-        showOverflow: 'tooltip',
-      },
+      // {
+      //   field: 'mergerCase',
+      //   title: '是否共案处理',
+      //   visible: authButtonListGet.includes('allcation_for_tenant'),
+      //   showOverflow: 'tooltip',
+      //   width: 120,
+      //   slots: {
+      //     default: ({ row }) => {
+      //       return <ElTag>{row.mergerCase == 'Y' ? '是' : '否'}</ElTag>;
+      //     },
+      //   },
+      // },
       {
         field: 'loanPlatform.name',
         title: '借款平台',
@@ -482,7 +476,6 @@
     showModal.value = true;
     currentInfo.value = info;
     currentDetail.value = detail;
-    console.log('currentInfo', currentInfo.value, currentDetail.value);
     form.sum = 0;
     form.phoneResultStatus = 'later';
     form.remark = '';
@@ -499,10 +492,11 @@
     resuleObj.label = '本人可联';
     resuleObj.childrenlabel = null;
     tabledata.value = caselist;
+    const a = caselist.filter((v) => v.repayStatus !== 'over');
     setTimeout(() => {
       if (ProTableRef.value.element) {
-        ProTableRef.value.element.setAllCheckboxRow(true);
-        selectdList.value = caselist;
+        ProTableRef.value.element.setCheckboxRow(a, true);
+        selectdList.value = a;
       }
     }, 500);
   };

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

@@ -269,9 +269,9 @@
   };
   const config = reactive({
     checkboxConfig: {
-      // checkMethod: ({ row }) => {
-      //   return props.mergerCase !== 'Y';
-      // },
+      checkMethod: ({ row }) => {
+        return row.loan.repayStatus !== 'over';
+      },
     },
     minHeight: 200,
     columns: [
@@ -308,12 +308,6 @@
           },
         },
       },
-      {
-        field: 'loan.product',
-        width: 100,
-        showOverflow: 'tooltip',
-        title: '产品',
-      },
       {
         field: 'loan.loanPlatform.name',
         showOverflow: 'tooltip',
@@ -386,7 +380,6 @@
   const openModal = (detail, caselist) => {
     showModal.value = true;
     currentDetail.value = detail;
-    console.log('currentDetail', currentDetail.value, caselist);
     form.totalReduceAmount = 0;
     form.commissionAmount = 0;
     form.remark = ''
@@ -395,21 +388,26 @@
     const list = [];
     form.images = [];
     mypictureRef.value?.clearFiles()
+    const a = [];
     caselist.forEach((item) => {
       const payAmount = Number(item.remainingAmount) || 0;
-      list.push({ reduceAmount: Number(item.reduceAmount) || 0, payAmount: payAmount, loan: item });
-      form.totalReduceAmount = Decimal(form.totalReduceAmount).add(
-        Decimal(Number(item.reduceAmount) || 0)
-      );
-      form['commissionAmount'] = Decimal(form['commissionAmount']).add(Decimal(item.commissionAmount))
-      form.remainingAmount = Decimal(form.remainingAmount).add(Decimal(payAmount));
+      const listitem = { reduceAmount: Number(item.reduceAmount) || 0, payAmount: payAmount, loan: item }
+      list.push(listitem);
+      if (item.repayStatus !== 'over') {
+        form.totalReduceAmount = Decimal(form.totalReduceAmount).add(
+          Decimal(Number(item.reduceAmount) || 0)
+        );
+        a.push(listitem)
+        form['commissionAmount'] = Decimal(form['commissionAmount']).add(Decimal(item.commissionAmount))
+        form.remainingAmount = Decimal(form.remainingAmount).add(Decimal(payAmount));
+      }
     });
     tabledata.value = list;
-    form.totalNumber = caselist.length;
+    form.totalNumber = a.length;
     setTimeout(() => {
       if (ProTableRef.value.element) {
-        ProTableRef.value.element.setAllCheckboxRow(true);
-        selectdList.value = list;
+        ProTableRef.value.element.setCheckboxRow(a, true);
+        selectdList.value = a;
       }
     }, 500);
   };

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

@@ -378,9 +378,9 @@
   };
   const config = reactive({
     checkboxConfig: {
-      // checkMethod: ({ row }) => {
-      //   return props.mergerCase !== 'Y';
-      // },
+      checkMethod: ({ row }) => {
+        return row.repayStatus !== 'over';
+      },
     },
     minHeight: 200,
     columns: [
@@ -429,12 +429,6 @@
           },
         },
       },
-      {
-        field: 'product',
-        title: '产品',
-        width: 120,
-        showOverflow: 'tooltip',
-      },
       {
         field: 'loanPlatform.name',
         title: '借款平台',
@@ -527,23 +521,25 @@
     showModal.value = true;
     editFirst.value = false;
     currentDetail.value = detail;
-    console.log('currentDetail', currentDetail.value, caselist);
     form.totalRepayAmount = 0;
     form.images = [];
     mypictureRef.value?.clearFiles()
     form.remainingAmount = 0;
+    const a = caselist.filter((v) => v.repayStatus !== 'over');
     caselist.forEach((item) => {
-      const remainingAmount = Decimal(Number(item.remainingAmount) || 0).sub(
-        Decimal(Number(item.sumReductionAmount) || 0)
-      );
-      form.totalRepayAmount = Decimal(form.totalRepayAmount).add(Decimal(remainingAmount));
-      form.remainingAmount = Decimal(form.remainingAmount).add(Decimal(remainingAmount));
+      if (item.repayStatus !== 'over') {
+        const remainingAmount = Decimal(Number(item.remainingAmount) || 0).sub(
+          Decimal(Number(item.sumReductionAmount) || 0)
+        );
+        form.totalRepayAmount = Decimal(form.totalRepayAmount).add(Decimal(remainingAmount));
+        form.remainingAmount = Decimal(form.remainingAmount).add(Decimal(remainingAmount));
+      }
     });
     tabledata.value = caselist;
     setTimeout(() => {
       if (ProTableRef.value.element) {
-        ProTableRef.value.element.setAllCheckboxRow(true);
-        selectdList.value = caselist;
+        ProTableRef.value.element.setCheckboxRow(a, true);
+        selectdList.value = a;
         // 获取最大分期数
         if (selectdList.value.length > 0) {
           getPlatforms(selectdList.value[0].loanPlatform.id);
@@ -565,12 +561,6 @@
         message: '分期金额要大于借款平台的分期最低金额',
         plain: true,
       });
-    const arr1 = selectdList.value.filter((v) => v.repayStatus === 'over');
-    if (arr1.length > 0)
-      return ElMessage.warning({
-        message: '不可以勾选结案的案件',
-        plain: true,
-      });
     
     let images = form.images.map((v) => v.url)
     images = images.map((v) => {

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

@@ -953,11 +953,6 @@
         title: '案件ID',
         showOverflow: 'tooltip',
       },
-      {
-        field: 'product',
-        title: '产品',
-        showOverflow: 'tooltip',
-      },
       {
         field: 'loanPlatform.name',
         title: '借款平台',

src/views/workplace/audit/components/callDrawer.vue

@@ -448,12 +448,6 @@
           },
         },
       },
-      {
-        field: 'product',
-        width: 120,
-        showOverflow: 'tooltip',
-        title: '产品',
-      },
       {
         field: 'loanPlatform.name',
         showOverflow: 'tooltip',