6月16日上午修改bug

src/components/approval-result.vue

 <!-- 操作日志 -->
 <template>
   <div class='com'>
-    <el-descriptions style='margin-bottom: 20px;' border size='small' direction="vertical" :column='5'>
+    <el-descriptions :content-style='CSS' :label-style='LSS' style='margin-bottom: 20px;' border size='small' direction="vertical" :column='6'>
       <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='用户申请期限(期数)'>{{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>
@@ -27,6 +27,15 @@
     },
     data() {
       return {
+        CSS: {
+          'text-align': 'center',  //文本居中
+          'word-break': 'break-all'  //过长时自动换行
+        },
+        LSS: {
+          'text-align': 'center',
+          'height': '40px',
+          'word-break': 'keep-all'
+        },
         applyAmount: '',
         creditAmount: '',
         manualAmount: '',
@@ -37,12 +46,13 @@
     },
     created() {
       if (this.result) {
-        const { applyAmount, creditAmount, manualAmount,loanIntentionNum, partnerGrade } = this.result
+        const { applyAmount,surplusNoPrincipal, creditAmount, manualAmount,loanIntentionNum, partnerGrade } = this.result
         this.applyAmount = money(applyAmount)
         this.creditAmount = money(creditAmount)
         this.manualAmount = money(manualAmount)
         this.partnerGrade = partnerGrade
         this.loanIntentionNum = loanIntentionNum;
+        this.surplusNoPrincipal = money(surplusNoPrincipal);
       }
     }
   }

src/components/approval.vue

@@ -59,7 +59,7 @@
           </el-form-item>
         </template>
         <template v-if='form.capitalCode==="FENGSHENGBUSINESS"'>
-          <el-form-item prop='riskResult' label='风审查询结果'>
+          <el-form-item label='风审查询结果'>
             <template v-if='riskResult!==null'>
               <el-tag v-if='riskResult.status==="CREDIT_ING"' type='warning'>{{ riskResult.statusDesc }}</el-tag>
               <el-tag v-else-if='riskResult.status==="YES"' type='success'>{{ riskResult.statusDesc }}</el-tag>
@@ -117,13 +117,13 @@
       return {
 
         rules: {
-          riskResult: [
-            {
-              required: true,
-              trigger: 'change',
-              message: '风审结果未出'
-            }
-          ],
+          //riskResult: [
+          //  {
+          //    required: true,
+          //    trigger: 'change',
+          //    message: '风审结果未出'
+          //  }
+          //],
           approveStatus: [
             {
               required: true,
@@ -222,6 +222,7 @@
             creditAmount
           })
           if (result.success) {
+            this.hasRisk = true;
             await this.initRiskResult()
           }
         } else {

src/components/plead.vue

@@ -5,12 +5,12 @@
     :before-close='handleClose'
     :destroy-on-close='true'
     width='38%'
-    title='申述'>
+    title='申诉'>
     <div class='page'>
       <!--搜索-->
       <el-form ref='dForm' label-suffix=':' label-width='90px' :rules='rules' :model='form' class='form-inline'>
-        <el-form-item prop='appealMemo' label='申述原因'>
-          <el-input v-model='form.appealMemo' type='textarea' clearable placeholder='请输入申述备注' />
+        <el-form-item prop='appealMemo' label='备注'>
+          <el-input v-model='form.appealMemo' type='textarea' clearable placeholder='请输入备注' />
         </el-form-item>
         <el-form-item prop='approveOpinion' label='审批意见'>
           <template v-if='searchData!==null'>

src/components/user-other-info.vue

@@ -66,6 +66,21 @@
       </el-row>
     </template>
 
+    <template v-if='xcxSupplAttachInfo!==null && xcxSupplAttachInfo.length'>
+      <block-header title='补充附件信息' />
+      <el-row :gutter='20'>
+        <el-col v-for='(o, index) in xcxSupplAttachInfo' :key='index' :span='4'>
+          <el-card :body-style="{ padding: '10px' }">
+            <el-image class='el-card-image' :src='o.screenList[0]'
+                      @click.native='showImgViewer(o.screenList,"annex")'></el-image>
+            <div class='el-card-intro'>
+              <span>{{ o.attachTypeStr }}</span>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </template>
+
     <template v-if='!isLoan'>
       <!--机审报告-->
       <block-header title='机审报告' />
@@ -117,7 +132,8 @@
         supplAttachInfo: [],
 
         imgViewerVisible: false,
-        imgList: []
+        imgList: [],
+        xcxSupplAttachInfo: null
 
       }
     },
@@ -129,7 +145,8 @@
         faceInfoResponse,
         reportResponse,
         thirdPartyReport,
-        supplAttachInfo
+        supplAttachInfo,
+        xcxSupplAttachInfo
       } = this.info
       this.data = this.info
 
