修改案件分配和案件回收和案件撤案的bug

src/styles/element.scss

@@ -279,6 +279,13 @@
 .vxe-table--render-default.size--small .vxe-body--column:not(.col--ellipsis) {
   padding: 0 !important;
 }
+/*vxe-table 自定义行高 */
+.vxe-table .vxe-body--column.col--ellipsis {
+	height: 34px;
+}
+.vxe-table .vxe-body--column:not(.col--ellipsis), .vxe-table .vxe-footer--column:not(.col--ellipsis), .vxe-table .vxe-header--column:not(.col--ellipsis) {
+    height: 34px;
+}
 .el-button {
   padding: 0px 10px !important;
   font-size: 13px !important;

src/views/property/case-allocation/components/allocationModal.vue

@@ -276,6 +276,7 @@
     getTree();
     step.value = 0;
     radio.value = 0
+    radio.value === 0 && getStatisis(param);
     SaveBol.value = false;
     currentTenant.value = null;
     editRowIndex.value = -1;
@@ -349,15 +350,19 @@
       
     } else if (radio.value === 0) {
       // chooseIdea('BORROWER');
-      distributeLoan(currentTenant.value, {
-        borrowerName: pageParams.value.borrowerName,
-        batchCode: pageParams.value.batchCode,
-        borrowerIdCard: pageParams.value.idCard,
-        borrowerPhone: pageParams.value.borrowerPhone,
-        commissionAmount: pageParams.value.commissionAmount,
-        remainingAmount: pageParams.value.remainingAmount,
-        tenantId: null,
-      }).then((res) => {
+      const param = {}
+      if (lonsArr.value && lonsArr.value.length) {
+        param['loanIds'] = lonsArr.value.map(v => v.id)
+      } else {
+        param['borrowerName'] = pageParams.value.borrowerName
+        param['batchCode'] = pageParams.value.batchCode
+        param['borrowerIdCard'] = pageParams.value.idCard
+        param['borrowerPhone'] = pageParams.value.borrowerPhone
+        param['commissionAmount'] = pageParams.value.commissionAmount
+        param['remainingAmount'] = pageParams.value.remainingAmount
+        param['tenantId'] = null
+      }
+      distributeLoan(currentTenant.value, param).then((res) => {
         if (res.success) {
           ElMessage.success({
             message: '分派成功',

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

@@ -196,7 +196,7 @@
         width: 80,
       },
       {
-        field: 'cpe.name',
+        field: 'cpe.username',
         title: 'CPE',
         showOverflow: 'tooltip',
         width: 60,

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

@@ -61,7 +61,7 @@
     let param = {
     }
     if (ids.length > 0) {
-      param['ids'] = ids
+      param['loanIds'] = ids
     } else {
       param = {...curParam.value}
     }
@@ -203,7 +203,7 @@
         width: 80,
       },
       {
-        field: 'cpe.name',
+        field: 'cpe.username',
         title: 'CPE',
         showOverflow: 'tooltip',
         width: 60,

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

@@ -244,6 +244,9 @@
   const dialogImageUrl = ref('');
   const dialogVisible = ref(false);
   const emits = defineEmits(['success']);
+  const props = defineProps({
+    mergerCase: String,
+  });
   const tabObj = [
     {
       label: '本人可联',
@@ -408,6 +411,11 @@
   };
   const config = reactive({
     minHeight: 200,
+    checkboxConfig: {
+      checkMethod: ({ row }) => {
+        return props.mergerCase !== 'Y'
+      }
+    },
     columns: [
       { type: 'checkbox', width: 50 },
       {

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

@@ -103,6 +103,9 @@
     remainingAmount: 0,
     applyDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   });
+  const props = defineProps({
+    mergerCase: String,
+  });
   const selectdList = ref([]);
   const onCheckboxChange = (row) => {
     selectdList.value = row.records;
@@ -153,6 +156,11 @@
     },
   ];
   const config = reactive({
+    checkboxConfig: {
+      checkMethod: ({ row }) => {
+        return props.mergerCase !== 'Y'
+      }
+    },
     minHeight: 200,
     columns: [
       { type: 'checkbox', title: '', width: '40px' },

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

@@ -211,6 +211,9 @@
     files: [],
     realRepayTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   });
+  const props = defineProps({
+    mergerCase: String,
+  });
   const radio = ref(0);
   const validaterealRepayAmount = (rule, value, callback) => {
     if (

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

@@ -159,6 +159,9 @@
     firstApplyDate: dayjs().format('YYYY-MM-DD'),
     effectiveTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   });
+  const props = defineProps({
+    mergerCase: String,
+  });
   const minAmount = ref(0);
   const currentDetail = ref({});
   const onHide = (done) => {
@@ -349,6 +352,11 @@
     changePeriod();
   };
   const config = reactive({
+    checkboxConfig: {
+      checkMethod: ({ row }) => {
+        return props.mergerCase !== 'Y'
+      }
+    },
     minHeight: 200,
     columns: [
       { type: 'checkbox', width: 50 },

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

@@ -268,10 +268,10 @@
       </vxe-tabs>
     </div>
     <repairModal ref="repairModalRef"></repairModal>
-    <returnModal ref="returnModalRef" @success="query('还款')"></returnModal>
-    <reduceDrawer ref="reduceDrawerRef" @success="query('减免')"></reduceDrawer>
-    <splitDrawer ref="splitDrawerRef" @success="query('分期')"></splitDrawer>
-    <callDrawer ref="callDrawerRef" @success="query('跟进')"></callDrawer>
+    <returnModal ref="returnModalRef" @success="query('还款')" :mergerCase="detail?.manageOrg?.mergerCase"></returnModal>
+    <reduceDrawer ref="reduceDrawerRef" @success="query('减免')" :mergerCase="detail?.manageOrg?.mergerCase"></reduceDrawer>
+    <splitDrawer ref="splitDrawerRef" @success="query('分期')" :mergerCase="detail?.manageOrg?.mergerCase"></splitDrawer>
+    <callDrawer ref="callDrawerRef" @success="query('跟进')" :mergerCase="detail?.manageOrg?.mergerCase"></callDrawer>
     <el-image-viewer :url-list="srcList" v-if="RefImage" @close="RefImage = false" />
   </div>
 </template>

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

@@ -62,7 +62,7 @@
     let param = {
     }
     if (ids.length > 0) {
-      param['ids'] = ids
+      param['loanIds'] = ids
     } else {
       param = {...curParam.value}
     }
@@ -204,7 +204,7 @@
         width: 80,
       },
       {
-        field: 'cpe.name',
+        field: 'cpe.username',
         title: 'CPE',
         showOverflow: 'tooltip',
         width: 60,

src/views/property/import/index.vue

@@ -54,9 +54,9 @@
             <el-form-item class="w-full" label="导入编号：" prop="code">
               <el-input v-model="form.code" placeholder="请输入" style="width: 100%" />
             </el-form-item>
-            <el-form-item class="w-full" label="委案合同：" prop="contractNo">
+            <!-- <el-form-item class="w-full" label="委案合同：" prop="contractNo">
               <el-input v-model="form.contractNo" placeholder="请输入" style="width: 100%" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item class="w-full" label="折扣：" prop="discount">
               <el-input v-model="form.discount" placeholder="请输入" style="width: 100%" />
             </el-form-item>
@@ -140,12 +140,12 @@
         showOverflow: 'tooltip',
         search: { el: 'input', props: { clearable: true } },
       },
-      {
-        field: 'contractNo',
-        title: '委案合同',
-        showOverflow: 'tooltip',
-        search: { el: 'input', props: { clearable: true } },
-      },
+      // {
+      //   field: 'contractNo',
+      //   title: '委案合同',
+      //   showOverflow: 'tooltip',
+      //   search: { el: 'input', props: { clearable: true } },
+      // },
       {
         field: 'code',
         title: '资产类型',