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

src/layout/intelligentDocking/intelligentDockingFinishDetails.vue

@@ -10,29 +10,36 @@
             <el-form-item label="联系人：">
               <span>{{ form.person }}</span>
             </el-form-item>
+
             <el-form-item label="融资金额（万元）：">
-              <span>{{ form.money }}</span>
+            <span>{{ form.money }}</span>
             </el-form-item>
-            <el-form-item label="授信金融（万元）：">
-              <span>{{ form.follow.credit_money }}</span>
+            <el-form-item label="对接银行：">
+              <span>{{ form.institution.name }}</span>
             </el-form-item>
-            <el-form-item label="融资期限(个月)：">
-              <span>{{ form.claims_min_term }}个月~{{ form.claims_max_term }}个月</span>
+            <el-form-item label="对接产品：">
+              <span>{{ form.finance_claims.name }}</span>
             </el-form-item>
-            <el-form-item label="融资利率：">
-              <span>{{ form.mongey_min_rate }}%~{{ form.mongey_max_rate }}%</span>
+            <el-form-item label="授信金融（万元）：">
+              <span>{{ form.follow.credit_money }}</span>
             </el-form-item>
+            <!--<el-form-item label="融资期限(个月)：">-->
+              <!--<span>{{ form.claims_min_term }}个月~{{ form.claims_max_term }}个月</span>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="融资利率：">-->
+              <!--<span>{{ form.mongey_min_rate }}%~{{ form.mongey_max_rate }}%</span>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="预计何时有融资需求：">-->
+              <!--<span>{{ form.when.name }}</span>-->
+            <!--</el-form-item>-->
             <el-form-item label="担保方式：">
               <span>{{ form.dictionary.name }}</span>
             </el-form-item>
-            <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 label="对接产品：">
-              <span>{{ form.finance_claims.name }}</span>
+            <el-form-item label="企业信用报告：">
+              <!--<span>点击下载</span>-->
             </el-form-item>
           </el-form>
         </el-col>

src/layout/intelligentDocking/intelligentDockingFinishList.vue

@@ -4,20 +4,26 @@
       <el-col :span="24">
         <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="intelligent.company_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">
+          <!--<el-table-column property="intelligent.company_name" label="企业名称" align="center"> </el-table-column>-->
+          <el-table-column label="企业名称" align="center">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.intelligent.mongey_min_rate }}%~{{ scope.row.intelligent.mongey_max_rate }}%</span>
+              <span class="hand" @click="$router.push({ path: '/intelligentDocking/intelligentDockingFinishDetail', query: { intelligentId: scope.row.intelligentId } })">{{ scope.row.intelligent.company_name}}</span>
             </template>
           </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">-->