@@ -142,6 +159,10 @@
       this.supplAttachInfo = supplAttachInfo // 附件信息
       //this.supplAttachInfo = [] // 附件信息
 
+      if (xcxSupplAttachInfo && xcxSupplAttachInfo.length > 0) {
+        this.xcxSupplAttachInfo = xcxSupplAttachInfo
+      }
+
       console.log(this.thirdPartyReport, '第三方报告')
 
     },

src/views/approval/detail.vue

@@ -16,12 +16,6 @@
     <!--其它信息-->
     <user-other-info :info='detail' />
 
-    <!--第三方报告-->
-    <template v-if='detail.thirdPartyReport!==null'></template>
-
-    <!--路由结果报告-->
-    <template></template>
-
 
     <!--操作日志-->
     <template v-if='detail.operationLogResponse!==null'>

src/views/approval/list.vue

@@ -26,6 +26,18 @@
             placeholder='请输入手机号码'
           />
         </el-form-item>
+        <template v-if='searchData!==null'>
+          <el-form-item prop='creditType' label='授信类型'>
+            <el-select v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
+              <el-option
+                v-for='(item,index) in searchData.creditTypeResponseList'
+                :key='index'
+                :label='item.creditTypeStr'
+                :value='item.creditType'></el-option>
+
+            </el-select>
+          </el-form-item>
+        </template>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditStatus' label='审批状态'>
             <el-select v-model='queryForm.creditStatus' clearable placeholder='请选择审批状态'>

src/views/credit/approval.vue

@@ -46,6 +46,18 @@
 
             </el-select>
           </el-form-item>
+          <template v-if='searchData!==null'>
+            <el-form-item prop='creditResult' label='审批结果'>
+              <el-select v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
+                <el-option
+                  v-for='(item,index) in searchData.creditStatusResultResponseList'
+                  :label='item.creditResultStr'
+                  :key='index'
+                  :value='item.creditResult'></el-option>
+
+              </el-select>
+            </el-form-item>
+          </template>
         </template>
 
         <el-form-item prop='time' label='申请时间'>
@@ -92,7 +104,7 @@
           <span v-if='item.label==="申请金额(元)"'>
             {{ money(row.applyAmount) }}
           </span>
-          <span v-else-if='item.label==="审核结果(元)"'>
+          <span v-else-if='item.label==="授信金额(元)"'>
             {{ money(row.manualAmount) }}
           </span>
           <span v-else-if='item.label==="客户信息"'>
@@ -125,7 +137,7 @@
         <template #default='{ row }'>
           <el-button type='text' @click='handleDetail(row)'>详情</el-button>
           <template v-if='row.creditResult==="REJECT"'>
-            <el-button type='text' @click='handlePlead(row)'>申述</el-button>
+            <el-button type='text' @click='handlePlead(row)'>申诉</el-button>
           </template>
         </template>
       </el-table-column>
@@ -166,7 +178,7 @@
         item: null,
 
 
