提额相关

src/assets/common.scss

 .page{
-  position: relative;
+  //position: relative;
   box-sizing: border-box;
   padding: 20px;
 }

src/components/approval.vue

@@ -18,13 +18,13 @@
 
       <template v-if='form.approveStatus==="PASS"'>
 
-        <el-form-item label='申请期数(期)'>
-          <el-row>
-            <el-col :span='14'>
+        <el-row>
+          <el-col :span='10'>
+            <el-form-item prop='loanIntentionNum' label='申请期数(期)'>
               <el-input v-model='form.loanIntentionNum' style='width: 100%;' clearable />
-            </el-col>
-          </el-row>
-        </el-form-item>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-row>
           <el-col :span='10'>
@@ -156,6 +156,24 @@
               trigger: 'blur'
             }
           ],
+          loanIntentionNum: [
+            {
+              required: true,
+              trigger: 'blur',
+              message: '请输入期数'
+            },
+            {
+              validator: (rule, value, callback) => {
+                const reg = /^\d+$/
+                if (!reg.test(value)) {
+                  callback(new Error('期数必须是数字'))
+                } else {
+                  callback()
+                }
+              },
+              trigger: 'blur'
+            }
+          ],
           memo: [
             {
               required: true,
@@ -206,7 +224,7 @@
       if (this.item !== null) {
         const { clientDetail, projectInfoResponse } = this.item
         const { creditNo } = clientDetail
-        const { manualAmount,loanIntentionNum } = projectInfoResponse
+        const { manualAmount, loanIntentionNum } = projectInfoResponse
         this.creditNo = creditNo
         this.form.loanIntentionNum = loanIntentionNum
         this.manualAmount = manualAmount
@@ -298,7 +316,7 @@
                   message: '审批成功'
                 })
 
-                this.onBack();
+                this.onBack()
               }
             }).catch((e) => {
               console.log(e, '取消申述了')
@@ -314,9 +332,6 @@
   }
 </script>
 <style scoped lang='scss'>
-  html body {
-    position: inherit;
-  }
 
   .com-approval {
     //position: relative;

src/components/user-project-info.vue

@@ -6,7 +6,7 @@
       <el-descriptions-item label-class-name='labelCls' label='医院名称'>{{projectInfo.regName}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='项目金额'>{{money(projectInfo.projectAmount)}}元</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='申请金额'>{{loanIntentionAmount}}元</el-descriptions-item>
-      <el-descriptions-item label-class-name='labelCls' label='借款期限'>{{projectInfo.loanIntentionNum}}月</el-descriptions-item>
+      <el-descriptions-item label-class-name='labelCls' label='借款期限'>{{projectInfo.loanIntentionNum}}期</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='申请项目'>{{projectInfo.projectName}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='商家等级'>{{projectInfo.partnerGrade}}</el-descriptions-item>
       <el-descriptions-item label-class-name='labelCls' label='商户GPS'>{{projectInfo.lngAndLat}}</el-descriptions-item>

src/views/admin/components/new.vue

@@ -39,6 +39,7 @@
         label="公告标题"
       >
         <el-select
+          :popper-append-to-body='false'
           v-model="form.znxTitle"
           style="width: 100%"
           size="mini"

src/views/approval/components/reassignment.vue

@@ -4,8 +4,9 @@
     v-drag
     title='转派'
     :visible.sync='visible'
+    :destroy-on-close='true'
     :close-on-click-modal='false'
-    :append-to-body='true'
+    :append-to-body='false'
     width='30%'
     :before-close='handleClose'
   >
@@ -13,7 +14,7 @@
 
       <el-form-item prop='user' label='转派人员'>
         <template v-if='list.length'>
-          <el-select v-model='form.user' clearable placeholder='请选择'>
+          <el-select v-model='form.user' :popper-append-to-body='false' clearable placeholder='请选择'>
             <el-option
               v-for='(u,index) in list'
               :key='index'
@@ -119,18 +120,6 @@
     }
   }
 </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 {

src/views/approval/detail.vue

@@ -27,7 +27,9 @@
     </template>
 
     <!-- 审批操作 -->
-    <Approval :item='item' />
+    <template v-if='visible'>
+      <Approval :item='item' />
+    </template>
 
   </div>
 </template>

src/views/approval/list.vue

@@ -28,7 +28,7 @@
         </el-form-item>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditType' label='授信类型'>
-            <el-select v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
               <el-option
                 v-for='(item,index) in searchData.creditTypeResponseList'
                 :key='index'
@@ -38,6 +38,20 @@
             </el-select>
           </el-form-item>
         </template>
+
+        <template v-if='searchData!==null'>
+          <el-form-item prop='creditType' label='授信类型'>
+            <el-select v-model='queryForm.creditType' :popper-append-to-body='false' 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='请选择审批状态'>-->
@@ -119,6 +133,10 @@
           <span v-else-if='item.label==="客户信息"'>
             {{ row.realName }} <br /> {{ row.mobile }}
           </span>
+          <span v-else-if='item.label==="授信类型"'>
+             <el-tag v-if='row.creditTypeStr==="提额授信"' effect="plain" size='mini'>{{ row.creditTypeStr }}</el-tag>
+             <el-tag v-else size='mini'>{{ row.creditTypeStr }}</el-tag>
+          </span>
           <span v-else-if='item.label==="授信状态"'>
             <el-tag v-if='row.creditStatus==="CREATED"' size='mini'>{{ row.creditStatusStr }}</el-tag>
             <el-tag v-if='row.creditStatus==="CREDIT_ING"' type='warning' size='mini'>{{ row.creditStatusStr }}</el-tag>
@@ -129,7 +147,7 @@
       </el-table-column>
 
       <template v-if='isOnLine'>
-        <el-table-column width='210' fixed='right' align='center' label='操作'>
+        <el-table-column width='200' fixed='right' align='center' label='操作'>
           <template #default='{ row }'>
             <el-button size='mini' type='danger' @click.native='handleApproval(row)'>审批</el-button>
             <el-button size='mini' type='success' @click='handleView(row)'>详情</el-button>
@@ -184,7 +202,7 @@
         item: null,
 
 
-        checkList: ['授信编号', '客户信息', '对应BD', '商户区域', '申请金额(元)', '授信金额(元)', '审批状态', '申请时间'],
+        checkList: ['授信编号', '客户信息', '对应BD', '商户区域', '申请金额(元)', '授信金额(元)','授信类型', '审批状态', '申请时间'],
         columns: [
           {
             order: 1,
@@ -208,21 +226,29 @@
           },
           {
             order: 5,
+            width: 110,
             label: '申请金额(元)',
             prop: 'applyAmount'
           },
           {
             order: 6,
+            width: 110,
             label: '授信金额(元)',
             prop: 'creditAmount'
           },
           {
             order: 7,
+            label: '授信类型',
+            width: 85,
+            prop: 'creditTypeStr'
+          },
+          {
+            order: 8,
             label: '审批状态',
             prop: 'creditStatusStr'
           },
           {
-            order: 8,
+            order: 9,
             width: 110,
             label: '申请时间',
             prop: 'applyDate'

src/views/credit/approval.vue

@@ -27,7 +27,7 @@
         </el-form-item>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditStatus' label='审批状态'>
-            <el-select v-model='queryForm.creditStatus' clearable placeholder='请选择审批状态'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditStatus' clearable placeholder='请选择审批状态'>
               <el-option
                 v-for='(item,index) in searchData.creditStatusResponseList'
                 :key='index'
@@ -37,7 +37,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop='creditType' label='授信类型'>
-            <el-select v-model='queryForm.creditType' clearable placeholder='请选择审批状态'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditType' clearable placeholder='请选择审批状态'>
               <el-option
                 v-for='(item,index) in searchData.creditTypeResponseList'
                 :key='index'
@@ -48,7 +48,7 @@
           </el-form-item>
           <template v-if='searchData!==null'>
             <el-form-item prop='creditResult' label='审批结果'>
-              <el-select v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
+              <el-select :popper-append-to-body='false' v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
                 <el-option
                   v-for='(item,index) in searchData.creditStatusResultResponseList'
                   :label='item.creditResultStr'
@@ -110,6 +110,10 @@
           <span v-else-if='item.label==="客户信息"'>
             {{ row.realName }} <br /> {{ row.mobile }}
           </span>
+          <span v-else-if='item.label==="授信类型"'>
+             <el-tag v-if='row.creditTypeStr==="提额授信"' effect="plain" size='mini'>{{ row.creditTypeStr }}</el-tag>
+             <el-tag v-else size='mini'>{{ row.creditTypeStr }}</el-tag>
+          </span>
           <span v-else-if='item.label==="审批状态"'>
             <el-tag v-if='row.creditStatus==="CREATED"' size='mini'>{{ row.creditStatusStr }}</el-tag>
             <el-tag v-if='row.creditStatus==="CREDIT_ING"' type='warning' size='mini'>{{ row.creditStatusStr }}</el-tag>

src/views/credit/increase.vue

@@ -25,21 +25,10 @@
             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='请选择授信状态'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditStatus' clearable placeholder='请选择授信状态'>
               <el-option
                 v-for='(item,index) in searchData.creditStatusResponseList'
                 :label='item.creditStatusStr'
@@ -51,7 +40,7 @@
         </template>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditResult' label='审批结果'>
-            <el-select v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
               <el-option
                 v-for='(item,index) in searchData.creditStatusResultResponseList'
                 :label='item.creditResultStr'
@@ -219,7 +208,7 @@
           mobile: '',
           bdNo: '',
           creditNo: '',
-          creditType:'',
+          creditType:'ADD_CREDIT',
           creditResult: '',
           creditStatus: '',
           realName: '',

src/views/credit/list.vue

@@ -25,9 +25,9 @@
             placeholder='请输入客户手机号码'
           />
         </el-form-item>
-        <template v-if='searchData!==null'>
+        <template v-if='false'>
           <el-form-item prop='creditType' label='授信类型'>
-            <el-select v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditType' clearable placeholder='请选择授信类型'>
               <el-option
                 v-for='(item,index) in searchData.creditTypeResponseList'
                 :key='index'
@@ -39,7 +39,7 @@
         </template>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditStatus' label='授信状态'>
-            <el-select v-model='queryForm.creditStatus' clearable placeholder='请选择授信状态'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditStatus' clearable placeholder='请选择授信状态'>
               <el-option
                 v-for='(item,index) in searchData.creditStatusResponseList'
                 :label='item.creditStatusStr'
@@ -51,7 +51,7 @@
         </template>
         <template v-if='searchData!==null'>
           <el-form-item prop='creditResult' label='审批结果'>
-            <el-select v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
+            <el-select :popper-append-to-body='false' v-model='queryForm.creditResult' clearable placeholder='请选择审批结果'>
               <el-option
                 v-for='(item,index) in searchData.creditStatusResultResponseList'
                 :label='item.creditResultStr'

src/views/credit/pre.vue

@@ -14,7 +14,7 @@
           <el-input v-model='queryForm.mobile' clearable placeholder='请输入客户手机号码' />
         </el-form-item>
         <el-form-item v-if='searchData!==null' prop='preStatus' label='授信状态'>
-          <el-select v-model='queryForm.preStatus' clearable placeholder='请选择授信状态'>
+          <el-select :popper-append-to-body='false' v-model='queryForm.preStatus' clearable placeholder='请选择授信状态'>
             <el-option
               v-for='(item,index) in searchData.preStatusList'
               :label='item.preStatusStr'

src/views/loan/components/check.vue

@@ -4,13 +4,13 @@
     :title='title'
     :visible.sync='visible'
     :destroy-on-close='true'
-    :append-to-body='true'
-    :before-close='handleClose'
     :close-on-click-modal='false'
+    :append-to-body='false'
+    :before-close='handleClose'
     width='30%'>
-    <div class='page'>
-      <el-form ref='form' :model='form' :rules='rules' label-width='100px' class='form-inline'
-               label-suffix=':'>
+    <div>
+      <el-form ref='form' :model='form' :rules='rules' label-width='100px' label-suffix=':'>
+
         <el-form-item label='客户名称'>
           <span>{{ form.clientName }}</span>
         </el-form-item>
@@ -21,19 +21,20 @@
           <el-input v-model='form.memo' type='textarea' clearable placeholder='请输入' />
         </el-form-item>
 
-        <template v-if='searchData!==null && payChannelApiResponses.length'>
+        <template v-if='searchData!==null && payChannelApiResponses.length && type==="confirm"'>
           <el-form-item prop='payChannelApi' label='放款渠道'>
-            <el-select v-model='form.payChannelApi' style='width: 100%;' clearable placeholder='请选择放款渠道'>
-              <el-option
-                v-for='(item,index) in payChannelApiResponses'
+
+            <el-radio-group v-model='form.payChannelApi'>
+              <el-radio
+                v-for='(p,index) in payChannelApiResponses'
                 :key='index'
-                :label='item.payChannelApiStr'
-                :value='item.payChannelApi'></el-option>
+                :label='p.payChannelApi'>
+                {{ p.payChannelApiStr }}
+              </el-radio>
+            </el-radio-group>
 
-            </el-select>
           </el-form-item>
         </template>
-
       </el-form>
     </div>
     <div slot='footer' class='dialog-footer'>
@@ -45,7 +46,6 @@
 
 <script>
   import API from '@/server/api'
-  import _ from 'lodash'
   import { mapGetters } from 'vuex'
 
   export default {
@@ -66,6 +66,7 @@
     },
     data() {
       return {
+
         rules: {
           payChannelApi: [
             {
@@ -101,7 +102,7 @@
     },
     created() {
       if (this.item !== null) {
-        const { realName,loanSign, loanAmount, type, currentAction, orderNo, stepsNo } = this.item
+        const { realName, loanSign, loanAmount, type, currentAction, orderNo, stepsNo } = this.item
         this.type = type
         this.form.clientName = realName
         this.form.loanAmount = loanAmount
@@ -117,7 +118,6 @@
         })
 
         this.payChannelApiResponses = payChannel
-
       }
     },
     methods: {
@@ -150,8 +150,6 @@
               this.$emit('callback')
               this.$emit("handleClose")
             }
-
-
           }
         })
       }
@@ -159,27 +157,5 @@
     }
   }
 </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

@@ -49,6 +49,11 @@
       </el-descriptions>
     </template>
 
+
+    <!--其它信息-->
+    <user-other-info :is-loan='isLoan' :info='detail' />
+
+
     <!--资金方-->
     <template v-if='capitalName!==null'>
       <block-header title='资方信息' />
@@ -99,8 +104,6 @@
       </el-descriptions>
     </template>
 
-    <!--其它信息-->
-    <user-other-info :is-loan='isLoan' :info='detail' />
 
 
     <!--操作日志-->

src/views/loan/list.vue

@@ -20,7 +20,7 @@
         <template v-if='searchData!==null'>
 
           <el-form-item prop='capitalCodeLoanSign' label='资金渠道'>
-            <el-select v-model='queryForm.capitalCodeLoanSign' style='width: 100%;' clearable>
+            <el-select v-model='queryForm.capitalCodeLoanSign' :popper-append-to-body='false' style='width: 100%;' clearable>
               <el-option
                 v-for='(item,index) in searchData.financierResponseList'
                 :key='index'