From b8270d9c144c617c59f1f05a437f48e0296dda41 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 10 Sep 2021 14:15:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82debug=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/left-sidebar.vue        |  2 +-
 src/components/common/messageDepartment.vue   |  2 +-
 src/components/page/Login.vue                 |  2 +-
 .../page/afterLoan/afterInsurance.vue         | 72 ++++++++++++-------
 src/components/page/afterLoan/afterLoan.vue   |  4 +-
 src/components/page/afterLoan/collection.vue  |  6 +-
 src/components/page/afterLoan/complete.vue    |  4 +-
 src/router/index.js                           |  2 +-
 src/store/modules/loan.js                     |  4 ++
 src/utils/http.js                             |  6 +-
 10 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/components/common/left-sidebar.vue b/src/components/common/left-sidebar.vue
index 91eb0a9..e9ef650 100644
--- a/src/components/common/left-sidebar.vue
+++ b/src/components/common/left-sidebar.vue
@@ -56,7 +56,7 @@ export default {
         
     },
     methods:{
-         // 侧边栏切换组件用
+        // 侧边栏切换组件用
         setIndex(index) {
             this.$emit('getSidebarVal',index)
         },
diff --git a/src/components/common/messageDepartment.vue b/src/components/common/messageDepartment.vue
index 76683a1..891750e 100644
--- a/src/components/common/messageDepartment.vue
+++ b/src/components/common/messageDepartment.vue
@@ -26,7 +26,7 @@
                     </el-table-column>
                     <el-table-column prop="createTime" label="申请日期" min-width="80"></el-table-column>
                     <el-table-column prop="businessType" label="审批状态" min-width="80">
-                        <template slot-scope="scope">·
+                        <template slot-scope="scope">
                             <p v-show="scope.row.status == 0" class="c-refuse">待指派</p>
                             <p v-show="scope.row.status == 1" class="c-refuse">审核中</p>
                             <p v-show="scope.row.status == 2" class="c-green">已审核</p>
diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue
index 57d3508..2cba897 100644
--- a/src/components/page/Login.vue
+++ b/src/components/page/Login.vue
@@ -175,7 +175,7 @@ export default {
                             this.$router.push(this.$route.query.redirect)
                         }else{
                             this.$router.push('/homePage')
-                            console.log(sessionStorage.getItem('token'))
+                            // console.log(sessionStorage.getItem('token'))
                         }
                     })
                 }
diff --git a/src/components/page/afterLoan/afterInsurance.vue b/src/components/page/afterLoan/afterInsurance.vue
index 4c78b8f..8e8472b 100644
--- a/src/components/page/afterLoan/afterInsurance.vue
+++ b/src/components/page/afterLoan/afterInsurance.vue
@@ -1,6 +1,5 @@
 <template>
     <div>
-        
         <div v-show="loanStatus == 1">
             <div class="mgt20 left-border fz-16"><p class="c-black mgl10">保后管理</p></div>
             <div class="mgt20 pdb20">
@@ -51,7 +50,7 @@
                         <el-table-column prop="sourceStr" label="来源" align="center"></el-table-column>
                         <el-table-column label="操作" width="200" align="center">
                             <template slot-scope="scope">
-                                <el-button v-if="scope.row.source=='1'&&$router.currentRoute.meta.btn.includes('担保编辑')" type="text" @click="edit('',scope.row)">编辑</el-button>
+                                <el-button v-if="$router.currentRoute.meta.btn.includes('担保编辑')" type="text" @click="edit('',scope.row)">编辑</el-button>
                                 <el-button v-if="scope.row.source=='1'&&$router.currentRoute.meta.btn.includes('担保删除')" type="text" @click="deleteInsurance(scope.row)">删除</el-button>
                                 <el-button v-if="$router.currentRoute.meta.btn.includes('办理结项') && scope.row.paymentStatus == '已还清'" type="text" @click="conclusion(scope.row)">办理结项</el-button>
                                 <el-button v-if="$router.currentRoute.meta.btn.includes('还款录入') && scope.row.paymentStatus != '已结项'" type="text" @click="edit(scope.row)">还款录入</el-button>
@@ -59,7 +58,6 @@
                             </template>
                         </el-table-column>
                     </el-table>
