修改bug

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

@@ -103,7 +103,7 @@
           width: 80,
         },
         {
-          field: 'payOrg',
+          field: 'loanPlatform.name',
           title: '借款机构',
           search: { el: 'input' },
         },

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

@@ -82,6 +82,11 @@
           field: 'caseId',
           title: '案件ID',
           search: { el: 'input' },
+          slots: {
+            default: ({ row }) => {
+              return <>{row.reduceRecords.map((v) => v.loan.caseId).join(',')}</>;
+            },
+          },
           width: 80,
         },
         {

src/views/business-approval/repayment-approve/index.vue

@@ -134,9 +134,9 @@
           width: 80,
         },
         {
-          field: 'stages.loans.payOrg',
+          field: 'stages.loans.loanPlatform.name',
           title: '借款机构',
-          search: { el: 'input', key: 'stages.loans.payOrg' },
+          search: { el: 'input', key: 'payOrg' },
           width: 100,
         },
         {

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

@@ -114,7 +114,7 @@
         title: '所属区域',
         width: 80,
         fieldNames: { label: 'label', value: 'value' },
-        search: { el: 'cascader', props: { clearable: true }, labelWidth: 85 },
+        search: { el: 'cascader', props: { clearable: true, checkStrictly: true }, labelWidth: 85 },
         slots: {
           default: ({ row }) => {
             return (

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

@@ -38,9 +38,9 @@
             <td class="label">案件ID</td>
             <td>{{ currentInfo.caseId }}</td>
             <td class="label">借款平台</td>
-            <td>{{ currentInfo.payOrg }}</td>
+            <td>{{ currentInfo.loanPlatform.name }}</td>
             <td class="label">资管公司</td>
-            <td>{{ currentInfo.manageOrg }}</td>
+            <td>{{ currentInfo.manageOrg.orgName }}</td>
           </tr>
           <tr>
             <td class="label">委案金额</td>
@@ -240,6 +240,9 @@
   };
   const openModal = (info, detail, type) => {
     showModal.value = true;
+    form.realRepayAmount = ''
+    form.files = []
+    form.realRepayTime = dayjs().format('YYYY-MM-DD HH:mm:ss')
     currentInfo.value = info;
     console.log('currentInfo', currentInfo.value);
     currentDetail.value = detail;
@@ -272,14 +275,31 @@
   const submitForm = () => {
     formRef.value.validate((valid) => {
       if (valid) {
-        saveRepayRecord({
+        const param = {
           repayType: options.find((v) => v.label === currentType.value).value,
           ...form,
           borrower: currentInfo.value.borrower,
           flowStatus: 'pending',
           repayStatus: 'over',
           status: 'enable',
-        }).then((res) => {
+        }
+        if (currentType.value === '分期还款') {
+          param['stages'] = {
+            borrower: currentInfo.value.borrower,
+            totalPeriod: currentDetail.value.totalPeriod,
+            remainingAmount: currentInfo.value.remainingAmount,
+            totalRepayAmount: currentDetail.value.totalRepayAmount,
+            applyDate: currentDetail.value.applyDate,
+            firstApplyDate: currentDetail.value.firstApplyDate,
+            effectiveTime: currentDetail.value.effectiveTime,
+            loans: currentDetail.value.loans,
+            flowStatus: 'pending'
+          }
+          const item = currentDetail.value.byStagesRecords.find(v=>currentInfo.value.period === v.period)
+          item['repayStatus'] = 'over'
+          param['stages']['byStagesRecords'] = currentDetail.value.byStagesRecords
+        }
+        saveRepayRecord(param).then((res) => {
           console.log('res', res);
           if (res.success) {
             ElMessage.success({

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

@@ -101,11 +101,13 @@
           </el-form>
         </div>
         <div class="w-3/5">
-          <ProTable :config="splitconfig" :data="splitdata" :showPagination="false">
-            <template #right_tools>
-              <el-button type="primary" @click="editOrConfirm" class="mr-1">{{
-                editFirst ? '确定' : '修改'
-              }}</el-button>
+          <ProTable :config="splitconfig" :data="splitdata" :showPagination="false" :showToolBar="false">
+            <template #table_top>
+              <div class="flex justify-end">
+                <el-button type="primary" @click="editOrConfirm" class="mr-1 my-2">{{
+                  editFirst ? '确定' : '修改'
+                }}</el-button>
+              </div>
             </template>
           </ProTable>
           <div class="flex">
@@ -303,6 +305,7 @@
   const splitconfig = computed(() => {
     return {
       minHeight: 200,
+      toolbarConfig: { enabled: false },
       columns: [
         { field: 'period', width: 50, title: '期次' },
         {

src/views/system/ManageOrg/components/ManageOrgFormModal.vue

@@ -17,7 +17,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item class="w-full" label="所属区域" prop="orgName">
-            <el-cascader v-model="form.arealist" class="w-full" :options="citydata" clearable />
+            <el-cascader v-model="form.arealist" class="w-full" :checkStrictly="true" :options="citydata" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24">

src/views/system/ManageOrg/index.vue

@@ -41,7 +41,7 @@
         enum: citydata,
         title: '所属区域',
         fieldNames: { label: 'label', value: 'value' },
-        search: { el: 'cascader', props: { clearable: true } },
+        search: { el: 'cascader', props: { clearable: true, checkStrictly: true} },
         slots: {
           default: ({ row }) => {
             return (