6月17日修改bug

src/components/approval.vue

@@ -223,9 +223,10 @@
           })
           if (result.success) {
             this.hasRisk = true;
-            await this.initRiskResult()
+            //await this.initRiskResult()
           }
-        } else {
+        }
+        else {
           await this.initRiskResult()
         }
 

src/components/pre-operation-log.vue → src/components/operation-log.vue

@@ -34,7 +34,7 @@
   import API from '@/server/api'
 
   export default {
-    name: 'PreOperationLog',
+    name: 'OperationLog',
     props:{
       log:{
         type:Array,
@@ -88,6 +88,7 @@
     },
     created() {
       if(this.log){
+        console.log(this.log,'日志');
         this.list = this.log;
       }
     }

src/components/user-base-info.vue

@@ -33,7 +33,7 @@
       <el-descriptions-item label-class-name='labelCls' label='月收入'>{{baseInfo.selfMonthIncomeStr}}元</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='首次授信'>{{baseInfo.isFirstCredit}}</el-descriptions-item>-->
       <el-descriptions-item label-class-name='labelCls' label='BD用户名'>{{baseInfo.loginName}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='办单模式'>{{baseInfo.orderProcessingMode}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='收款主体'>{{baseInfo.collectionMain}}</el-descriptions-item>

src/components/user-other-info.vue

@@ -41,7 +41,11 @@
         <el-col v-for='(o, index) in creditAttachInfo' :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>
+                      @click.native='showImgViewer(o.screenList,"annex")'>
+              <div slot="error" class="image-slot">
+                <span>未上传</span>
+              </div>
+            </el-image>
             <div class='el-card-intro'>
               <span>{{ o.attachTypeStr }}</span>
             </div>
@@ -57,7 +61,11 @@
         <el-col v-for='(o, index) in supplAttachInfo' :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>
+                      @click.native='showImgViewer(o.screenList,"annex")'>
+              <div slot="error" class="image-slot">
+                <span>未上传</span>
+              </div>
+            </el-image>
             <div class='el-card-intro'>
               <span>{{ o.attachTypeStr }}</span>
             </div>
@@ -72,7 +80,11 @@
         <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>
+                      @click.native='showImgViewer(o.screenList,"annex")'>
+              <div slot="error" class="image-slot">
+                <span>未上传</span>
+              </div>
+            </el-image>
             <div class='el-card-intro'>
               <span>{{ o.attachTypeStr }}</span>
             </div>
@@ -163,7 +175,7 @@
         this.xcxSupplAttachInfo = xcxSupplAttachInfo
       }
 
-      console.log(this.thirdPartyReport, '第三方报告')
+      //console.log(this.thirdPartyReport, '第三方报告')
 
     },
     methods: {
@@ -232,10 +244,15 @@
   }
 
   .el-card-image {
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     width: 100%;
     height: 100px;
-    max-height: 100px
+    max-height: 100px;
+
+  background: #f5f7fa;
+
   }
 
   .el-card-intro {

src/minix/index.js

 import BlockHeader from '@/components/blockHeader'
-import OperationLog from '@/components/pre-operation-log'
+import OperationLog from '@/components/operation-log'
 import PreReport from '@/components/pre-report'
 import PrePlead from '@/components/pre-plead'
 import LoanAudit from '@/components/loan-audit'

src/store/modules/routes.js

@@ -23,6 +23,7 @@ const mutations = {
 const actions = {
   async setRoutes({ commit }, mode) {
     let routes = asyncRoutes;
+    console.log(mode,'路由模式');
     if (mode === "all") {
       let data = [
         {

src/vab/components/SideBar/index.vue

@@ -43,6 +43,9 @@
         variables: variables,
       }
     },
+    created() {
+      console.log(this.routes,'菜单')
+    },
     computed: {
       ...mapGetters({
         collapse: 'settings/collapse',

src/vab/plugins/permissions.js

@@ -6,12 +6,7 @@ import store from '@/store'
 import VabProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import getPageTitle from '@/utils/pageTitle'
-import {
-  authentication,
-  loginInterception,
-  recordRoute,
-  routesWhiteList
-} from '@/config'
+import { authentication, loginInterception, recordRoute, routesWhiteList } from '@/config'
 
 VabProgress.configure({
   easing: 'ease',

src/views/approval/detail.vue

@@ -19,7 +19,7 @@
 
     <!--操作日志-->
     <template v-if='detail.operationLogResponse!==null'>
-      <operation-log :log-data='detail.operationLogResponse' />
+      <operation-log :log='detail.operationLogResponse' />
     </template>
 
     <!--申述操作-->
@@ -56,7 +56,9 @@
         const result = await API.initApproveDetail({
           creditNo
         })
-        this.detail = result.result
+        this.detail = result.result;
+
+        console.log('审批详情',this.detail)
       }
     }
   }

src/views/credit/approval-detail.vue

@@ -17,7 +17,7 @@
 
     <!--操作日志-->
     <template v-if='detail.operationLogResponse!==null'>
-      <operation-log :log-data='detail.operationLogResponse' />
+      <operation-log :log='detail.operationLogResponse' />
     </template>
 
     <!--申述操作-->

src/views/credit/detail.vue

@@ -17,7 +17,7 @@
 
     <!--操作日志-->
     <template v-if='detail.operationLogResponse!==null'>
-      <operation-log :log-data='detail.operationLogResponse' />
+      <operation-log :log='detail.operationLogResponse' />
     </template>
 
     <!--申述操作-->

src/views/credit/pre-detail.vue

@@ -17,18 +17,7 @@
       <el-descriptions-item label-class-name='labelCls' label='授信类型'>{{ detail.preBasisInfoResponse.creditTypeStr }}
       </el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='授信状态'>
-
-
-        <el-tag v-if='detail.preBasisInfoResponse.preStateStr==="授信中"' size='medium' type='warning'>
-          {{ detail.preBasisInfoResponse.preStateStr }}
-        </el-tag>
-        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信通过"' size='medium'  type='success'>
         {{ detail.preBasisInfoResponse.preStateStr }}
-        </el-tag>
-        <el-tag v-else-if='detail.preBasisInfoResponse.preStateStr==="授信拒绝"' size='medium'  type='danger'>
-          {{ detail.preBasisInfoResponse.preStateStr }}
-        </el-tag>
-
 
         <template v-if='detail.preBasisInfoResponse.preState === "PRE_CREDIT_REFUSE"'>
           <el-button @click='handlePlead' size='mini' style='margin-left: 10px' type='primary'>申诉</el-button>
@@ -36,7 +25,7 @@
       </el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='商户区域'>{{ detail.preBasisInfoResponse.regionName }}
       </el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='首次授信'>{{ detail.preBasisInfoResponse.realName }}
+      <el-descriptions-item label-class-name='labelCls' label='首次授信'>
       </el-descriptions-item>
     </el-descriptions>
 
@@ -64,7 +53,7 @@
 
 <script>
   import API from '@/server/api'
-  import PreOperationLog from '@/components/pre-operation-log'
+  import PreOperationLog from '@/components/operation-log'
 
   export default {
     name: 'PreDetail',

src/views/loan/components/check.vue

+<!-- 预授信申述 -->
+<template>
+  <el-dialog
+    :title='title'
+    :visible.sync='visible'
+    :destroy-on-close='true'
+    :append-to-body='true'
+    :before-close='handleClose'
+    :close-on-click-modal='false'
+    width='30%'>
+    <div class='page'>
+      <el-form ref='form' :model='form' :rules='rules' label-width='100px' class='form-inline'
+               label-suffix=':'>
+        <el-form-item label='客户名称'>
+          <span>{{ form.clientName }}</span>
+        </el-form-item>
+        <el-form-item label='借款金额'>
+          <span>{{ form.loanAmount }}</span>
+        </el-form-item>
+        <el-form-item prop='memo' label='确认备注'>
+          <el-input v-model='form.memo' type='textarea' clearable placeholder='请输入' />
+        </el-form-item>
+
+        <template v-if='searchData!==null && payChannelApiResponses.length'>
+          <el-form-item prop='payChannelApi' label='放款渠道'>
+            <el-select v-model='form.payChannelApi' clearable placeholder='请选择放款渠道'>
+              <el-option
+                v-for='(item,index) in 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'>
+      <el-button type='primary' @click='handleLoan("form")'>确 定</el-button>
+      <el-button @click='handleClose'>取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+  import API from '@/server/api'
+  import _ from 'lodash'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: 'Approval',
+    props: {
+      visible: {
+        type: Boolean,
+        require: true
+      },
+      title: {
+        type: Boolean,
+        require: true
+      },
+      item: {
+        type: Object,
+        require: true
+      }
+    },
+    data() {
+      return {
+        rules: {
+          memo: [
+            {
+              required: true,
+              trigger: 'blur',
+              message: '请输入审批备注'
+            }
+          ]
+        },
+        type: '',
+        payChannelApiResponses: [],
+        form: {
+          loanAmount: '',
+          clientName: '',
+          currentAction: '',
+          orderNo: '',
+          memo: '',
+          stepsNo: '',
+          userId: '',
+          payChannelApi: ''
+        }
+      }
+    },
+    computed: {
+      ...mapGetters(['searchData', 'user'])
+    },
+    created() {
+      if (this.item !== null) {
+        const { realName, loanAmount, type, currentAction, orderNo, stepsNo } = this.item
+        this.type = type
+        this.form.clientName = realName
+        this.form.loanAmount = loanAmount
+        this.form.currentAction = currentAction
+        this.form.orderNo = orderNo
+        this.form.stepsNo = stepsNo
+
+        const payChannel = []
+        this.searchData.payChannelApiResponses.forEach(item => {
+          if (item.loanSign === loanSign) {
+            payChannel.push(item)
+          }
+        })
+
+        this.payChannelApiResponses = payChannel
+
+      }
+    },
+    methods: {
+      handleClose() {
+        this.$emit('handleClose')
+      },
+      handleLoan(formName) {
+        this.$refs[formName].validate(async (valid) => {
+          if (valid) {
+            const form = this.form
+            form.userId = this.user.userId
+            console.log(form, '表单书')
+            let result
+            if (this.type === 'confirm') {
+              result = await API.loanConfirm({
+                ...form
+              })
+            } else {
+              result = await API.loanCancel({
+                ...form
+              })
+            }
+
+            if (result.success) {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+
+              this.$emit('callback')
+              this.$emit("handleClose")
+            }
+
+
+          }
+        })
+      }
+
+    }
+  }
+</script>
+<style lang='scss' scoped>
+  .page-fence {
+    ::v-deep {
+      i {
+        cursor: pointer;
+      }
+    }
+
+    box-sizing: border-box;
+    padding: 20px;
+  }
+</style>
+<style lang='scss'>
+  .custom-table-checkbox {
+    .el-checkbox {
+      display: block !important;
+      margin: 0 0 $base-padding/4 0;
+    }
+  }
+
+  .action-bar {
+    margin-bottom: 15px;
+  }
+</style>

src/views/loan/detail.vue

@@ -61,12 +61,15 @@
     <!--收款账户信息-->
     <template v-if='collectionAccountResponse!==null'>
       <block-header title='收款账户信息' />
-      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border size='small'
+      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border
+                       size='small'
                        :column='5'>
-        <el-descriptions-item project label='收款金额'>{{ money(collectionAccountResponse.collectionAmount) }}元</el-descriptions-item>
-        <el-descriptions-item project label='收款方类型'>{{ collectionAccountResponse.collectionType }}</el-descriptions-item>
+        <el-descriptions-item project label='收款金额'>{{ money(collectionAccountResponse.collectionAmount) }}元
+        </el-descriptions-item>
+        <el-descriptions-item project label='收款方类型'>{{ collectionAccountResponse.collectionType }}
+        </el-descriptions-item>
         <el-descriptions-item project label='收款方名称'>{{ collectionAccountResponse.clientName }}</el-descriptions-item>
-        <el-descriptions-item project label='开户行'>{{ collectionAccountResponse.bankName }}月</el-descriptions-item>
+        <el-descriptions-item project label='开户行'>{{ collectionAccountResponse.bankName }}</el-descriptions-item>
         <el-descriptions-item project label='收款账户'>{{ collectionAccountResponse.bankCard }}</el-descriptions-item>
       </el-descriptions>
     </template>
@@ -74,7 +77,8 @@
     <!--还款账户信息-->
     <template v-if='repayAccountResponse!==null'>
       <block-header title='还款账户信息' />
-      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border size='small'
+      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border
+                       size='small'
                        :column='3'>
         <el-descriptions-item project label='还款人姓名'>{{ repayAccountResponse.clientName }}</el-descriptions-item>
         <el-descriptions-item project label='银行名称'>{{ repayAccountResponse.openBankName }}</el-descriptions-item>
@@ -85,7 +89,8 @@
     <!--BD信息-->
     <template v-if='bdInfoResponse!==null'>
       <block-header title='BD信息' />
-      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border size='small'
+      <el-descriptions style='margin-bottom: 20px;' direction='vertical' :content-style='CS' :label-style='LS' border
+                       size='small'
                        :column='4'>
         <el-descriptions-item project label='BD编号'>{{ bdInfoResponse.bdNo }}</el-descriptions-item>
         <el-descriptions-item project label='BD名称'>{{ bdInfoResponse.bdName }}</el-descriptions-item>
@@ -110,6 +115,16 @@
     </template>
 
 
+    <!--稽核弹框-->
+    <template v-if='visible'>
+      <loan-audit
+        :dialog-visible='visible'
+        :item='item'
+        @handleClose='visible = false'
+        @callback='init'
+      />
+    </template>
+
   </div>
 </template>
 
@@ -121,6 +136,9 @@
     data() {
       return {
 
+        visible: false,
+        item: null,
+
 
         isLoan: true,
         orderNo: '',
@@ -128,7 +146,7 @@
         project: null,
         client: null,
         bdInfoResponse: null,
-        collectionAccountResponse:null,// 收款方
+        collectionAccountResponse: null,// 收款方
         capitalName: null// 资金方
       }
     },
@@ -141,6 +159,10 @@
       }
     },
     methods: {
+      handleAudit(row) {
+        this.visible = true
+        this.item = row
+      },
       async init() {
         const orderNo = this.orderNo
         const result = await API.loanDetail({
@@ -167,9 +189,9 @@
         this.project = projectInfoResponse
         this.client = clientDetail
         this.capitalName = capitalName // 资金方
-        this.collectionAccountResponse = collectionAccountResponse; // 收款方信息
-        this.repayAccountResponse = repayAccountResponse; // 还款方信息
-        this.bdInfoResponse = bdInfoResponse; // 还款方信息
+        this.collectionAccountResponse = collectionAccountResponse // 收款方信息
+        this.repayAccountResponse = repayAccountResponse // 还款方信息
+        this.bdInfoResponse = bdInfoResponse // 还款方信息
 
         this.detail = data
       }

src/views/loan/list.vue

@@ -118,44 +118,12 @@
 
     <!--放款确认，放款取消-->
     <template v-if='DialogVisible'>
-      <el-dialog
+      <check
         :title='DialogTitle'
-        :visible.sync='DialogVisible'
-        :destroy-on-close='true'
-        width='30%'>
-        <div class='page'>
-          <el-form ref='dialogForm' :model='dialogForm' :rules='rules' label-width='100px' class='form-inline'
-                   label-suffix=':'>
-            <el-form-item label='客户名称'>
-              <span>{{ dialogForm.clientName }}</span>
-            </el-form-item>
-            <el-form-item label='借款金额'>
-              <span>{{ dialogForm.loanAmount }}</span>
-            </el-form-item>
-            <el-form-item prop='memo' label='确认备注'>
-              <el-input v-model='dialogForm.memo' type='textarea' clearable placeholder='请输入' />
-            </el-form-item>
-
-            <template v-if='searchData!==null && payChannelApiResponses.length'>
-              <el-form-item prop='payChannelApi' label='放款渠道'>
-                <el-select v-model='dialogForm.payChannelApi' clearable placeholder='请选择放款渠道'>
-                  <el-option
-                    v-for='(item,index) in 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'>
-          <el-button type='primary' @click='handleLoan("dialogForm")'>确 定</el-button>
-          <el-button @click='DialogVisible = false'>取 消</el-button>
-        </div>
-      </el-dialog>
+        :visible='DialogVisible'
+        @handleClose='DialogVisible = false'
+        @callback='fetchData'
+        :item='item' />
     </template>
 
 
@@ -166,9 +134,13 @@
   import _ from 'lodash'
   import API from '@/server/api'
   import { mapGetters } from 'vuex'
+  import Check from './components/check'
 
   export default {
     name: 'LoanAudit',
+    components: {
+      'Check': Check
+    },
     data() {
       return {
         DialogTitle: '',
@@ -183,7 +155,7 @@
           userId: '',
           payChannelApi: ''
         },
-        payChannelApiResponses:[],
+        payChannelApiResponses: [],
 
 
         checkList: ['订单编号', '项目名称', '客户信息', '借款金额', '借款期数', 'BD姓名', '商户区域', '创建时间', '放款状态', '资金渠道'],
@@ -251,7 +223,7 @@
               trigger: 'blur',
               message: '请输入备注'
             }
-          ],
+          ]
           //payChannelApi: [
           //  {
           //    required: true,
@@ -296,6 +268,10 @@
       this.fetchData()
     },
     methods: {
+      handleClose() {
+        this.DialogVisible = false
+        this.$refs['dialogForm'].resetFields()
+      },
       onReset(formName) {
         if (formName) {
           this.queryForm.capitalCode = ''
@@ -325,25 +301,10 @@
         this.fetchData()
       },
       handleDialog(row, type) {
-        const { realName, loanAmount, currentAction,loanSign, orderNo, stepsNo } = row
-        console.log(row, '当前行信息')
+        if (type) row.type = type
+        this.item = row
         this.DialogVisible = true
         this.DialogTitle = type === 'confirm' ? '确认放款' : '取消放款'
-        this.type = type
-        this.dialogForm.clientName = realName
-        this.dialogForm.loanAmount = loanAmount
-        this.dialogForm.currentAction = currentAction
-        this.dialogForm.orderNo = orderNo
-        this.dialogForm.stepsNo = stepsNo
-
-        const payChannel = [];
-        this.searchData.payChannelApiResponses.forEach(item=>{
-          if(item.loanSign===loanSign){
-            payChannel.push(item)
-          }
-        })
-
-        this.payChannelApiResponses = payChannel;
 
 
       },
@@ -361,36 +322,6 @@
         this.list = records
         this.total = total
         this.listLoading = false
-      },
-      handleLoan(formName) {
-        this.$refs[formName].validate(async (valid) => {
-          if (valid) {
-            const form = this.dialogForm
-            form.userId = this.user.userId
-            console.log(form, '表单书')
-            let result
-            if (this.type === 'confirm') {
-              result = await API.loanConfirm({
-                ...form
-              })
-            } else {
-              result = await API.loanCancel({
-                ...form
-              })
-            }
-
-            if (result.success) {
-              this.$message({
-                type: 'success',
-                message: '操作成功!'
-              })
-
-              await this.fetchData()
-            }
-
-
-          }
-        })
       }
     }
   }