-
                     <div class="pagination">
                         <el-pagination background @current-change="currentChange" layout="total, prev, pager, next" :current-page="pageNo" :total="totals">
                         </el-pagination>
@@ -76,8 +74,8 @@
                         <div>
                             <div class="mgb20 left-border fz-16"><p class="c-black mgl10">担保信息</p></div>
                             <div>
-                                <!-- :disabled="disabledAll" -->
-                                <el-form label-width="160px" :disabled="!entering&&status!=='newLoans'||disabledAll" :model="guaranteeForm" :rules="guaranteeRule" ref="refGuaranteeForm">
+                                <!-- 新建与编辑不进行禁用 -->
+                                <el-form label-width="160px" :disabled="!entering&&status!=='newLoans'||disabledAll&&!wanderEdit" :model="guaranteeForm" :rules="guaranteeRule" ref="refGuaranteeForm">
                                     <el-col :span="12" >
                                         <el-form-item label="业务编号:">
                                             <el-input v-model="guaranteeForm.businessCode"  disabled placeholder="自动生成"></el-input>
@@ -90,17 +88,19 @@
                                                 <el-input class="dn"  type="text" v-model="guaranteeForm.bank"></el-input>
                                                 <el-autocomplete
                                                     class="dib"
+                                                    :disabled="!wanderEdit"
                                                     @input="bankgroup($event,'main')"
                                                     v-model="mainbank"
                                                     placeholder="输入银行名称"
                                                     :fetch-suggestions="querySearchAsync"
                                                 ></el-autocomplete>
                                                 <p class="mgl10">-</p>
-                                                <el-input  @change="bankgroup($event,'else')" v-model="elsebank" class="wd45 mgl10 dib" placeholder="分行名称" clearable></el-input>
+                                                <el-input :disabled="!wanderEdit" @change="bankgroup($event,'else')" v-model="elsebank" class="wd45 mgl10 dib" placeholder="分行名称" clearable></el-input>
                                             </div>
                                         </el-form-item>
                                         <el-form-item label="贷款起止日期:" prop="loanStartTime">
                                             <el-date-picker
+                                                :disabled="wanderEdit"
                                                 v-model="starEndDate"
                                                 @change="starEndTimeFn"
                                                 type="daterange"
@@ -111,7 +111,7 @@
                                             </el-date-picker>
                                         </el-form-item>
                                         <el-form-item label="业务类别:" prop="businessType">        
-                                            <el-select v-model="guaranteeForm.businessType" placeholder="请选择">
+                                            <el-select :disabled="!wanderEdit" v-model="guaranteeForm.businessType" placeholder="请选择">
                                                 <el-option label="融资担保" value="融资担保"></el-option>
                                                 <el-option label="担保" value="担保"></el-option>
                                                 <el-option label="借贷" value="借贷"></el-option>
@@ -126,6 +126,7 @@
                                     <el-col :span="12" >
                                         <el-form-item label="客户名称:" prop="customerName">
                                             <el-select
+                                                :disabled="!wanderEdit"
                                                 v-model="guaranteeForm.customerName"
                                                 @change="searchClientChange($event,'name')"
                                                 filterable
@@ -148,17 +149,17 @@
                                         </el-form-item>
 
                                         <el-form-item label="担保额度/贷款金额(元):" prop="guaranteeAmount">
-                                            <el-input v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度"></el-input>
+                                            <el-input :disabled="!wanderEdit" v-model="guaranteeForm.guaranteeAmount" placeholder="请输入担保额度"></el-input>
                                         </el-form-item>
 
                                         <el-form-item label="担保期限:" prop="guaranteeTime">
                                             <div class="df">
-                                                <el-input v-model="guaranteeForm.guaranteeTime" placeholder="输入期限" style="width:94%;margin-right:5px"></el-input><p style="white-space: nowrap;">个月</p>
+                                                <el-input :disabled="!wanderEdit" v-model="guaranteeForm.guaranteeTime" placeholder="输入期限" style="width:94%;margin-right:5px"></el-input><p style="white-space: nowrap;">个月</p>
                                             </div>
                                         </el-form-item>
 
                                         <el-form-item label="贷款用途:" prop="amountWide">
-                                            <el-select v-model="guaranteeForm.amountWide" placeholder="请选择">
+                                            <el-select :disabled="!wanderEdit" v-model="guaranteeForm.amountWide" placeholder="请选择">
                                                 <el-option v-for="(item, index) in loansUse" :key="index" :label="item.label" :value="item.value"></el-option>
                                             </el-select>
                                         </el-form-item>                                  
