Merge branch 'master' of http://git.cc-lotus.info/financial_platform/finance-cms

src/layout/intelligentDocking/intelligentDockingFollowDetails.vue

@@ -5,10 +5,10 @@
         <el-col :span="24">
           <el-form ref="form" :model="form" label-width="160px">
             <el-form-item label="客户姓名：">
-              <span>{{ form.company.person }}</span>
+              <span>{{ form.intelligent.person }}</span>
             </el-form-item>
             <el-form-item label="客户联系方式：">
-              <span>{{ form.company.phone }}</span>
+              <span>{{ form.intelligent.phone }}</span>
             </el-form-item>
             <el-form-item label="客户所属企业名称：">
               <span>{{ form.company.company_name }}</span>
@@ -24,7 +24,7 @@
             </el-form-item>
 
             <el-form-item label="融资金额（万元）：">
-              <span>{{ form.money }}</span>
+              <span>{{ form.intelligent.money }}</span>
             </el-form-item>
             <el-form-item label="对接产品：">
               <span>{{ form.finance_claims.name }}</span>
@@ -32,19 +32,24 @@
             <el-form-item label="担保方式：">
               <span>{{ form.dictionary.name }}</span>
             </el-form-item>
+            <el-form-item label="补充信息：">
+              <span>{{ form.intelligent.additional_information }}</span>
+            </el-form-item>
 
             <el-form-item label="放款金额(万元)：">
-              <span style="color: red">{{ form.follow.credit_money}}</span>
+              <span style="color: red">{{ form.credit_money}}</span>
             </el-form-item>
             <el-form-item label="放款期限（个月）：">
-              <span style="color: red">{{ form.follow.sxhowlong}}</span>
+              <span style="color: red">{{ form.sxhowlong}}</span>
             </el-form-item>
             <el-form-item label="本行对应信贷产品：">
-              <span style="color: red">{{ form.follow.sxcpname}}</span>
+              <span style="color: red">{{ form.sxcpname}}</span>
             </el-form-item>
             <el-form-item label="放款利率（%）：">
-              <span style="color: red">{{ form.follow.sxcplilue }}</span>
+              <span style="color: red">{{ form.sxcplilue }}</span>
             </el-form-item>
+
+
             <!--<el-form-item label="融资期限(个月)：">-->
               <!--<span>{{ form.claims_min_term }}个月~{{ form.claims_max_term }}个月</span>-->
             <!--</el-form-item>-->
@@ -54,18 +59,20 @@
             <!--<el-form-item label="预计何时有融资需求：">-->
               <!--<span>{{ form.when.name }}</span>-->
             <!--</el-form-item>-->
-            <el-form-item label="补充信息：">
-              <span>{{ form.additional_information }}</span>
-            </el-form-item>
+
 
             <el-form-item>
-              <span v-if="form.follow.creditStatus == '0'">
+              <!--<span v-if="form.follow.creditStatus == '0'">-->
+              <span v-if="form.creditStatus == '0'">
                 <el-button type="primary" @click="shouxin">审核</el-button>
-                  <el-button type="danger" size="large" @click.prevent="deleteRow({fid:form.follow._id,intelligentId:form._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>
+                  <!--<el-button type="danger" size="large" @click.prevent="deleteRow({fid:form.follow._id,intelligentId:form._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>-->
+                  <el-button type="danger" size="large" @click.prevent="deleteRow({fid:form._id,intelligentId:form.intelligent._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>
               </span>
-              <span v-if="form.follow.creditStatus == '2'">
+              <!--<span v-if="form.follow.creditStatus == '2'">-->
+              <span v-if="form.creditStatus == '2'">
                 <el-button type="primary" @click="shouxin">放款</el-button>
-                  <el-button type="danger" size="large" @click.prevent="deleteRow({fid:form.follow._id,intelligentId:form._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>
+                  <!--<el-button type="danger" size="large" @click.prevent="deleteRow({fid:form.follow._id,intelligentId:form._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>-->
+                  <el-button type="danger" size="large" @click.prevent="deleteRow({fid:form._id,intelligentId:form.intelligent._id,refuse_times:form.refuse_times,uid:form.uid})">拒绝</el-button>
               </span>
             </el-form-item>
           </el-form>
@@ -99,7 +106,10 @@
     <el-dialog title="拒绝" :visible.sync="dialogFormVisible" :show-close="false" :destroy-on-close="true">
       <el-form :model="dockForm">
         <el-form-item label="拒绝理由">