-        checkList: ['授信编号', '授信类型', '客户信息', '对应BD', '商户区域', '申请金额(元)', '审核结果(元)', '审批状态', '审批结果', '创建时间'],
+        checkList: ['授信编号', '授信类型', '客户信息', '对应BD', '商户区域', '申请金额(元)', '授信金额(元)', '审批状态', '审批结果', '创建时间'],
         columns: [
           {
             order: 1,
@@ -203,7 +215,7 @@
           },
           {
             order: 7,
-            label: '审核结果(元)',
+            label: '授信金额(元)',
             prop: 'manualAmount'
           },
           {
@@ -238,6 +250,7 @@
           bdNo: '',
           creditNo: '',
           creditStatus: '',
+          creditResult:'',
           realName: '',
           time: '',
           startTime: '',

src/views/credit/list.vue

@@ -25,6 +25,18 @@
             placeholder='请输入客户手机号码'
           />
         </el-form-item>
+        <template v-if='searchData!==null'>
+          <el-form-item prop='creditType' label='授信类型'>
+            <el-select v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
+              <el-option
+                v-for='(item,index) in searchData.creditTypeResponseList'
+                :key='index'
+                :label='item.creditTypeStr'
+                :value='item.creditType'></el-option>
+
+            </el-select>
+          </el-form-item>
+        </template>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditStatus' label='授信状态'>
             <el-select v-model='queryForm.creditStatus' clearable placeholder='请选择授信状态'>
@@ -207,6 +219,7 @@
           mobile: '',
           bdNo: '',
           creditNo: '',
+          creditType:'',
           creditResult: '',
           creditStatus: '',
           realName: '',

src/views/loan/audit.vue

@@ -81,13 +81,12 @@
         fixed='right'
         align='center'
         label='操作'
-        width='200'
       >
         <template #default='{ row }'>
           <template v-if='row.loanStatus==="SUBMITED" && row.stepsNo==="002"'>
-            <el-button size='mini' type='primary' @click='handleAudit(row)'>稽核审批</el-button>
+            <el-button size='mini' type='text' @click='handleAudit(row)'>稽核审批</el-button>
           </template>
-          <el-button size='mini' type='default' @click='handleDetail(row)'>详情</el-button>
+          <el-button size='mini' type='text' @click='handleDetail(row)'>详情</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/loan/detail.vue

@@ -11,9 +11,9 @@
         <el-descriptions-item project label='申请时间'>{{ project.loanApplyDate }}</el-descriptions-item>
         <el-descriptions-item project label='借款状态'>
           <span>{{ project.loanStatusStr }}</span>
-          <template v-if='project.loanStatus==="SUBMITED" && project.stepsNo==="002"'>
-            <el-button style='margin-left: 10px' type='primary' size='mini' @click='handleAudit(project)'>稽核</el-button>
-          </template>
+          <!--<template v-if='project.loanStatus==="SUBMITED" && project.stepsNo==="002"'>-->
+          <!--  <el-button style='margin-left: 10px' type='primary' size='mini' @click='handleAudit(project)'>稽核</el-button>-->
+          <!--</template>-->
 
         </el-descriptions-item>
         <el-descriptions-item project label='医院名称'>{{ project.regName }}</el-descriptions-item>

src/views/loan/list.vue

@@ -295,7 +295,13 @@
       this.fetchData()
     },
     methods: {
-
+      onReset(formName) {
+        if (formName) {
+          this.queryForm.capitalCode = ''
+          this.queryForm.loanSign = ''
+          this.$refs[formName].resetFields()
+        }
+      },
       // 资金方选择下拉
       handleCapitalChange(item) {
         if (item) {

src/views/login/index.vue

@@ -179,8 +179,8 @@ export default {
       verifyTxt: "验证码",
       verifyTime: 60,
       form: {
-        username: "caimm",
-        password: "123456",
+        username: "",
+        password: "",
         vcode: ""
       },
       rules: {