修改bug

src/components/ProTable/index.vue

@@ -220,7 +220,6 @@
     const defaultValue = column.search?.defaultValue;
     if (defaultValue !== undefined && defaultValue !== null) {
       searchParam.value[key] = defaultValue;
-      searchInitParam.value[key] = defaultValue;
     }
   });
 

src/components/SearchForm/components/SearchFormItem.vue

 <template>
   <component
     :is="column.search?.render ?? `el-${column.search?.el}`"
-    v-bind="{ ...handleSearchProps, ...placeholder, searchParam: _searchParam, clearable }"
+    v-bind="{ ...handleSearchProps, ...placeholder, searchParam: _searchParam }"
     v-model.trim="_searchParam[column.search?.key ?? handleProp(column.field)]"
     :data="column.search?.el === 'tree-select' ? columnEnum : []"
     :options="['cascader', 'select-v2'].includes(column.search?.el) ? columnEnum : []"

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

@@ -23,6 +23,7 @@
   import { getTenantPage } from '@/api/tenant';
   import { useDict } from '@/hooks/useDict';
   import { inject } from 'vue';
+  
   const { AuditStatus, FollowStatus, PhoneResultStatus, CaseStatus } = useDict(
     'AuditStatus',
     'FollowStatus',

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

@@ -30,7 +30,7 @@
         <p class="font-bold mb-3">审批进程</p>
         <div :class="{ nopending: currentDetail.flowStatus !== 'pending' }">
           <el-timeline style="max-width: 600px">
-            <el-timeline-item :timestamp="currentDetail?.applyDate" color="#234ca3">
+            <el-timeline-item :timestamp="currentDetail?.applyTime" color="#234ca3">
               <p class="font-bold text-sm">发起人</p>
               <span class="text-xs bg-gray-200 rounded-sm text-slate-900 px-2">{{
                 currentDetail?.applyUser?.username
@@ -164,7 +164,7 @@
             <el-col :span="24">
               <el-form-item class="w-full" label="分期申请时间：" prop="code">
                 <el-date-picker
-                  v-model="form.applyDate"
+                  v-model="form.applyTime"
                   disabled
                   class="w-full"
                   format="YYYY-MM-DD HH:mm:ss"
@@ -353,7 +353,7 @@
     images: [],
     totalRepayAmount: 0,
     totalPeriod: 2,
-    applyDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    applyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     firstApplyDate: dayjs().format('YYYY-MM-DD'),
     effectiveTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   });
@@ -689,7 +689,7 @@
     console.log('currentDetail', currentDetail.value, caselist);
     form.totalRepayAmount = 0;
     form.totalPeriod = detail.totalPeriod;
-    form.applyDate = detail.applyDate;
+    form.applyTime = detail.applyTime;
     form.firstApplyDate = detail.firstApplyDate;
     form.effectiveTime = detail.effectiveTime;
     mypictureRef.value?.clearFiles();

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

@@ -271,7 +271,7 @@
           width: 80,
         },
         {
-          field: 'applyDate',
+          field: 'applyTime',
           title: '分期申请时间',
           showOverflow: 'tooltip',
           search: {

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

@@ -113,7 +113,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item class="w-full" label="减免截止时间：" prop="code">
-                <el-date-picker v-model="form.applyDate" type="datetime" disabled format="YYYY-MM-DD HH:mm:ss"
+                <el-date-picker v-model="form.inEffectDate" type="datetime" disabled format="YYYY-MM-DD HH:mm:ss"
                   value-format="YYYY-MM-DD HH:mm:ss"/>
               </el-form-item>
             </el-col>
@@ -292,7 +292,7 @@
     reduceType: 'settle',
     commissionAmount: 0,
     remainingAmount: 0,
-    applyDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    inEffectDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
   });
   const props = defineProps({
     mergerCase: String,
@@ -515,7 +515,7 @@
     form.remark = detail.remark;
     form.reason = detail.reason;
     form.remainingAmount = Decimal(detail.remainingAmount).sub(Decimal(detail.totalReduceAmount));
-    form.applyDate = detail.applyDate;
+    form.inEffectDate = detail.inEffectDate;
     const list = [];
     form['commissionAmount'] = 0;
     form.images = detail.images

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

@@ -302,7 +302,7 @@
           },
         },
         {
-          field: 'applyDate',
+          field: 'inEffectDate',
           title: '减免截止时间',
           showOverflow: 'tooltip',
           width: 120,
@@ -312,17 +312,6 @@
             props: { type: 'datetime', valueFormat: 'YYYY-MM-DD HH:mm:ss' },
           },
         },
