修改

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

@@ -26,7 +26,7 @@
       </h4>
     </template>
     <div class="flex">
-      <div class="w-1/4 flex-shrink-0">
+      <div class="w-1/4 flex-shrink-0 after-border">
         <p class="font-bold mb-3">审批进程</p>
         <div :class="{ nopending: currentDetail.flowStatus !== 'pending' }">
           <el-timeline style="max-width: 600px">
@@ -155,7 +155,7 @@
               <el-form-item class="w-full" label="还款总额：" prop="code">
                 <el-input
                   v-model="form.totalRepayAmount"
-                  :disabled="currentDetail.flowStatus !== 'pending' || !authButtonListGet.includes('stages_edit_btn')"
+                  :disabled="currentDetail.flowStatus !== 'in_review' || !authButtonListGet.includes('stages_edit_btn')"
                   placeholder="请输入"
                   @change="changePeriod"
                 />
@@ -268,7 +268,7 @@
                 @click="editOrConfirm"
                 class="mr-1 my-2"
                 v-permission="'stages_edit_btn'"
-                v-if="currentDetail.flowStatus === 'pending'"
+                v-if="currentDetail.flowStatus === 'in_review'"
                 >{{ editFirst ? '确定' : '修改' }}</el-button
               >
             </div>
@@ -286,8 +286,8 @@
           type="primary"
           @click="submitForm('fail')"
           v-if="
-            currentDetail.flowStatus === 'pending' &&
-            (authButtonListGet.includes('stages_apply_btn') || authButtonListGet.includes('stages_tenant_apply_btn'))
+            (currentDetail.flowStatus === 'pending' && authButtonListGet.includes('stages_tenant_apply_btn')) ||
+            (currentDetail.flowStatus === 'in_review' && authButtonListGet.includes('stages_apply_btn'))
           "
           >不通过</el-button
         >
@@ -295,8 +295,8 @@
           type="primary"
           @click="submitForm('pass')"
           v-if="
-            currentDetail.flowStatus === 'pending' &&
-            (authButtonListGet.includes('stages_apply_btn') || authButtonListGet.includes('stages_tenant_apply_btn'))
+            (currentDetail.flowStatus === 'pending' && authButtonListGet.includes('stages_tenant_apply_btn')) ||
+            (currentDetail.flowStatus === 'in_review' && authButtonListGet.includes('stages_apply_btn'))
           "
           >通过</el-button
         >
@@ -740,16 +740,24 @@
     const params = {
       ...currentDetail.value,
       ...form,
-      repairTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-      repairUser: {
-        username: userStore.userInfo?.username,
-        id: userStore.userInfo?.id,
-      },
       images: images.length > 0 ? images : null,
       byStagesRecords: splitdata.value,
       loans: selectdList.value,
       flowStatus: type,
     };
+    if (authButtonListGet.includes('stages_tenant_apply_btn')) {
+      params['tenantTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      params['tenantUser'] = {
+        username: userStore.userInfo?.username,
+        id: userStore.userInfo?.id,
+      }
+    } else {
+      params['repairTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      params['repairUser'] = {
+        username: userStore.userInfo?.username,
+        id: userStore.userInfo?.id,
+      }
+    }
     changeAmount(params).then((res) => {
       if (res.success) {
         ElMessage.success({

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

@@ -370,7 +370,7 @@
           width: 120,
           slots: {
             default: ({ row, rowIndex }) => {
-              if (row.flowStatus === 'pending' && authButtonListGet.includes('stages_apply_btn')) {
+              if (row.flowStatus === 'pending' && authButtonListGet.includes('stages_tenant_apply_btn')) {
                 return (
                   <>
                     <ElButton type="primary" onClick={() => changeStatus(row)}>
@@ -378,7 +378,7 @@
                     </ElButton>
                   </>
                 );
-              } else if (row.flowStatus === 'in_review' && authButtonListGet.includes('stages_tenant_apply_btn')) {
+              } else if (row.flowStatus === 'in_review' && authButtonListGet.includes('stages_apply_btn')) {
                 return (
                   <>
                     <ElButton type="primary" onClick={() => changeStatus(row)}>

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

@@ -223,8 +223,8 @@
           type="primary"
           @click="submitForm('fail')"
           v-if="
-            currentDetail.flowStatus === 'pending' &&
-            (authButtonListGet.includes('reduction_apply_btn') || authButtonListGet.includes('reduction_tenant_apply_btn'))
+            (currentDetail.flowStatus === 'pending' && authButtonListGet.includes('reduction_tenant_apply_btn')) ||
+            (currentDetail.flowStatus === 'in_review' && authButtonListGet.includes('reduction_apply_btn'))
           "
           >不通过</el-button
         >
@@ -232,8 +232,8 @@
           type="primary"
           @click="submitForm('pass')"
           v-if="
-            currentDetail.flowStatus === 'pending' &&
-            (authButtonListGet.includes('reduction_apply_btn') || authButtonListGet.includes('reduction_tenant_apply_btn'))
+            (currentDetail.flowStatus === 'pending' && authButtonListGet.includes('reduction_tenant_apply_btn')) ||
+            (currentDetail.flowStatus === 'in_review' && authButtonListGet.includes('reduction_apply_btn'))
           "
           >通过</el-button
         >
@@ -567,8 +567,8 @@
         id: userStore.userInfo?.id,
       }
     } else {
-      param['repairTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
-      param['repairUser'] = {
+      params['repairTime'] = dayjs().format('YYYY-MM-DD HH:mm:ss')
+      params['repairUser'] = {
         username: userStore.userInfo?.username,
         id: userStore.userInfo?.id,
       }

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

@@ -22,10 +22,8 @@
       ref="ProTableRef"
       :api="getRepayRecordPage"
       :paramCallback="paramCallback"
-      :selectdList="selectdList"
     >
-      <template #left_buttons>
-        <!-- <el-button type="primary">下载申请 </el-button> -->
+      <!-- <template #left_buttons>
         <el-button
           type="primary"
           @click="changeStatus"
@@ -34,9 +32,7 @@
           :disabled="!selectdList || !selectdList.length"
           >审批
         </el-button>
-        <!-- <el-button type="primary">下载 </el-button>
-        <el-button type="primary">批量修复上传 </el-button> -->
-      </template>
+      </template> -->
     </ProTable>
     <vxe-modal
       resize
@@ -174,7 +170,7 @@
   const config = computed(() => {
     return {
       columns: [
-        { type: 'checkbox', width: 60, fixed: 'left' },
+        // { type: 'checkbox', width: 60, fixed: 'left' },
         {
           field: 'caseId',
           showOverflow: 'tooltip',