From e5ff0cf593c89d8c96c939bf9557fe3785d268cb Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 2 Jul 2024 11:11:00 +0800
Subject: [PATCH] fix

---
 src/api/api.js                                 |  2 +-
 src/api/http.js                                | 18 +++++++++++++++---
 src/pages/counter/list/index.vue               |  7 ++-----
 .../manage/list/corporateLoans/application.vue |  2 +-
 .../apply/loanApplication/step2.vue            |  3 ++-
 .../manage/list/corporateLoans/detail.vue      |  7 ++++---
 src/pages/manage/list/corporateLoans/loan.vue  |  2 +-
 .../manage/list/corporateLoans/management.vue  |  4 ++--
 .../manage/list/corporateLoans/repayment.vue   |  8 +++++---
 src/pages/manage/list/personalLoans/list.vue   |  3 +++
 10 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 173cc9d..3ff150e 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -38,7 +38,7 @@ service.interceptors.response.use(
         setTimeout(() => {
           store.commit('user/logout')
           logouted = 0
-        }, 6500)
+        }, 1500)
         logouted = 1
       }
     } else {
diff --git a/src/api/http.js b/src/api/http.js
index e9431ee..c0f6eb5 100644
--- a/src/api/http.js
+++ b/src/api/http.js
@@ -16,13 +16,25 @@ export const getQueryCache = () => {
   return get('/bank/bank/queryCache')
 }
 export const addOperation = (params) => {
-  return post('/bank/bank/addOperation', params)
+  return post('/bank/bank/addOperation', {
+    ...params,
+    assessmentId: sessionStorage.getItem('assessmentId') || '',
+    competitionId: sessionStorage.getItem('competitionId') || '',
+  })
 }
 export const getOperation = (params) => {
-  return get('/bank/bank/getOperation', params)
+  return post('/bank/bank/getOperation', {
+    ...params,
+    assessmentId: sessionStorage.getItem('assessmentId') || '',
+    competitionId: sessionStorage.getItem('competitionId') || '',
+  })
 }
 export const deleteCache = () => {
-  return get('/bank/bank/deleteCache')
+  return post('/bank/bank/deleteCache', {
+    projectId: sessionStorage.getItem('projectId') || '',
+    assessmentId: sessionStorage.getItem('assessmentId') || '',
+    competitionId: sessionStorage.getItem('competitionId') || '',
+  })
 }
 export const exportBankExperimentReport = (params) => {
   return post('/occupationlab/occupationlab/achievement/exportBankExperimentReport', params)
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index 0aa21fc..30ee161 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -157,7 +157,6 @@
 
     <!-- 物品栏 -->
     <div ref="goods" class="goods-dia" :class="{ active: showGoods }">
-      <!-- goodsShelfTotalData goods2 -->
       <div :id="item.name" v-for="(item) in goodsShelfTotalData" :key="item.id" class=" justify-center img-wrap"
         :class="{ checked: checkList.includes(item.id), file: true }" @click="goodsDblClickFn(item)">
         <!-- <img :style="item.name==='开户申请书'?'margin-top:10px;':''" :src="item.src" alt="" /> -->
@@ -976,7 +975,6 @@ export default {
                     }
                     for (let i = 0; i < this.popArr.length; i++) {
                       if (this.popArr[i].name === getIt) {
-                        console.log('wokaio')
                         // this.$store.commit('system/changeGoods',{push:[this.popArr[i]]})
                         return
                       }
@@ -2511,9 +2509,6 @@ export default {
   }
 
   .goods-dia {
-    display: flex;
-    justify-content: center;
-    align-items: center;
     width: 100%;
     white-space: nowrap;
     overflow-x: auto;
@@ -2528,6 +2523,7 @@ export default {
 
     .file {
       position: relative;
+      display: inline-flex;
       min-width: 140px;
       height: 140px;
       text-align: center;
@@ -2590,6 +2586,7 @@ export default {
       height: 18vh;
       width: 100%;
 
+
       .justify-center {
         //max-height: 13vh;
       }
diff --git a/src/pages/manage/list/corporateLoans/application.vue b/src/pages/manage/list/corporateLoans/application.vue
index b7765ae..5dcbead 100644
--- a/src/pages/manage/list/corporateLoans/application.vue
+++ b/src/pages/manage/list/corporateLoans/application.vue
@@ -18,7 +18,7 @@
       <el-table-column prop="loanApplicationAmount" label="申请金额(万)" align="center" />
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
-          <el-button :disabled="scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
+          <el-button :disabled="!!scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
index 4be2692..6190860 100644
--- a/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
+++ b/src/pages/manage/list/corporateLoans/apply/loanApplication/step2.vue
@@ -42,7 +42,7 @@
           <el-form-item label="合同编号" prop="contractNo">
             <el-input v-model="form.contractNo" disabled />
           </el-form-item>
-          <el-form-item label="授信年限">
+          <el-form-item label="授信期限">
             <el-select v-model="form.creditTermTwo" placeholder="请选择">
               <el-option v-for="(item, i) in Util.creditTerms" :key="i" :label="item.name" :value="item.id"></el-option>
             </el-select>
@@ -118,6 +118,7 @@ export default {
         this.form.loanAmount = data.loanApplicationAmount
         this.form.repaymentMethodTwo = +data.repaymentMethodOne
         this.form.creditTermTwo = +data.creditTermOne
+        this.form.creditAmount = data.creditAmount
       }
     },
     // 到期日期计算
diff --git a/src/pages/manage/list/corporateLoans/detail.vue b/src/pages/manage/list/corporateLoans/detail.vue
index 700fc56..f854683 100644
--- a/src/pages/manage/list/corporateLoans/detail.vue
+++ b/src/pages/manage/list/corporateLoans/detail.vue
@@ -121,11 +121,11 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="合同编号" prop="contractNo">
-            <el-input v-model="bankLoanApplication.contractNo" disabled />
+            <el-input v-model="bankLoanApplication.contractNumber" disabled />
           </el-form-item>
           <el-form-item label="授信期限">
-            <el-select v-model="bankLoanApplication.creditTerm" placeholder="请选择">
-              <el-option label="3年" :value="3"></el-option>
+            <el-select v-model="bankLoanApplication.creditTermTwo" placeholder="请选择">
+              <el-option v-for="(item, i) in Util.creditTerms" :key="i" :label="item.name" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="贷款期限" prop="loanTerm">
@@ -232,6 +232,7 @@ export default {
         if (app.guaranteeMethod) app.guaranteeMethod = +app.guaranteeMethod
         if (app.loanTerm) app.loanTerm = +app.loanTerm
         if (app.creditTermOne) app.creditTermOne = +app.creditTermOne
+        if (app.creditTermTwo) app.creditTermTwo = +app.creditTermTwo
 
         this.bankLoanApplication = app
       }
diff --git a/src/pages/manage/list/corporateLoans/loan.vue b/src/pages/manage/list/corporateLoans/loan.vue
index f99b528..88de137 100644
--- a/src/pages/manage/list/corporateLoans/loan.vue
+++ b/src/pages/manage/list/corporateLoans/loan.vue
@@ -18,7 +18,7 @@
       </el-table-column>
       <el-table-column label="操作" align="center" width="150">
         <template slot-scope="scope">
-          <el-button :disabled="scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
+          <el-button :disabled="!!scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/pages/manage/list/corporateLoans/management.vue b/src/pages/manage/list/corporateLoans/management.vue
index 8ea74ca..9b1ee77 100644
--- a/src/pages/manage/list/corporateLoans/management.vue
+++ b/src/pages/manage/list/corporateLoans/management.vue
@@ -47,10 +47,10 @@
                   <p class="text">{{ curRow.customerName }}</p>
                 </el-form-item>
                 <el-form-item label="欠款金额">
-                  <p class="text">{{ curRow.customerName }}</p>
+                  <p class="text">{{ curRow.arrearsAmount || 0 }}</p>
                 </el-form-item>
                 <el-form-item v-if="curType === 4" label="催收金额">
-                  <p class="text">{{ curRow.customerName }}</p>
+                  <p class="text">{{ curRow.arrearsAmount || 0 }}</p>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
diff --git a/src/pages/manage/list/corporateLoans/repayment.vue b/src/pages/manage/list/corporateLoans/repayment.vue
index 3550e9f..c8f4e92 100644
--- a/src/pages/manage/list/corporateLoans/repayment.vue
+++ b/src/pages/manage/list/corporateLoans/repayment.vue
@@ -11,11 +11,11 @@
       <el-table-column prop="customerName" label="客户姓名" align="center" />
       <el-table-column prop="applicationNumber" label="贷款编号" align="center" />
       <el-table-column prop="totalRepaymentAmount" label="累计还款金额(万)" align="center" />
-      <el-table-column prop="applicationNumber" label="欠款金额(万)" align="center" />
+      <el-table-column prop="arrearsAmount" label="欠款金额(万)" align="center" />
       <el-table-column label="操作" align="center" width="240">
         <template slot-scope="scope">
-          <el-button :disabled="scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
-          <template v-if="!scope.row.builtIn" slot-scope="scope">
+          <el-button :disabled="!!scope.row.builtIn" @click="toDetail(scope.row)" size="small">详情</el-button>
+          <template v-if="!scope.row.builtIn">
             <el-button size="small" @click="showExtension(scope.row)">展期</el-button>
             <el-button @click="repayment(scope.row)" size="small">还款计划</el-button>
           </template>
@@ -285,6 +285,7 @@ export default {
         }])
         this.$message.success(`${text}成功`)
         this.getRepayment()
+        this.getData()
       }).catch(() => { })
     },
     // 批量还款/逾期
@@ -306,6 +307,7 @@ export default {
           this.$refs.repayments.clearSelection()
           this.multipleSelection = []
           this.getRepayment()
+          this.getData()
         }).catch(() => { })
       } else {
         this.$message.error(`请选择数据！`)
diff --git a/src/pages/manage/list/personalLoans/list.vue b/src/pages/manage/list/personalLoans/list.vue
index b900e45..c29288e 100644
--- a/src/pages/manage/list/personalLoans/list.vue
+++ b/src/pages/manage/list/personalLoans/list.vue
@@ -30,6 +30,7 @@
       <el-table-column v-if="index !== '3'" prop="totalRepaymentAmount" key="1" label="累计还款金额" align="center">
       </el-table-column>
       <el-table-column v-if="index === '3'" prop="extensionPeriod" key="3" label="展期期限" align="center">
+        <template slot-scope="scope">{{ scope.row.extensionPeriod }}个月</template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
@@ -241,6 +242,7 @@ export default {
         }])
         this.$message.success(`${text}成功`)
         this.getRepayment()
+        this.getData()
       }).catch(() => { })
     },
     // 批量还款/逾期
@@ -262,6 +264,7 @@ export default {
           this.$refs.repayments.clearSelection()
           this.multipleSelection = []
           this.getRepayment()
+          this.getData()
         }).catch(() => { })
       } else {
         this.$message.error(`请选择数据！`)