+              <!--<span style="margin-left: 10px">{{ scope.row.intelligent.mongey_min_rate }}%~{{ scope.row.intelligent.mongey_max_rate }}%</span>-->
+            <!--</template>-->
+          <!--</el-table-column>-->
           <el-table-column label="当前状态" align="center">
             <template slot-scope="scope">
               <span style="margin-left: 10px">{{
                 scope.row.creditStatus == '0'
-                  ? '接单'
+                  ? '已接单'
                   : scope.row.creditStatus == '1'
-                  ? '已完成'
+                  ? '已放款'
                   : scope.row.creditStatus == '2'
                   ? '已审批'
                   : scope.row.creditStatus == '3'

src/layout/intelligentDocking/intelligentDockingFollowDetails.vue

@@ -13,63 +13,107 @@
             <el-form-item label="融资金额（万元）：">
               <span>{{ form.money }}</span>
             </el-form-item>
-            <el-form-item label="融资期限(个月)：">
-              <span>{{ form.claims_min_term }}个月~{{ form.claims_max_term }}个月</span>
-            </el-form-item>
-            <el-form-item label="融资利率：">
-              <span>{{ form.mongey_min_rate }}%~{{ form.mongey_max_rate }}%</span>
+            <el-form-item label="对接产品：">
+              <span>{{ form.finance_claims.name }}</span>
             </el-form-item>
             <el-form-item label="担保方式：">
               <span>{{ form.dictionary.name }}</span>
             </el-form-item>
-            <el-form-item label="预计何时有融资需求：">
-              <span>{{ form.when.name }}</span>
-            </el-form-item>
+            <!--<el-form-item label="融资期限(个月)：">-->
+              <!--<span>{{ form.claims_min_term }}个月~{{ form.claims_max_term }}个月</span>-->
+            <!--</el-form-item>-->
+            <!--<el-form-item label="融资利率：">-->
+              <!--<span>{{ form.mongey_min_rate }}%~{{ form.mongey_max_rate }}%</span>-->
+            <!--</el-form-item>-->
+            <!--<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 label="对接产品：">
-              <span>{{ form.finance_claims.name }}</span>
+            <el-form-item label="企业信用报告：">
+              <!--<span>点击下载</span>-->
             </el-form-item>
+
             <el-form-item>
+              <!--<template slot-scope="scope">-->
               <span v-if="form.follow.creditStatus == '0'">
-                <el-button type="primary" @click="shenheBtns">审核</el-button>
+                <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>
               </span>
               <span v-if="form.follow.creditStatus == '2'">
-                <el-button type="primary" @click="shouxinBtns">授信</el-button>
+                <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>
               </span>
+              <!--</template>-->
             </el-form-item>
           </el-form>
         </el-col>
       </el-col>
     </el-row>
-    <el-dialog title="审核" :visible.sync="shenheDialog" :show-close="false">
-      <el-form :model="shenheForm">
-        <el-form-item label="备注" :label-width="formLabelWidth">
-          <el-input v-model="shenheForm.senhemessage" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="shenheOut">取 消</el-button>
-        <el-button type="primary" @click="shenheBtn">确 定</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="授信" :visible.sync="shouxinDialog" :show-close="false" class="demo-ruleForm">
-      <el-form :model="shouxinForm" ref="shouxinForm">
-        <el-form-item
-          label="授信金额"
-          prop="money"
-          :label-width="formLabelWidth"
-          :rules="[{ required: true, message: '金额不能为空' }, , { type: 'number', message: '金额必须为数字值' }]"
-        >
-          <el-input v-model.number="shouxinForm.money" type="text" autocomplete="off" placeholder="请输入授信金额（万元）"></el-input>
+
+    <el-row>
+      <el-dialog title="分配" :visible.sync="dialogFormVisible2" :show-close="false" width="30%">
+        <el-form :model="dialogform">
+          <el-form-item label="放款额度" :label-width="formLabelWidth">
+            <el-input  style="width: 50%" v-model="dialogform.money" autocomplete="off"></el-input>万元
+          </el-form-item>
+          <el-form-item label="放款产品" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxcpname" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="放款期限" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxhowlong" autocomplete="off"></el-input>个月
+          </el-form-item>
+          <el-form-item label="放款利率" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxcplilue" autocomplete="off"></el-input>%
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="quxiao">取 消</el-button>
+          <el-button type="primary" @click="queding">确 定</el-button>
+        </div>
+      </el-dialog>
+    </el-row>
+
+    <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-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="shouxinOut">取 消</el-button>
-        <el-button type="primary" @click="shouxinBtn">确 定</el-button>
+        <el-button @click="dockOut">取 消</el-button>
+        <el-button type="primary" @click="dockDormBtn">确 定</el-button>
       </div>
     </el-dialog>
+    <!--<el-dialog title="审核" :visible.sync="shenheDialog" :show-close="false">-->
+      <!--&lt;!&ndash;<el-form :model="shenheForm">&ndash;&gt;-->
+        <!--&lt;!&ndash;<el-form-item label="备注" :label-width="formLabelWidth">&ndash;&gt;-->
+          <!--&lt;!&ndash;<el-input v-model="shenheForm.senhemessage" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"></el-input>&ndash;&gt;-->
+        <!--&lt;!&ndash;</el-form-item>&ndash;&gt;-->
+      <!--&lt;!&ndash;</el-form>&ndash;&gt;-->
+      <!--<div slot="footer" class="dialog-footer">-->
+        <!--<el-button @click="shenheOut">取 消</el-button>-->
+        <!--<el-button type="primary" @click="shenheBtn">确 定</el-button>-->
+      <!--</div>-->
+    <!--</el-dialog>-->
+
+    <!--<el-dialog title="授信" :visible.sync="shouxinDialog" :show-close="false" class="demo-ruleForm">-->
+      <!--<el-form :model="shouxinForm" ref="shouxinForm">-->
+        <!--<el-form-item-->
+          <!--label="授信金额"-->
+          <!--prop="money"-->
+          <!--:label-width="formLabelWidth"-->
+          <!--:rules="[{ required: true, message: '金额不能为空' }, , { type: 'number', message: '金额必须为数字值' }]"-->
+        <!--&gt;-->
+          <!--<el-input v-model.number="shouxinForm.money" type="text" autocomplete="off" placeholder="请输入授信金额（万元）"></el-input>-->
+        <!--</el-form-item>-->
+      <!--</el-form>-->
+      <!--<div slot="footer" class="dialog-footer">-->
+        <!--<el-button @click="shouxinOut">取 消</el-button>-->
+        <!--<el-button type="primary" @click="shouxinBtn">确 定</el-button>-->
+      <!--</div>-->
+    <!--</el-dialog>-->
   </div>
 </template>
 
@@ -78,50 +122,77 @@ export default {
   name: 'intelligentDockingFollowDetails',
   props: {
     form: null,
-    // shenheDialog: null,
-    shenheForm: null,
-    // shouxinDialog: null,
-    shouxinForm: null,
+    // shenheForm: null,
+    // shouxinForm: null,
+
+    dialogFormVisible2: null,
+    dialogform:null,
+
+    dockForm: null,
   },
   components: {},
   data: () => ({
-    shenheDialog: false,
-    shouxinDialog: false,
+    // shenheDialog: false,
+    // shouxinDialog: false,
     formLabelWidth: '80px',
+    dialogFormVisible: false,
   }),
   created() {},
   computed: {},
   methods: {
-    // 打开审核
-    shenheBtns() {
-      this.shenheDialog = true;
-      this.$emit('shenheBtns');
+    shouxin() {
+      this.$emit('shouxin');
     },
-    // 取消审核
-    shenheOut() {
-      this.shenheDialog = false;
-      this.$emit('shenheOut');
+    quxiao() {
+      this.$emit('quxiao');
     },
-    // 提交审核
-    shenheBtn() {
-      this.$emit('shenheBtn', { data: this.shenheForm });
-      this.shenheDialog = false;
+    queding() {
+      this.$emit('queding', { data: this.dialogform });
     },
-    // 打开授信
-    shouxinBtns() {
-      this.shouxinDialog = true;
-      this.$emit('shouxinBtns');
+    deleteRow(val) {
+      this.dialogFormVisible = true;
+      this.$emit('deleteRow', val);
     },
-    // 取消授信
-    shouxinOut() {
-      this.shouxinDialog = false;
-      this.$emit('shouxinOut');
+    // 拒绝提交按钮
+    dockDormBtn() {
+      this.$emit('dockDormBtn', { data: this.dockForm });
+      this.dialogFormVisible = false;
     },
-    // 提交授信
-    shouxinBtn() {
-      this.$emit('shouxinBtn', { data: this.shouxinForm });
-      this.shouxinDialog = false;
+    // 取消
+    dockOut() {
+      this.dialogFormVisible = false;
+      this.$emit('dockOut');
     },
+    // // 打开审核
+    // shenheBtns() {
+    //   this.shenheDialog = true;
+    //   this.$emit('shenheBtns');
+    // },
+    // // 取消审核
+    // shenheOut() {
+    //   this.shenheDialog = false;
+    //   this.$emit('shenheOut');
+    // },
+    // // 提交审核
+    // shenheBtn() {
+    //   this.$emit('shenheBtn', { data: this.shenheForm });
+    //   this.shenheDialog = false;
+    // },
+    // // 打开授信
+    // shouxinBtns() {
+    //   this.shouxinDialog = true;
+    //   this.$emit('shouxinBtns');
+    // },
+    // // 取消授信
+    // shouxinOut() {
+    //   this.shouxinDialog = false;
+    //   this.$emit('shouxinOut');
+    // },
+    // // 提交授信
+    // shouxinBtn() {
+    //   this.$emit('shouxinBtn', { data: this.shouxinForm });
+    //   this.shouxinDialog = false;
+    // },
   },
 };
 </script>

src/layout/intelligentDocking/intelligentDockingFollowList.vue

@@ -4,22 +4,28 @@
       <el-col :span="24">
         <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="intelligent.company_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">
+          <!--<el-table-column property="intelligent.company_name" label="企业名称" align="center"> </el-table-column>-->
+          <el-table-column label="企业名称" align="center">
             <template slot-scope="scope">
-              <span style="margin-left: 10px">{{ scope.row.intelligent.mongey_min_rate }}%~{{ scope.row.intelligent.mongey_max_rate }}%</span>
+              <span class="hand" @click="$router.push({ path: '/intelligentDocking/intelligentDockingFollowDetail', query: { intelligentId: scope.row.intelligentId, creditStatus: scope.row.creditStatus } })">{{ scope.row.intelligent.company_name}}</span>
             </template>
           </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">-->
+              <!--<span style="margin-left: 10px">{{ scope.row.intelligent.mongey_min_rate }}%~{{ scope.row.intelligent.mongey_max_rate }}%</span>-->
+            <!--</template>-->
+          <!--</el-table-column>-->
           <el-table-column label="当前状态" align="center">
             <template slot-scope="scope">
               <span style="margin-left: 10px">{{
                 scope.row.creditStatus == '0'
-                  ? '接单'
+                  ? '已接单'
                   : scope.row.creditStatus == '1'
-                  ? '已完成'
+                  ? '已放款'
                   : scope.row.creditStatus == '2'
-                  ? '已审批'
+                  ? '已通过'
                   : scope.row.creditStatus == '3'
                   ? '已拒绝'
                   : ' '
@@ -28,12 +34,16 @@
           </el-table-column>
           <el-table-column fixed="right" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button
-                @click="$router.push({ path: '/intelligentDocking/intelligentDockingFollowDetail', query: { intelligentId: scope.row.intelligentId } })"
-                type="text"
-                icon="el-icon-view"
-                title="查看详情"
-              ></el-button>
+              <!--<el-button-->
+                <!--@click="$router.push({ path: '/intelligentDocking/intelligentDockingFollowDetail', query: { intelligentId: scope.row.intelligentId } })"-->
+                <!--type="text"-->
+                <!--icon="el-icon-view"-->
+                <!--title="查看详情"-->
+              <!--&gt;</el-button>-->
+
+              <el-button v-if="scope.row.creditStatus == 0" @click.prevent="tongguosp(scope.row.creditStatus,scope.row._id)" type="text" icon="el-icon-s-help" title="通过"></el-button>
+              <el-button v-if="scope.row.creditStatus == 2" @click.prevent="tongguosp(scope.row.creditStatus,scope.row._id)" type="text" icon="el-icon-s-check" title="放款"></el-button>
+
               <span v-if="scope.row.intelligent.refuse_times != '3'">
                 <el-button @click.prevent="deleteRow(scope.row)" type="text" icon="el-icon-warning-outline" title="拒绝"></el-button>
               </span>
@@ -53,17 +63,42 @@
         </el-row>
       </el-col>
     </el-row>
-    <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-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dockOut">取 消</el-button>
-        <el-button type="primary" @click="dockDormBtn">确 定</el-button>
-      </div>
-    </el-dialog>
+
+    <el-row>
+      <el-dialog title="分配" :visible.sync="dialogFormVisible2" :show-close="false" width="30%">
+        <el-form :model="dialogform">
+          <el-form-item label="放款额度" :label-width="formLabelWidth">
+            <el-input  style="width: 50%" v-model="dialogform.money" autocomplete="off"></el-input>万元
+          </el-form-item>
+          <el-form-item label="放款产品" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxcpname" autocomplete="off"></el-input>
+          </el-form-item>
+          <el-form-item label="放款期限" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxhowlong" autocomplete="off"></el-input>个月
+          </el-form-item>
+          <el-form-item label="放款利率" :label-width="formLabelWidth">
+            <el-input style="width: 50%" v-model="dialogform.sxcplilue" autocomplete="off"></el-input>%
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="quxiao">取 消</el-button>
+          <el-button type="primary" @click="queding">确 定</el-button>
+        </div>
+      </el-dialog>
+
+      <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-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="dockOut">取 消</el-button>
+          <el-button type="primary" @click="dockDormBtn">确 定</el-button>
+        </div>
+      </el-dialog>
+    </el-row>
+
   </div>
 </template>
 
@@ -74,11 +109,15 @@ export default {
     debtTable: null,
     total: null,
     dockForm: null,
+    dialogform:null,
+    dialogFormVisible2: null,
+
   },
   components: {},
   data: () => ({
     currentPage: 1,
     dialogFormVisible: false,
+    formLabelWidth: '80px',
   }),
   created() {},
   computed: {},
@@ -104,6 +143,16 @@ export default {
       this.dialogFormVisible = false;
       this.$emit('dockOut');
     },
+    tongguosp(creditStatus,followid) {
+      console.log(creditStatus,followid)
+      this.$emit('tongguosp', creditStatus,followid);
+    },
+    quxiao() {
+      this.$emit('quxiao');
+    },
+    queding() {
+      this.$emit('queding', { data: this.dialogform });
+    },
   },
 };
 </script>
@@ -113,7 +162,12 @@ export default {
   text-align: center;
   padding: 15px 0;
 }
-/deep/.el-dialog__footer {
-  text-align: center;
+/*/deep/.el-dialog__footer {*/
+  /*text-align: center;*/
+/*}*/
+.hand:hover{
+  cursor: pointer;
+  color: dodgerblue;
+  margin-left: 10px;
 }
 </style>

src/layout/intelligentDocking/intelligentDockingForm.vue

@@ -9,33 +9,33 @@
           <el-form-item label="联系人：">
             <span>{{ ruleForm.person }}</span>
           </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.claims_min_term }}个月~{{ ruleForm.claims_max_term }}个月</span>
+          <el-form-item label="对接产品：">
+            <span>{{ ruleForm.finance_claims.name }}</span>
           </el-form-item>
-          <el-form-item label="融资利率：">
-            <span>{{ ruleForm.mongey_min_rate }}%~{{ ruleForm.mongey_max_rate }}%</span>
+          <el-form-item label="对接银行：" >
+          <span>{{ruleForm.institution.name}}</span>
           </el-form-item>
           <el-form-item label="担保方式：">
             <span>{{ ruleForm.dictionary.name }}</span>
           </el-form-item>
-          <el-form-item label="预计何时有融资需求：">
-            <span>{{ ruleForm.when.name }}</span>
-          </el-form-item>
+          <!--<el-form-item label="融资期限(个月)：">-->
+            <!--<span>{{ ruleForm.claims_min_term }}个月~{{ ruleForm.claims_max_term }}个月</span>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="融资利率：">-->
+            <!--<span>{{ ruleForm.mongey_min_rate }}%~{{ ruleForm.mongey_max_rate }}%</span>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="预计何时有融资需求：">-->
+            <!--<span>{{ ruleForm.when.name }}</span>-->
+          <!--</el-form-item>-->
           <el-form-item label="补充信息：">
             <span>{{ ruleForm.additional_information }}</span>
           </el-form-item>
-          <el-form-item label="对接产品：">
-            <span>{{ ruleForm.finance_claims.name }}</span>
+          <el-form-item label="企业信用报告：">
+            <!--<span>点击下载</span>-->
           </el-form-item>
-          <!--<el-form-item label="对接银行：" >-->
-          <!--<span>{{ruleForm.institution.name}}</span>-->
-          <!--</el-form-item>-->
           <el-form-item>
             <el-button type="primary" size="small" @click="shouxin()">授信</el-button>
           </el-form-item>

src/layout/intelligentDocking/intelligentDockingList.vue

@@ -4,58 +4,70 @@
       <el-col :span="24">
         <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
           <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="company.company_name" label="企业名称" align="center"> </el-table-column>
+          <!--<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>
+            </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="money" label="融资金额(万元)" align="center"> </el-table-column>
-          <el-table-column v-if="follow" label="需求状态" align="center">已接单 </el-table-column>
-          <el-table-column v-else label="需求状态" align="center">已推送 </el-table-column>
+          <el-table-column label="需求状态" align="center">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{
+                scope.row.follow
+                  ? '已处理'
+                  : '待处理'
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column fixed="right" label="操作" align="center">
             <template slot-scope="scope">
-              <el-button
-                @click="$router.push({ path: '/intelligentDocking/intelligentDockingDetail', query: { id: scope.row._id, cid: scope.row.cid } })"
-                type="text"
-                icon="el-icon-search"
-                title="查看详情"
-              ></el-button>
+              <!--<el-button-->
+                <!--@click="$router.push({ path: '/intelligentDocking/intelligentDockingDetail', query: { id: scope.row._id, cid: scope.row.cid } })"-->
+                <!--type="text"-->
+                <!--icon="el-icon-search"-->
+                <!--title="查看详情"-->
+              <!--&gt;</el-button>-->
               <el-button @click="zhipai(scope.row._id)" type="text" icon="el-icon-s-promotion" title="分配"></el-button>
             </template>
           </el-table-column>
         </el-table>
         <el-row class="page">
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="10"
-            layout="total, prev, pager, next, jumper"
-            :total="total"
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="10"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total"
           >
           </el-pagination>
         </el-row>
       </el-col>
-      <el-row>
-        <el-dialog title="分配" :visible.sync="dialogFormVisible" :show-close="false">
-          <el-form :model="zhipaiform">
-            <el-form-item label="客户经理">
-              <el-select v-model="zhipaiform.uuid" placeholder="请选客户经理">
-                <el-option v-for="(item, index) in jlList" :key="index" :label="item.name" :value="item.id"> </el-option>
-              </el-select>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="quxiao">取 消</el-button>
-            <el-button type="primary" @click="zhipaiformBtn">确 定</el-button>
-          </div>
-        </el-dialog>
-      </el-row>
+    </el-row>
+    <el-row>
+      <el-dialog title="分配" :visible.sync="dialogFormVisible" :show-close="false">
+        <el-form :model="zhipaiform">
+          <el-form-item label="客户经理">
+            <el-select v-model="zhipaiform.uuid" placeholder="请选客户经理">
+              <el-option v-for="(item, index) in jlList" :key="index" :label="item.name" :value="item.id"> </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button @click="quxiao">取 消</el-button>
+          <el-button type="primary" @click="zhipaiformBtn">确 定</el-button>
+        </div>
+      </el-dialog>
     </el-row>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'claimList',
+  name: 'intelligentDockingList',
   props: {
     debtTable: null,
     total: null,
@@ -70,12 +82,12 @@ export default {
   created() {},
   computed: {},
   methods: {
-    deleteRow(id) {
-      this.$emit('deleteRow', id);
-    },
-    clickRest(id) {
-      this.$emit('clickRest', id);
-    },
+    // deleteRow(id) {
+    //   this.$emit('deleteRow', id);
+    // },
+    // clickRest(id) {
+    //   this.$emit('clickRest', id);
+    // },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },

src/layout/intelligentDocking/intelligentForm.vue

@@ -15,32 +15,35 @@
           <el-form-item label="融资金额（万元）：">
             <span>{{ ruleForm.money }}</span>
           </el-form-item>
-          <el-form-item label="融资期限(个月)：">
-            <span>{{ ruleForm.claims_min_term }}个月~{{ ruleForm.claims_max_term }}个月</span>
+          <el-form-item label="对接产品：">
+            <span>{{ ruleForm.finance_claims.name }}</span>
           </el-form-item>
-          <el-form-item label="融资利率：">
-            <span>{{ ruleForm.mongey_min_rate }}%~{{ ruleForm.mongey_max_rate }}%</span>
+          <el-form-item label="对接银行：" >
+          <span>{{ruleForm.institution.name}}</span>
           </el-form-item>
+          <!--<el-form-item label="融资期限(个月)：">-->
+            <!--<span>{{ ruleForm.claims_min_term }}个月~{{ ruleForm.claims_max_term }}个月</span>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="融资利率：">-->
+            <!--<span>{{ ruleForm.mongey_min_rate }}%~{{ ruleForm.mongey_max_rate }}%</span>-->
+          <!--</el-form-item>-->
           <el-form-item label="担保方式：">
             <span>{{ ruleForm.dictionary.name }}</span>
           </el-form-item>
-          <el-form-item label="预计何时有融资需求：">
-            <span>{{ ruleForm.when.name }}</span>
-          </el-form-item>
+          <!--<el-form-item label="预计何时有融资需求：">-->
+            <!--<span>{{ ruleForm.when.name }}</span>-->
+          <!--</el-form-item>-->
           <el-form-item label="补充信息：">
             <span>{{ ruleForm.additional_information }}</span>
           </el-form-item>
-          <el-form-item label="对接产品：">
-            <span>{{ ruleForm.finance_claims.name }}</span>
+          <el-form-item label="企业信用报告：">
+            <!--<span>点击下载</span>-->
           </el-form-item>
-          <!--<el-form-item label="对接银行：" >-->
-          <!--<span>{{ruleForm.institution.name}}</span>-->
-          <!--</el-form-item>-->
           <el-form-item v-if="saw == '1'">
             <el-button type="primary" size="small" @click="fallow">分配</el-button>
           </el-form-item>
           <el-form-item v-else>
-            <el-button type="info" size="small">已分配</el-button>
+            <el-button type="info" size="small">已匹配</el-button>
           </el-form-item>
         </el-form>
       </el-col>

src/views/intelligentDocking/intelligentDockingFollow.vue

@@ -17,6 +17,11 @@
             @deleteRow="deleteRow"
             @dockDormBtn="dockDormBtn"
             @dockOut="dockOut"
+            :dialogFormVisible2="dialogFormVisible2"
+            :dialogform="dialogform"
+            @queding = "queding"
+            @tongguosp="tongguosp"
+            @quxiao="quxiao"
           ></intelligentDockingFollowList>
         </el-col>
       </el-col>
@@ -48,6 +53,9 @@ export default {
     dockForm: {},
     // 拒绝当前数据
     jujueInfo: {},
+    dialogFormVisible2: false,
+    dialogform:{},
+    zhuangtaiid:'',
   }),
   created() {
     this.searchInfo();
@@ -56,7 +64,7 @@ export default {
     ...mapState(['user']),
   },
   methods: {
-    ...intelligentFollow(['getFollowList']),
+    ...intelligentFollow(['credit', 'getFollowList']),
     ...intelligentDocking(['refuseDocking']),
     async searchInfo({ skip = 1, limit = 10, userid = this.user.uid } = {}) {
       const res = await this.getFollowList({ skip, limit, userid });
@@ -75,6 +83,7 @@ export default {
     },
     // 拒接按钮
     deleteRow(val) {
+      console.log('jujue', val)
       this.$set(this, `jujueInfo`, val);
     },
     // 拒绝提交按钮
@@ -101,6 +110,60 @@ export default {
     dockOut() {
       this.dockForm = {};
     },
+    // 通过
+    async tongguosp(creditStatus,followid) {
+      this.zhuangtaiid=followid;
+      if (creditStatus == 0) {
+        this.$confirm('此操作将通过审批, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.finalshenhe("审批通过");
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          });
+        });
+      } else if (creditStatus == 2) {
+        this.dialogFormVisible2 = true;
+      }
+    },
+    // 取消
+    quxiao() {
+      this.dialogform={};
+      this.dialogFormVisible2 = false;
+    },
+    // 确定
+    async queding({ data }) {
+      if(!data.money){
+        alert("请输入金额");
+        return;
+      }
+      if(!data.sxcpname){
+        alert("产品名称");
+        return;
+      }
+      if(!data.sxhowlong){
+        alert("请输入产品期限");
+        return;
+      }
+      if(!data.sxcplilue){
+        alert("请输入产品利率");
+        return;
+      }
+      const res = await this.credit({ id: this.zhuangtaiid, money: data.money,sxcpname:data.sxcpname,sxhowlong:data.sxhowlong,sxcplilue:data.sxcplilue, creditStatus: '1' });
+      this.$checkRes(res, '授信成功', '授信失败');
+      this.dialogform={};
+      this.dialogFormVisible2 = false;
+      this.searchInfo();
+    },
+    async finalshenhe(value) {
+      const res = await this.credit({ id: this.zhuangtaiid, senhemessage: value, creditStatus: '2' });
+      this.$checkRes(res, '通过成功', '通过失败');
+      this.searchInfo();
+    },
     // 分頁
     async pagechange(data) {
       var skip = data.skip;

src/views/intelligentDocking/intelligentDockingFollowDetail.vue

@@ -11,17 +11,30 @@
           </el-col>
           <el-col :span="24">
             <intelligentDockingFollowDetails
-              :form="form"
-              :shenheForm="shenheForm"
-              @shenheBtns="shenheBtns"
-              @shenheOut="shenheOut"
-              @shenheBtn="shenheBtn"
-              :shouxinForm="shouxinForm"
-              :shouxinDialog="shouxinDialog"
-              @shouxinBtns="shouxinBtns"
-              @shouxinOut="shouxinOut"
-              @shouxinBtn="shouxinBtn"
+                    :form="form"
+                    :creditStatus="finorcredit"
+                    @shouxin="shouxin"
+                    :dialogFormVisible2="dialogFormVisible2"
+                    :dialogform="dialogform"
+                    @queding = "queding"
+                    @quxiao="quxiao"
+                    @deleteRow="deleteRow"
+                    :dockForm="dockForm"
+                    @dockDormBtn="dockDormBtn"
+                    @dockOut="dockOut"
             ></intelligentDockingFollowDetails>
+            <!--<intelligentDockingFollowDetails-->
+            <!--:form="form"-->
+            <!--:shenheForm="shenheForm"-->
+            <!--@shenheBtns="shenheBtns"-->
+            <!--@shenheOut="shenheOut"-->
+            <!--@shenheBtn="shenheBtn"-->
+            <!--:shouxinForm="shouxinForm"-->
+            <!--:shouxinDialog="shouxinDialog"-->
+            <!--@shouxinBtns="shouxinBtns"-->
+            <!--@shouxinOut="shouxinOut"-->
+            <!--@shouxinBtn="shouxinBtn"-->
+            <!--&gt;</intelligentDockingFollowDetails>-->
           </el-col>
         </el-col>
       </el-col>
@@ -30,120 +43,217 @@
 </template>
 
 <script>
-import topInfo from '@/layout/common/topInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
-import intelligentDockingFollowDetails from '@/layout/intelligentDocking/intelligentDockingFollowDetails.vue';
-import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
-const { mapActions: intelligentDocking } = createNamespacedHelpers('intelligentDocking');
-const { mapActions: intelligentFollow } = createNamespacedHelpers('intelligentFollow');
-export default {
-  name: 'intelligentDockingFollowDetail',
-  props: {},
-  components: {
-    topInfo, //头部
-    detailTop, //返回
-    intelligentDockingFollowDetails, //详情
-  },
-  data: () => ({
-    topTitle: '银企对接关注详情',
-    display: 'none',
-    form: {
-      company: {},
-      dictionary: {},
-      finance_claims: {},
-      when: {},
-      follow: {},
+  import topInfo from '@/layout/common/topInfo.vue';
+  import detailTop from '@/layout/common/detailTop.vue';
+  import intelligentDockingFollowDetails from '@/layout/intelligentDocking/intelligentDockingFollowDetails.vue';
+  import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
+  const { mapActions: intelligentDocking } = createNamespacedHelpers('intelligentDocking');
+  const { mapActions: intelligentFollow } = createNamespacedHelpers('intelligentFollow');
+  export default {
+    name: 'intelligentDockingFollowDetail',
+    props: {},
+    components: {
+      topInfo, //头部
+      detailTop, //返回
+      intelligentDockingFollowDetails, //详情
     },
-    shenheForm: {},
-    shouxinDialog: false,
-    shouxinForm: {},
-  }),
-  created() {
-    this.searchInfo();
-  },
-  computed: {
-    ...mapState(['user']),
-    intelligentId() {
-      return this.$route.query.intelligentId;
-    },
-  },
-  methods: {
-    ...intelligentDocking(['dockingSearch']),
-    ...intelligentFollow(['credit']),
-    // 查询详情
-    async searchInfo() {
-      if (this.intelligentId) {
-        const res = await this.dockingSearch({ id: this.intelligentId });
-        for (const val of res.result) {
-          this.$set(this, `form`, val);
-        }
-      }
-    },
-    // 打开审核
-    shenheBtns() {
-      // this.shenheDialog = true;
-    },
-    // 取消审核
-    shenheOut() {
-      // this.shenheDialog = false;
-      this.shenheForm = {};
-    },
-    // 提交审核
-    async shenheBtn({ data }) {
-      data.id = this.form.follow._id;
-      data.creditStatus = 2;
-      const res = await this.credit(data);
-      if (res.errcode === 0) {
-        this.$message({
-          message: '审核成功',
-          type: 'success',
-        });
-        this.goBack();
-        this.searchInfo();
-      } else {
-        this.$message.error('审核失败');
-      }
-    },
-    // 打开授信
-    shouxinBtns() {
-      this.shouxinDialog = false;
+    data: () => ({
+      topTitle: '银企对接关注详情',
+      display: 'none',
+      form: {
+        company: {},
+        dictionary: {},
+        finance_claims: {},
+        when: {},
+        follow: {},
+      },
+      // shenheForm: {},
+      // shouxinDialog: false,
+      // shouxinForm: {},
+
+      finorcredit: '',
+      dialogFormVisible2: false,
+      dialogform:{},
+
+      dialogFormVisible: false,
+      dockForm: {},
+      // 拒绝当前数据
+      jujueInfo: {},
+    }),
+    created() {
+      this.searchInfo();
+      this.setorcredit();
     },
-    // 取消授信
-    shouxinOut() {
-      this.shouxinDialog = false;
-      this.shouxinForm = {};
+    computed: {
+      ...mapState(['user']),
+      intelligentId() {
+        return this.$route.query.intelligentId;
+      },
+      creditStatus() {
+        return this.$route.query.creditStatus;
+      },
     },
-    // 提交授信
-    async shouxinBtn({ data }) {
-      data.id = this.form.follow._id;
-      data.creditStatus = 1;
-      const res = await this.credit(data);
-      if (res.errcode === 0) {
-        this.$message({
-          message: '授信成功',
-          type: 'success',
-        });
+    methods: {
+      ...intelligentDocking(['dockingSearch','refuseDocking']),
+      ...intelligentFollow(['credit']),
+      // 查询详情
+      async searchInfo() {
+        if (this.intelligentId) {
+          const res = await this.dockingSearch({ id: this.intelligentId });
+          for (const val of res.result) {
+            this.$set(this, `form`, val);
+          }
+        }
+      },
+      setorcredit() {
+        this.$set(this, `finorcredit`, this.creditStatus);
+      },
+      // 授信
+      async shouxin() {
+        if (this.creditStatus == 0) {
+          this.$confirm('此操作将通过审批, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            this.finalshenhe("审批通过");
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消'
+            });
+          });
+        } else if (this.creditStatus == 2) {
+          this.dialogFormVisible2 = true;
+        }
+      },
+      async finalshenhe(value) {
+        const res = await this.credit({ id: this.form.follow._id, senhemessage: value, creditStatus: '2' });
+        this.$checkRes(res, '审核成功', '审核失败');
         this.goBack();
-        this.searchInfo();
-      } else {
-        this.$message.error('授信失败');
-      }
-    },
-    // 返回
-    goBack() {
-      this.$router.go(-1);
+      },
+      async queding({ data }) {
+        if(!data.money){
+          alert("请输入金额");
+          return;
+        }
+        if(!data.sxcpname){
+          alert("产品名称");
+          return;
+        }
+        if(!data.sxhowlong){
+          alert("请输入产品期限");
+          return;
+        }
+        if(!data.sxcplilue){
+          alert("请输入产品利率");
+          return;
+        }
+        const res = await this.credit({ id: this.form.follow._id,  money: data.money,sxcpname:data.sxcpname,sxhowlong:data.sxhowlong,sxcplilue:data.sxcplilue, creditStatus: '1' });
+        this.$checkRes(res, '授信成功', '授信失败');
+        this.dialogform={};
+        this.dialogFormVisible2 = false;
+        this.$router.go(-1);
+      },
+      quxiao() {
+        this.dialogform={};
+        this.dialogFormVisible2 = false;
+      },
+      // 拒接按钮
+      deleteRow(val) {
+        console.log('jujue', val)
+        this.$set(this, `jujueInfo`, val);
+      },
+      // 拒绝提交按钮
+      async dockDormBtn({ data }) {
+        data.guanzhuid = this.jujueInfo.fid;
+        data.intelligentId = this.jujueInfo.intelligentId;
+        data.userid = this.jujueInfo.uid;
+        if (this.jujueInfo.refuse_times == '3') {
+          data.creditStatus = 3;
+        }
+        const res = await this.refuseDocking(data);
+        if (res.errcode === 0) {
+          this.$message({
+            message: '拒绝成功',
+            type: 'success',
+          });
+          this.dockOut();
+          this.searchInfo();
+        } else {
+          this.$message.error('拒绝失败');
+        }
+      },
+      // 取消
+      dockOut() {
+        this.dockForm = {};
+      },
+      goBack() {
+        this.$router.go(-1);
+      },
+      // // 打开审核
+      // shenheBtns() {
+      //   // this.shenheDialog = true;
+      // },
+      // // 取消审核
+      // shenheOut() {
+      //   // this.shenheDialog = false;
+      //   this.shenheForm = {};
+      // },
+      // 提交审核
+      // async shenhe({ data }) {
+      //   data.id = this.form.follow._id;
+      //   data.creditStatus = 2;
+      //   const res = await this.credit(data);
+      //   if (res.errcode === 0) {
+      //     this.$message({
+      //       message: '审核成功',
+      //       type: 'success',
+      //     });
+      //     this.goBack();
+      //     this.searchInfo();
+      //   } else {
+      //     this.$message.error('审核失败');
+      //   }
+      // },
+      // 打开授信
+      // shouxinBtns() {
+      //   this.shouxinDialog = false;
+      // },
+      // // 取消授信
+      // shouxinOut() {
+      //   this.shouxinDialog = false;
+      //   this.shouxinForm = {};
+      // },
+      // 提交授信
+      // async shouxinBtn({ data }) {
+      //   data.id = this.form.follow._id;
+      //   data.creditStatus = 1;
+      //   const res = await this.credit(data);
+      //   if (res.errcode === 0) {
+      //     this.$message({
+      //       message: '授信成功',
+      //       type: 'success',
+      //     });
+      //     this.goBack();
+      //     this.searchInfo();
+      //   } else {
+      //     this.$message.error('授信失败');
+      //   }
+      // },
+      // 返回
+
     },
-  },
-};
+  };
 </script>
 
 <style lang="less" scoped>
-.main {
-  float: left;
-  width: 100%;
-  min-height: 780px;
-  box-shadow: 0 0 5px #999;
-  border-radius: 10px;
-  padding: 20px;
-}
+  .main {
+    float: left;
+    width: 100%;
+    min-height: 780px;
+    box-shadow: 0 0 5px #999;
+    border-radius: 10px;
+    padding: 20px;
+  }
 </style>

src/views/intelligentDocking/intelligentDockingIndex.vue

@@ -5,14 +5,14 @@
         <topInfo :topTitle="topTitle" :display="display"></topInfo>
       </el-col>
 
-      <el-col :span="24" class="main">
+      <el-col :span="24">
         <intelligentDockingList
           :debtTable="debtTable"
           :total="total"
           :jlList="jlList"
           :dialogFormVisible="dialogFormVisible"
-          :zhipaiform="zhipaiform"
           @pagechange="pagechange"
+          :zhipaiform="zhipaiform"
           @zhipai="zhipai"
           @zhipaiformBtn="zhipaiformBtn"
           @quxiao="quxiao"
@@ -71,12 +71,7 @@ export default {
     async pagechange(data) {
       var skip = data.skip;
       var limit = 10;
-      var jg_id;
-      if (this.jgpro == '0') {
-        jg_id = '0';
-      } else {
-        jg_id = this.user.userid;
-      }
+      var jg_id = this.user.userid;
       const res = await this.dockingSearch({ skip, limit, jg_id });
       this.$set(this, `debtTable`, res.result);
       this.$set(this, `total`, res.total);