修改bug1

src/components/approval-result.vue

@@ -5,6 +5,7 @@
       <el-descriptions-item label-class-name='labelCls' label='用户申请金额'>{{ applyAmount }}元</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='剩余未还本金'>{{ surplusNoPrincipal }}元</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='机审建议额度'>{{ creditAmount }}元</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='用户申请期限(期数)'>loanIntentionNum</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='人审额度'>{{ manualAmount }}元</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='合作商等级'>{{ partnerGrade }}</el-descriptions-item>
     </el-descriptions>
@@ -30,16 +31,18 @@
         creditAmount: '',
         manualAmount: '',
         partnerGrade: '',
+        loanIntentionNum: '',
         surplusNoPrincipal: ''
       }
     },
     created() {
       if (this.result) {
-        const { applyAmount, creditAmount, manualAmount, partnerGrade } = this.result
+        const { applyAmount, creditAmount, manualAmount,loanIntentionNum, partnerGrade } = this.result
         this.applyAmount = money(applyAmount)
         this.creditAmount = money(creditAmount)
         this.manualAmount = money(manualAmount)
         this.partnerGrade = partnerGrade
+        this.loanIntentionNum = loanIntentionNum;
       }
     }
   }

src/components/approval.vue

@@ -34,15 +34,15 @@
 
         </el-form-item>
         <template v-if='searchData!==null'>
-          <el-form-item prop='capitalCode' label='选择资方'>
+          <el-form-item prop='capitalCodeLoanSign' label='选择资方'>
             <el-row>
               <el-col :span='14'>
-                <el-select v-model='form.capitalCode' style='width: 100%;' clearable>
+                <el-select v-model='form.capitalCodeLoanSign' style='width: 100%;' clearable>
                   <el-option
                     v-for='(f,index) in searchData.financierResponseList'
                     :key='index'
                     @click.native='handleCapitalChange(f)'
-                    :value='f.capitalCode'
+                    :value='f.capitalCodeLoanSign'
                     :label='f.message'>
                   </el-option>
                 </el-select>
@@ -65,7 +65,6 @@
               <el-tag v-else-if='riskResult.status==="YES"' type='success'>{{ riskResult.statusDesc }}</el-tag>
               <el-tag v-else type='danger'>{{ riskResult.statusDesc }}</el-tag>
             </template>
-
             <el-tag v-else type='info' size='mini'>结果未出</el-tag>
           </el-form-item>
         </template>
@@ -89,7 +88,7 @@
       <template v-if='form.capitalCode!=="FENGSHENGBUSINESS"'>
         <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
       </template>
-      <template v-else-if='riskResult.status==="YES"'>
+      <template v-else-if='riskResult!==null && riskResult.status==="YES"'>
         <el-button type='primary' @click='onSubmit("dForm")'>确 定</el-button>
       </template>
       <el-button @click='handleClose'>取 消</el-button>
@@ -132,7 +131,7 @@
               message: '请选择审批意见'
             }
           ],