-        {
-          field: 'inEffectDate',
-          title: '减免生效时间',
-          width: 120,
-          showOverflow: 'tooltip',
-          search: {
-            el: 'date-picker',
-            labelWidth: 90,
-            props: { type: 'datetime', valueFormat: 'YYYY-MM-DD HH:mm:ss' },
-          },
-        },
         {
           field: 'code',
           title: '操作',

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

@@ -330,7 +330,7 @@
           field: 'code',
           title: '操作',
           visible:
-            activeName.value === 'pending' && authButtonListGet.includes('repair_apply_btn')
+            ((activeName.value === 'pending' && authButtonListGet.includes('repayment_tenant_apply_btn')) || (activeName.value === 'in_review' && authButtonListGet.includes('repayment_apply_btn')))
               ? true
               : false,
           slots: {

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

@@ -56,6 +56,8 @@
   import { useUserStore } from '@/stores/modules/user';
   import { getTenantPage } from '@/api/tenant';
   import { useDict } from '@/hooks/useDict';
+  import { watch } from 'vue';
+
   const { PhoneResultStatus, ReduceType, FlowStatus, FollowStatus, AuditStatus, CaseStatus } =
     useDict(
       'PhoneResultStatus',
@@ -81,8 +83,15 @@
   const onCheckboxChange = (row) => {
     selectdList.value = row.records;
   };
-
+  
   const activeName = ref('un_audit');
+  watch(
+    () => AuditStatus.value,
+    (newValue, oldValue) => {
+      activeName.value = AuditStatus.value[0].value
+      query()
+    }
+  );
   const callMode = ref('');
   const paramCallback = (param) => {
     const obj = JSON.parse(JSON.stringify(param));
@@ -189,7 +198,7 @@
           width: 60,
           slots: {
             default: ({ row }) => {
-              return <>{Array.from(new Set(row.loans.map((v) => v?.cpe?.username))).join(',')}</>;
+              return <>{row?.cpe?.username}</>;
             },
           },
           search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 105 },
@@ -198,7 +207,7 @@
           showOverflow: 'tooltip',
           slots: {
             default: ({ row }) => {
-              return <>{Array.from(new Set(row.loans.map((v) => v?.tenant?.name))).join(',')}</>;
+              return <>{row?.tenant?.name}</>;
             },
           },
           enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),

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

@@ -30,7 +30,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item class="w-full" label="减免截止时间：" prop="code">
-              <el-date-picker v-model="form.applyDate" type="datetime" format="YYYY-MM-DD HH:mm:ss"
+              <el-date-picker v-model="form.inEffectDate" type="datetime" format="YYYY-MM-DD HH:mm:ss"
                   value-format="YYYY-MM-DD HH:mm:ss"/>
             </el-form-item>
           </el-col>
@@ -188,7 +188,7 @@
     remark: '',
     remainingAmount: 0,
     commissionAmount: 0,
-    applyDate: null,
+    inEffectDate: null,
   });
   const props = defineProps({
     mergerCase: String,

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

@@ -16,15 +16,13 @@
             <td class="label">减免申请ID</td>
             <td>{{ currentInfo.id }}</td>
             <td class="label">减免截止时间</td>
-            <td>{{ currentInfo.applyDate }}</td>
+            <td>{{ currentInfo.inEffectDate }}</td>
             <td class="label">减免金额(总计)</td>
             <td>{{ currentInfo.totalReduceAmount }}</td>
           </tr>
           <tr>
             <td class="label">减免案件数</td>
             <td>{{ currentInfo.totalNumber }}</td>
-            <td class="label">减免生效时间</td>
-            <td>{{ currentInfo.inEffectDate }}</td>
             <td class="label">应还金额</td>
             <td colspan="5">{{
               Decimal(currentInfo.remainingAmount).sub(currentInfo.totalReduceAmount)
@@ -111,7 +109,7 @@
             <td class="label">还款总额</td>
             <td>{{ currentDetail.totalRepayAmount }}</td>
             <td class="label">分期申请时间</td>
-            <td>{{ currentDetail.applyDate }}</td>
+            <td>{{ currentDetail.applyTime }}</td>
           </tr>
           <tr>
             <td class="label">还款期数</td>

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

@@ -54,7 +54,7 @@
               <el-col :span="24">
                 <el-form-item class="w-full" label="分期申请时间：" prop="code">
                   <el-date-picker
-                    v-model="form.applyDate"
+                    v-model="form.applyTime"
                     class="w-full"
                     format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD HH:mm:ss"
@@ -210,7 +210,7 @@
     images: [],
     totalRepayAmount: 0,
     totalPeriod: 2,
-    applyDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+    applyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
     firstApplyDate: dayjs().format('YYYY-MM-DD'),
   });
   const props = defineProps({
@@ -572,7 +572,6 @@
     const params = {
       ...currentDetail.value,
       ...form,
-      applyTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       applyUser: {
         username: userStore.userInfo?.username,
         id: userStore.userInfo?.id,

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

@@ -921,6 +921,12 @@
     toolbarConfig: { enabled: false },
   });
   const returnCrash = (row, type) => {
+    if (!recordData.value || recordData.value.length === 0) {
+      return ElMessage.warning({
+        message: '要先跟进后才可以还款',
+        plain: true,
+      });
+    }
     if (type === '分期还款') {
       const current = splitRef.value.element.getCurrentRecord();
       console.log('current', current);
@@ -1090,7 +1096,7 @@
         width: 70,
       },
       {
-        field: 'applyDate',
+        field: 'applyTime',
         title: '分期申请时间',
         showOverflow: 'tooltip',
         width: 100,
@@ -1309,7 +1315,7 @@
         title: '减免申请ID',
       },
       {
-        field: 'applyDate',
+        field: 'inEffectDate',
         showOverflow: 'tooltip',
         title: '减免截止时间',
       },

src/views/workplace/audit/index.vue

@@ -55,6 +55,7 @@
   import { batchSave } from '@/api/audit';
   import { useUserStore } from '@/stores/modules/user';
   import { getTenantPage } from '@/api/tenant';
+  import { watch } from 'vue';
   import { useDict } from '@/hooks/useDict';
   const { PhoneResultStatus, ReduceType, FlowStatus, FollowStatus, AuditStatus, CaseStatus } =
     useDict(
@@ -83,12 +84,19 @@
   };
 
   const activeName = ref('un_audit');
+  watch(
+    () => AuditStatus.value,
+    (newValue, oldValue) => {
+      activeName.value = AuditStatus.value[0].value
+      query()
+    }
+  );
   const callMode = ref('');
   const paramCallback = (param) => {
     const obj = JSON.parse(JSON.stringify(param));
-    if (userInfo.id) {
-      obj['createBy'] = userInfo.id;
-    }
+    // if (userInfo.id) {
+    //   obj['createBy'] = userInfo.id;
+    // }
     obj['auditStatus'] = activeName.value;
     if (obj['trackTime']) {
       if (obj['trackTime'][0]) obj['trackTimeBegin'] = obj['trackTime'][0];
@@ -189,7 +197,7 @@
           width: 60,
           slots: {
             default: ({ row }) => {
-              return <>{Array.from(new Set(row.loans.map((v) => v?.cpe?.username))).join(',')}</>;
+              return <>{row?.cpe?.username}</>;
             },
           },
           search: { el: 'input', props: { clearable: true }, key: 'cpeName', labelWidth: 105 },
@@ -198,7 +206,7 @@
           showOverflow: 'tooltip',
           slots: {
             default: ({ row }) => {
-              return <>{Array.from(new Set(row.loans.map((v) => v?.tenant?.name))).join(',')}</>;
+              return <>{row?.tenant?.name}</>;
             },
           },
           enum: () => getTenantPage({ current: 1, size: 999999999, status: 'enable' }),

src/views/workplace/todo/index.vue

@@ -43,7 +43,7 @@
   const socketStore = useSocketStore();
   const router = useRouter();
   const showContent = (row) => {
-    showMessage({ id: row.id }).then((res) => {
+    showMessage({ id: row.message.id }).then((res) => {
       if (res.success) {
         currentRow.value = res.result;
         showModal.value = true;