-          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="dockForm.reason"></el-input>
+          <!--<el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="dockForm.reason"></el-input>-->
+          <el-select v-model="dockForm.reason" placeholder="请选择拒绝理由" style="width:100%">
+            <el-option v-for="(item, index) in dellist" :key="index" :value="item"> </el-option>
+          </el-select>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -157,6 +167,16 @@ export default {
     // shouxinDialog: false,
     formLabelWidth: '130px',
     dialogFormVisible: false,
+    dellist:[
+      '基础信息不符:借款人基础信息如经营年限、相关资质等不符合我行相关产品',
+      '信息弄虚作假:填写申请贷款时借款人对资料进行作假',
+      '高危禁入行业:本行认定高危禁入行业',
+      '法律纠纷:借款人身负法律纠纷，尤其是经济纠纷',
+      '不良征信记录:借款人存在不良信贷记录，且不符合我行准入标准',
+      '还款能力不足:根据借款人实际经营情况无偿还贷款能力',
+      '缺乏担保方式:抵质押物不符合我行标准或不足值',
+      '其他原因:除上述外其他原因'
+    ],
   }),
   created() {},
   computed: {},

src/layout/intelligentDocking/intelligentDockingFollowList.vue

@@ -11,6 +11,8 @@
             </template>
           </el-table-column>
 
+          <!--<el-table-column property="finance_claims.name" label="对接产品" align="center"> </el-table-column>-->
+          <!--<el-table-column property="institution.name" label="对接机构" align="center"> </el-table-column>-->
           <el-table-column property="intelligent.money" label="融资金额(万元)" align="center"> </el-table-column>
           <!--<el-table-column label="利率范围" align="center">-->
             <!--<template slot-scope="scope">-->

src/layout/intelligentDocking/intelligentDockingList.vue

@@ -7,11 +7,11 @@
           <!--<el-table-column property="company.company_name" label="企业名称" align="center"> </el-table-column>-->
           <el-table-column label="企业名称" align="center">
             <template slot-scope="scope">
-              <span class="hand" @click="$router.push({ path: '/intelligentDocking/intelligentDockingDetail', query: { id: scope.row._id, cid: scope.row.cid } })">{{ scope.row.company.company_name}}</span>
+              <span class="hand" @click="$router.push({ path: '/intelligentDocking/intelligentDockingDetail', query: { id: scope.row._id } })">{{ scope.row.company.company_name}}</span>
             </template>
           </el-table-column>
-          <el-table-column property="finance_claims.name" label="对接产品" align="center"> </el-table-column>
-          <el-table-column property="institution.name" label="对接机构" align="center"> </el-table-column>
+          <!--<el-table-column property="finance_claims.name" label="对接产品" align="center"> </el-table-column>-->
+          <!--<el-table-column property="institution.name" label="对接机构" align="center"> </el-table-column>-->
           <el-table-column property="money" label="融资金额(万元)" align="center"> </el-table-column>
 
           <el-table-column label="需求状态" align="center">

src/layout/intelligentDocking/intelligentForm.vue

@@ -10,28 +10,32 @@
             <span>{{ ruleForm.phone }}</span>
           </el-form-item>
           <el-form-item label="客户所属企业名称：">
-            <span>{{ ruleForm.company.company_name }}</span>
+            <span>{{ ruleForm.company  ? ruleForm.company.company_name : '' }}</span>
           </el-form-item>
           <el-form-item label="企业法人：">
-            <span>{{ ruleForm.company.person }}</span>
+            <span>{{ ruleForm.company  ? ruleForm.company.person : '' }}</span>
           </el-form-item>
           <el-form-item label="企业注册资金：">
-            <span>{{ ruleForm.company.capital }}</span>
+            <span>{{ ruleForm.company  ? ruleForm.company.capital : ''}}</span>
           </el-form-item>
           <el-form-item label="资料（企业报告）：">
             <el-link :href="'https://jlxwjr.jljrkg.com/files/financial/custom/20200510160327.docx'" :underline="false">企业报告导出模板-长春企业 </el-link>
           </el-form-item>
-          <!--<el-form-item label="融资取向：" >-->
-          <!--<span>{{ruleForm.orientation}}</span>-->
-          <!--</el-form-item>-->
+          <el-form-item label="企业证照信息：">
+            <el-button type="primary" @click="bigPhoto(ruleForm.company.business_license)">点击查看企业证照信息</el-button>
+<!--            <el-image  :src="getThumb(ruleForm.company.business_license)"></el-image>-->
+          </el-form-item>
+<!--          <el-form-item label="融资取向：" >-->
+<!--          <span>{{ruleForm.orientation}}</span>-->
+<!--          </el-form-item>-->
           <el-form-item label="融资金额（万元）：">
             <span>{{ ruleForm.money }}</span>
           </el-form-item>
           <el-form-item label="对接产品：">
-            <span>{{ ruleForm.finance_claims.name }}</span>
+            <span>{{ ruleForm.finance_claims  ? ruleForm.finance_claims.name : '' }}</span>
           </el-form-item>
           <el-form-item label="对接银行：" >