@@ -178,10 +179,11 @@
                             <el-form label-width="160px" ref="comp" :disabled="disabledAll" :model="comp" :rules="compRule">
                                 <el-col :span="12" >
                                     <el-form-item label="代偿金额（元）:">
-                                        <el-input oninput="value=value.replace(/[^\d.]/g,'')"  v-model="comp.compensationAmount"  placeholder="请输入"></el-input>
+                                        <el-input :disabled="!wanderEdit" oninput="value=value.replace(/[^\d.]/g,'')"  v-model="comp.compensationAmount"  placeholder="请输入"></el-input>
                                     </el-form-item>
                                     <el-form-item label="代偿时间 :">
                                         <el-date-picker
+                                            :disabled="!wanderEdit"
                                             v-model="comp.compensatoryTime"
                                             @change="compensatoryTimeChange"
                                             type="date"
@@ -231,12 +233,13 @@
                                     </div>
                                     <el-form-item label="经营情况:">
                                         <!-- 未完成 -->
-                                        <el-select v-model="liquidate.operation" placeholder="请选择" prop="operation">
+                                        <el-select :disabled="!wanderEdit" v-model="liquidate.operation" placeholder="请选择" prop="operation">
                                             <el-option v-for="(item, index) in circumstance" :key="index" :label="item.name" :value="item.value"></el-option>
                                         </el-select>
                                     </el-form-item>
                                     <el-form-item label="诉讼情况:" >
                                         <el-input
+                                            :disabled="!wanderEdit"
                                             type="textarea"
                                             :rows="2"
                                             placeholder="请输入1000字符以内"
@@ -245,6 +248,7 @@
                                     </el-form-item>
                                     <el-form-item label="抵押情况:">
                                         <el-input
+                                            :disabled="!wanderEdit"
                                             type="textarea"
                                             :rows="2"
                                             placeholder="请输入1000字符以内"