-          capitalCode: [
+          capitalCodeLoanSign: [
             {
               required: true,
               trigger: 'change',
@@ -199,7 +198,8 @@
       // 资金方选择下拉
       handleCapitalChange(item) {
         if (item) {
-          const { loanSign } = item
+          const { capitalCode,loanSign } = item
+          this.form.capitalCode = capitalCode
           this.form.loanSign = loanSign
         }
       },

src/components/user-base-info.vue

@@ -17,8 +17,8 @@
       <el-descriptions-item label-class-name='labelCls' label='工作行业'>{{baseInfo.workIndustryStr}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='工作城市'>{{baseInfo.companyAddress}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='公司全称'>{{baseInfo.companyName}}</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='居中城市'>{{baseInfo.liveAddress}}</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='居中地址'>{{baseInfo.liveDetailAddress}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='居住城市'>{{baseInfo.liveAddress}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='居住地址'>{{baseInfo.liveDetailAddress}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='QQ/微信'>{{baseInfo.qqWechar}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='户籍地址'>{{baseInfo.address}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='BD经理'>{{baseInfo.bdName}}</el-descriptions-item>
@@ -31,7 +31,7 @@
       <el-descriptions-item label-class-name='labelCls' label='工作地址'>{{baseInfo.companyAddress}}{{baseInfo.companyAddressDetail}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='合同展示地址'>{{baseInfo.address}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='月收入'>{{baseInfo.selfMonthIncomeStr}}元</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='客户GPS'>{{baseInfo.clientGps}}</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='客户GPS'>{{baseInfo.lat}},{{baseInfo.lng}}</el-descriptions-item>
 
       <el-descriptions-item label-class-name='labelCls' label='首次授信'>{{baseInfo.isFirstCredit}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='BD用户名'>{{baseInfo.loginName}}</el-descriptions-item>

src/views/credit/approval.vue

@@ -110,11 +110,8 @@
             <el-tag v-if='row.creditResult==="PASS"' type='success' size='mini'>{{ row.creditResultStr }}</el-tag>
             <el-tag v-if='row.creditResult==="BACK"' type='info' size='mini'>{{ row.creditResultStr }}</el-tag>
             <el-tag v-if='row.creditResult==="REJECT"' type='danger' size='mini'>{{ row.creditResultStr }}</el-tag>
-            <el-tag v-if='row.creditResult==="MANUAL_REJECT"' type='danger' size='mini'>{{ row.creditResultStr
-              }}</el-tag>
             <el-tag v-if='row.creditResult==="RETRIAL"' type='warning' size='mini'>{{ row.creditResultStr }}</el-tag>
-
-            <el-tag v-if='!row.creditResult' type='info' size='mini'>结果未出</el-tag>
+            <el-tag v-if='row.creditResult==="NO_RESULT"' type='info' size='mini'>结果未出</el-tag>
           </span>
           <span v-else>{{ row[item.prop] }}</span>
         </template>
@@ -127,7 +124,7 @@
       >
         <template #default='{ row }'>
           <el-button type='text' @click='handleDetail(row)'>详情</el-button>
-          <template v-if='row.creditResult==="MANUAL_REJECT" || row.creditResult==="REJECT"'>
+          <template v-if='row.creditResult==="REJECT"'>
             <el-button type='text' @click='handlePlead(row)'>申述</el-button>
           </template>
         </template>

src/views/credit/list.vue

@@ -106,10 +106,8 @@
             <el-tag v-if='row.creditResult==="PASS"' type='success' size='mini'>{{ row.creditResultStr }}</el-tag>
             <el-tag v-if='row.creditResult==="BACK"' type='info' size='mini'>{{ row.creditResultStr }}</el-tag>
             <el-tag v-if='row.creditResult==="REJECT"' type='danger' size='mini'>{{ row.creditResultStr }}</el-tag>
-            <el-tag v-if='row.creditResult==="MANUAL_REJECT"' type='danger' size='mini'>{{ row.creditResultStr
-              }}</el-tag>
             <el-tag v-if='row.creditResult==="RETRIAL"' type='warning' size='mini'>{{ row.creditResultStr }}</el-tag>
-            <el-tag v-if='!row.creditResult' type='info' size='mini'>未出结果</el-tag>
+            <el-tag v-if='row.creditResult==="NO_RESULT"' type='info' size='mini'>未出结果</el-tag>
           </span>
           <span v-else>{{ row[item.prop] }}</span>
         </template>

src/views/loan/audit.vue

@@ -18,7 +18,7 @@
         </el-form-item>
 
 
-        <el-form-item label='申请时间'>
+        <el-form-item prop='time' label='申请时间'>
           <el-date-picker
             v-model='queryForm.time'
             type='datetimerange'

src/views/loan/detail.vue

@@ -21,8 +21,7 @@
         <el-descriptions-item project label='借款金额(元)'>{{ money(project.loanIntentionAmount) }}元</el-descriptions-item>
         <el-descriptions-item project label='申请期数'>{{ project.loanIntentionNum }}</el-descriptions-item>
         <el-descriptions-item project label='申请项目'>{{ project.projectName }}</el-descriptions-item>
-        <el-descriptions-item project label='还款方式'>{{ project.projectTime }}</el-descriptions-item>
-        <el-descriptions-item project label='还款来源'>{{ project.projectTime }}</el-descriptions-item>
+        <el-descriptions-item project label='还款方式'>{{ project.repaymentMode }}</el-descriptions-item>
         <el-descriptions-item project label='手术时间'>{{ project.projectTime }}</el-descriptions-item>
       </el-descriptions>
     </template>

src/views/loan/list.vue

@@ -4,8 +4,8 @@
     <block-header title='搜索' />
     <div class='search'>
       <el-form ref='form' label-suffix=':' :inline='true' :model='queryForm' class='form-inline'>
-        <el-form-item prop='loanNo' label='借款编号'>
-          <el-input v-model='queryForm.loanNo' clearable placeholder='请输入借款编号' />
+        <el-form-item prop='orderNo' label='订单编号'>
+          <el-input v-model='queryForm.orderNo' clearable placeholder='请输入订单编号' />
         </el-form-item>
         <el-form-item prop='clientName' label='客户姓名'>
           <el-input v-model='queryForm.clientName' clearable placeholder='请输入客户姓名' />
@@ -19,19 +19,20 @@
 
         <template v-if='searchData!==null'>
 
-          <el-form-item prop='capitalCode' label='资金渠道'>
-            <el-select v-model='queryForm.capitalCode' style='width: 100%;' clearable>
+          <el-form-item prop='capitalCodeLoanSign' label='资金渠道'>
+            <el-select v-model='queryForm.capitalCodeLoanSign' style='width: 100%;' clearable>
               <el-option
                 v-for='(item,index) in searchData.financierResponseList'
                 :key='index'
-                :value='item.capitalCode'
+                :value='item.capitalCodeLoanSign'
+                @click.native='handleCapitalChange(item)'
                 :label='item.message'>
               </el-option>
             </el-select>
           </el-form-item>
         </template>
 
-        <el-form-item label='申请时间'>
+        <el-form-item prop='time' label='申请时间'>
           <el-date-picker
             v-model='queryForm.time'
             type='datetimerange'
@@ -80,7 +81,7 @@
           <div v-else-if='item.label==="借款金额"'>
             {{ money(row.loanAmount) }}
           </div>
-          <div v-else-if='item.label==="借款状态"'>
+          <div v-else-if='item.label==="放款状态"'>
             <el-tag v-if='row.loanStatus==="CANCELED"' type='info'>{{ row.loanStatusStr }}</el-tag>
             <el-tag v-else-if='row.loanStatus==="SETTLED"'>{{ row.loanStatusStr }}</el-tag>
             <el-tag v-else-if='row.loanStatus==="SUBMITED"' type='warning'>{{ row.loanStatusStr }}</el-tag>
@@ -134,6 +135,20 @@
             <el-form-item prop='memo' label='确认备注'>
               <el-input v-model='dialogForm.memo' type='textarea' clearable placeholder='请输入' />
             </el-form-item>
+
+            <template v-if='searchData!==null'>
+              <el-form-item prop='payChannelApi' required label='放款渠道'>
+                <el-select v-model='queryForm.payChannelApi' clearable placeholder='请选择放款渠道'>
+                  <el-option
+                    v-for='(item,index) in searchData.payChannelApiResponses'
+                    :label='item.payChannelApiStr'
+                    :key='index'
+                    :value='item.payChannelApi'></el-option>
+
+                </el-select>
+              </el-form-item>
+            </template>
+
           </el-form>
         </div>
         <div slot='footer' class='dialog-footer'>
@@ -165,11 +180,12 @@
           orderNo: '',
           memo: '',
           stepsNo: '',
-          userId: ''
+          userId: '',
+          payChannelApi: ''
         },
 
 
-        checkList: ['订单编号', '项目名称', '客户信息', '借款金额', '借款期数', 'BD姓名', '商户区域', '创建时间', '借款状态', '资金渠道'],
+        checkList: ['订单编号', '项目名称', '客户信息', '借款金额', '借款期数', 'BD姓名', '商户区域', '创建时间', '放款状态', '资金渠道'],
         columns: [
           {
             order: 1,
@@ -214,8 +230,8 @@
           },
           {
             order: 10,
-            label: '借款状态',
-            prop: 'loanStatus'
+            label: '放款状态',
+            prop: 'loanStatusStr'
           },
           {
             order: 11,
@@ -234,6 +250,13 @@
               trigger: 'blur',
               message: '请输入备注'
             }
+          ],
+          payChannelApi: [
+            {
+              required: true,
+              trigger: 'blur',
+              message: '请选择放款渠道'
+            }
           ]
         },
         queryForm: {
@@ -242,14 +265,16 @@
 
 
           mobile: '',
-          loanNo: '',
+          orderNo: '',
           loanName: '',
           clientName: '',
           time: '',
           startTime: '',
           endTime: '',
           userId: '',
-          capitalCode: ''
+          capitalCode: '',
+          loanSign: '',
+          capitalCodeLoanSign: ''
         }
       }
     },
@@ -270,6 +295,16 @@
       this.fetchData()
     },
     methods: {
+
+      // 资金方选择下拉
+      handleCapitalChange(item) {
+        if (item) {
+          const { capitalCode, loanSign } = item
+          this.queryForm.capitalCode = capitalCode
+          this.queryForm.loanSign = loanSign
+        }
+      },
+
       onSearch() {
         const { time } = this.queryForm
         this.queryForm.current = 1
@@ -332,6 +367,8 @@
                 type: 'success',
                 message: '操作成功!'
               })
+
+              await this.fetchData()
             }