-          <span>{{ruleForm.institution.name}}</span>
+          <span>{{ ruleForm.institution  ? ruleForm.institution.name : ''}}</span>
           </el-form-item>
           <!--<el-form-item label="融资期限(个月)：">-->
             <!--<span>{{ ruleForm.claims_min_term }}个月~{{ ruleForm.claims_max_term }}个月</span>-->
@@ -40,7 +44,7 @@
             <!--<span>{{ ruleForm.mongey_min_rate }}%~{{ ruleForm.mongey_max_rate }}%</span>-->
           <!--</el-form-item>-->
           <el-form-item label="担保方式：">
-            <span>{{ ruleForm.dictionary.name }}</span>
+            <span>{{ ruleForm.dictionary  ? ruleForm.dictionary.name : ''}}</span>
           </el-form-item>
           <!--<el-form-item label="预计何时有融资需求：">-->
             <!--<span>{{ ruleForm.when.name }}</span>-->
@@ -51,16 +55,16 @@
 
 
           <el-form-item label="放款金额(万元)：">
-            <span style="color: red">{{ ruleForm.follow.credit_money}}</span>
+            <span style="color: red">{{ ruleForm.follow  ? ruleForm.follow.credit_money : ''}}</span>
           </el-form-item>
           <el-form-item label="放款期限（个月）：">
-            <span style="color: red">{{ ruleForm.follow.sxhowlong}}</span>
+            <span style="color: red">{{ ruleForm.follow  ? ruleForm.follow.sxhowlong : '' }}</span>
           </el-form-item>
           <el-form-item label="放款产品：">
-            <span style="color: red">{{ ruleForm.follow.sxcpname}}</span>
+            <span style="color: red">{{ ruleForm.follow  ? ruleForm.follow.sxcpname : ''}}</span>
           </el-form-item>
           <el-form-item label="放款利率（%）：">
-            <span style="color: red">{{ ruleForm.follow.sxcplilue }}</span>
+            <span style="color: red">{{ ruleForm.follow  ? ruleForm.follow.sxcplilue : '' }}</span>
           </el-form-item>
 
           <el-form-item v-if="saw == '1'">
@@ -85,6 +89,12 @@
         <el-button type="primary" @click="zhipaiformBtn">确 定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+            :visible.sync="centerDialogVisible"
+            width="45%"
+            center>
+      <el-image  :src="url"></el-image>
+    </el-dialog>
   </div>
 </template>
 
@@ -100,7 +110,10 @@ export default {
     jlList: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    centerDialogVisible:false,
+    url:'',
+  }),
   created() {},
   computed: {},
   methods: {
@@ -113,6 +126,13 @@ export default {
     quxiao() {
       this.$emit('quxiao');
     },
+    getThumb(url){
+      return'data:image/png;base64,'+url;
+    },
+    bigPhoto(url){
+      this.centerDialogVisible = true;
+      this.url = this.getThumb(url);
+    }
   },
 };
 </script>

src/views/intelligentDocking/intelligentDockingFollow.vue

@@ -68,6 +68,7 @@ export default {
     ...intelligentFollow(['credit', 'getFollowList']),
     ...intelligentDocking(['refuseDocking']),
     async searchInfo({ skip = 1, limit = 10, userid = this.user.uid } = {}) {
+      console.log('uid=======',this.user.uid )
       const res = await this.getFollowList({ skip, limit, userid });
       this.$set(this, `debtTable`, res.data.res);
       this.$set(this, `total`, res.data.total);

src/views/intelligentDocking/intelligentDockingFollowDetail.vue

@@ -95,12 +95,15 @@
     },
     methods: {
       ...intelligentDocking(['dockingSearch','refuseDocking']),
-      ...intelligentFollow(['credit']),
+      ...intelligentFollow(['credit','getFollowList']),
       // 查询详情
       async searchInfo() {
         if (this.intelligentId) {
-          const res = await this.dockingSearch({ id: this.intelligentId });
-          for (const val of res.result) {
+          // const res = await this.dockingSearch({ id: this.intelligentId });
+          const res = await this.getFollowList({ followId: this.intelligentId });
+          console.log('=====================',res.data.res)
+
+          for (const val of res.data.res) {
             this.$set(this, `form`, val);
           }
         }

vue.config.js

@@ -48,6 +48,12 @@ module.exports = {
                 changeOrigin: true,
                 ws: true,
             },
+            // '/api': {
+            //     // target: 'http://free.liaoningdoupo.com',
+            //     target: 'https://jlxwjr.jljrkg.com',
+            //     changeOrigin: true,
+            //     ws: true,
+            // },
         },
     },
 };