@@ -524,6 +528,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex';
 import { allBankName, insuranceList, insuranceDetail, repaymentEntry, repaymentList, repaymentStatistics, excelHis, delRepayment, repaymentDetail, excelInsurance, updateInsurance, updateRepayment, designateEmpTrees, getAllClient ,saveInsurance,companyInfoBySth,liquidateList,liquidateEdit,liquidateDel,deleteInsurance, editInsurance, compensationSituation,importInsurance , exportFailure} from '../../../utils/api';
 import core from '../../../utils/core';
     export default {
@@ -642,13 +647,13 @@ import core from '../../../utils/core';
                 serachMessageLoading:false,
                 // 贷款用途
                 loansUse:[
-                    { value: 0, label: '短期周转' },
-                    { value: 1, label: '购房贷款' },
-                    { value: 2, label: '装修贷款' },
-                    { value: 3, label: '购车贷款' },
-                    { value: 4, label: '教育贷款' },
-                    { value: 5, label: '投资创业' },
-                    { value: 6, label: '其他' },
+                    { value: '短期周转', label: '短期周转' },
+                    { value: '购房贷款', label: '购房贷款' },
+                    { value: '装修贷款', label: '装修贷款' },
+                    { value: '购车贷款', label: '购车贷款' },
+                    { value: '教育贷款', label: '教育贷款' },
+                    { value: '投资创业', label: '投资创业' },
+                    { value: '其他', label: '其他' },
                 ],
                 guaranteeForm: {// 担保信息  
 
@@ -702,9 +707,10 @@ import core from '../../../utils/core';
         },
         computed:{
             computedCompensatoryBalance(){
-                this.comp.compensatoryBalance = this.comp.compensationAmount - this.cash
-                return this.comp.compensationAmount - this.cash
+                this.comp.compensatoryBalance = this.comp.compensationAmount||0 - this.cash
+                return this.comp.compensationAmount||0 - this.cash
             },
+            
             bankSelect:function(){
                 return this.$store.state.guarantee.bankData
             },
@@ -717,6 +723,9 @@ import core from '../../../utils/core';
             entering(){
                 return this.$store.state.loan.entering
             },
+            wanderEdit(){
+                return this.$store.state.loan.wanderEdit
+            },
             disabledAll(){
                 return this.$store.state.loan.disabledAll
             },
@@ -914,20 +923,29 @@ import core from '../../../utils/core';
 
             //还款录入/新建业务
             edit(row,val){
-                this.$store.commit('disabledAll',false)
+                this.$store.commit('disabledAll',false)// 取消禁用全部，
                 if(!row){// 进入新建业务界面
                     this.loanStatus = 2
                     this.$store.commit("loanStatusData", { loanStatus: 2 });
                     this.$store.commit('setNewOrOld','newLoans')
                     this.$store.commit('entering',false)
-                    if(val){
+                    if(val){// 编辑业务阶段
+                        this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
+                        // 编辑手动添加的业务
                         this.$store.commit('entering',true)
                         this.id = val.id
                         this.$store.commit("idData", { id: val.id });// 存业务id用于刷新复现
+                        if(val.source==0){// 编辑流转的业务
+                            this.$store.commit('wanderEdit',false)
+                            // console.log(this.status,'status')
+                        }else{
+                            this.$store.commit('wanderEdit',true)
+                        }
                     }
                     val?this.$store.commit('discernEdit',true):this.$store.commit('discernEdit',false)
                 }else{// 进入还款录入,添加个额外判断进入编辑界面
-                    this.$store.commit('entering',false) // 不可编辑业务编辑区域
+                    this.$store.commit('wanderEdit',true)
+                    this.$store.commit('entering',false) // 不可编辑-业务编辑区域
                     this.$store.commit('discernEdit',true)// 区分是否可编辑业务
                     this.$store.commit('setNewOrOld','oldLoans')// 区分进入还款或者新建
                     this.loanStatus = 2
@@ -975,7 +993,7 @@ import core from '../../../utils/core';
                     });
                     this.guaranteeLoading = false
                     this.guaranteeForm = res.data.insuranceList
-                    this.starEndDate = [this.guaranteeForm.loanStartTime,this.guaranteeForm.loanEndTime]
+                    this.starEndDate = [this.guaranteeForm.loanStartTime||'',this.guaranteeForm.loanEndTime||""]
                     // 处理银行字符串
                     let across = this.guaranteeForm.bank.indexOf('-')
                     if(across!==-1){
@@ -985,9 +1003,9 @@ import core from '../../../utils/core';
                     }else{
                         this.mainbank = this.guaranteeForm.bank
                     }
-                    this.$set(this.guaranteeForm,'amountWide',+this.guaranteeForm.amountWide)
+                    this.$set(this.guaranteeForm,'amountWide',this.guaranteeForm.amountWide)
 
-                    let reimbursement = res.data.reimbursement 
+                    let reimbursement = res.data.reimbursement||{} 
                     // 代偿
                     this.comp = {
                         compensationAmount:reimbursement.compensationAmount,
diff --git a/src/components/page/afterLoan/afterLoan.vue b/src/components/page/afterLoan/afterLoan.vue
index e861d25..6c0b9fd 100644
--- a/src/components/page/afterLoan/afterLoan.vue
+++ b/src/components/page/afterLoan/afterLoan.vue
@@ -84,7 +84,7 @@ export default {
         //         '数据统计与查询':[{name: '清收完成统计', index: '2'},{name: '清收进度查询', index: '3'}]
         //     }
         // }
-        console.log(this.$router.currentRoute,'陆游信息')
+        // console.log(this.$router.currentRoute,'陆游信息')
         if(meta.includes('清收完成统计')||meta.includes('清收进度查询')){
             this.menus.head.push('数据统计与查询')
             this.menus.body['数据统计与查询'] = []
@@ -193,7 +193,7 @@ export default {
         },
         // 侧边栏切换组件状态保存
         getIndex(index) {
-            console.log(index,'ind')
+            // console.log(index,'ind')
             switch (index) {
                 case '0':
                     this.$store.commit("loanStatusData", { loanStatus: 1 });
diff --git a/src/components/page/afterLoan/collection.vue b/src/components/page/afterLoan/collection.vue
index 9d75bd4..83f6bd3 100644
--- a/src/components/page/afterLoan/collection.vue
+++ b/src/components/page/afterLoan/collection.vue
@@ -643,6 +643,7 @@
         },
         created(){
             this.logStatus = this.$store.state.loan.logStatus
+            // console.log(this.logStatus,'this.logStatus')
             if(this.logStatus == 1){
                 this.getData()
             }
@@ -773,7 +774,8 @@
                 let res = await insuranceDetail({
                     id: this.id
                 });
-                this.guaranteeForm = res.data
+                // console.log(res,'res')
+                this.guaranteeForm = res.data.insuranceList
             },
             //还款记录部分*******
             // 记录详情统计
@@ -913,7 +915,7 @@
                 this.$refs[collectionHandle].validate((valid) => {
                     if (valid) {
                         if(this.collectionHandle.collectionMethod=='3'&&!this.collectionHandle.other) return  this.$message.error("请输入其他催收方式说明！");
-                        // if(this.uploadList.length == 0) return this.$message.error("请先上传附件文件！");
+                        if(this.uploadList.length == 0) return this.$message.error("请先上传附件文件！");
                         this.collectionHandle.enclosureFiles = this.uploadList.map(e => e.url)
                         this.collectionHandle.insuranceId = this.logId
                         collection(this.collectionHandle).then(res=>{
diff --git a/src/components/page/afterLoan/complete.vue b/src/components/page/afterLoan/complete.vue
index 8782c3d..ffc2834 100644
--- a/src/components/page/afterLoan/complete.vue
+++ b/src/components/page/afterLoan/complete.vue
@@ -594,8 +594,8 @@ export default {
             return row.Id;
         },
         statisticsSelection() {
-            console.log('发',this.searchStr.year)
-            console.log(this.searchStr.year+`年度清收工作完成进度表`)
+            // console.log('发',this.searchStr.year)
+            // console.log(this.searchStr.year+`年度清收工作完成进度表`)
             core.exportFile(annualStatisticsListExport(this.searchStr.year),this.searchStr.year+"年度清收工作完成进度表")
         },
         edit(row, val) {
diff --git a/src/router/index.js b/src/router/index.js
index 71a60f7..59dfc37 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -283,7 +283,7 @@ router.beforeEach(function(to,from,next){
                     },
                     len = res.data.length,
                     homeMenu = []
-                    console.log(res.data,'路由处理，工作台和非工作台路由匹配')
+                    // console.log(res.data,'路由处理，工作台和非工作台路由匹配')
                     for(let i=0;i<len;i++){
                         //匹配非工作台的路由
                         if(res.data[i].name!=='客户资源管理系统'&&res.data[i].name!=='担保业务管理系统'&&res.data[i].name!=='保后业务管理系统'){
diff --git a/src/store/modules/loan.js b/src/store/modules/loan.js
index 8ee75f8..9e61eec 100644
--- a/src/store/modules/loan.js
+++ b/src/store/modules/loan.js
@@ -23,6 +23,7 @@ const state = {
 
     leftStatus: '0',//侧边栏
     discernEdit:false,// 是否可编辑保后业务
+    wanderEdit:false,// 是否可编辑流转的业务
     entering:false,// 是否为录入业务
     disabledAll:false,//禁用全部
     liquidate:'1',// 控制清收统计页面切换
@@ -89,6 +90,9 @@ const mutations = {
     entering(state,val){
         state.entering = val
     },
+    wanderEdit(state,val){
+        state.wanderEdit = val
+    },
     disabledAll(state,val){
         state.disabledAll = val
     },
diff --git a/src/utils/http.js b/src/utils/http.js
index 79a018b..9341d2d 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -4,9 +4,9 @@ import axios from 'axios';
 import { Message } from 'element-ui'
 import router from '../router/index'
  
-// export const Url = 'https://test.feifanhitech.com'// 测试服务器地址
+export const Url = 'https://test.feifanhitech.com'// 测试服务器地址
 // export const Url = 'https://www.feifanhitech.com';// 非凡
-export const Url = 'http://192.168.31.137:8080';//陈赓
+// export const Url = 'http://192.168.31.137:8080';//陈赓
 axios.defaults.baseURL = Url;
 const baseurl = Url
 // 请求超时时间
@@ -54,8 +54,6 @@ axios.interceptors.response.use(
     },
     // 服务器状态码不是200的情况
     error => {
-        // console.log(error,'错误打印--http.js -98行')
-        console.log('报错')
         if(error.response){
             if (error.response.status) {
                 switch (error.response.status) {