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

src/layout/intelligentDocking/detail.vue

@@ -8,7 +8,8 @@
         <el-col :span="24">
           <el-form ref="form" :model="form" label-width="180px">
             <el-form-item label="企业名称：">
-              <span>{{ form.company.company_name }}</span>
+              <!--<span>{{ form.company.company_name }}</span>-->
+              <span>{{ form.company ? form.company.company_name:'' }}</span>
               <!-- <el-input v-model="form.company.company_name" disabled></el-input> -->
             </el-form-item>
             <el-form-item label="联系人：">
@@ -17,27 +18,38 @@
             <el-form-item label="融资金额（万元）：">
               <span>{{ form.money }}</span>
             </el-form-item>
-            <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 label="对接产品：">
+              <span>{{ form.finance_claims ? 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.institution ? form.institution.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>
+              <span>{{ form.dictionary ? form.dictionary.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.additional_information }}</span>
             </el-form-item>
-            <el-form-item label="对接产品：">
-              <span>{{ form.finance_claims.name }}</span>
+
+            <el-form-item label="放款额度（万元）：">
+              <span>{{ form.follow  ? form.follow.credit_money : '' }}</span>
             </el-form-item>
+            <el-form-item label="放款产品：">
+              <span>{{ form.follow  ? form.follow.sxcpname : '' }}</span>
+            </el-form-item>
+            <el-form-item label="放款期限（个月）：">
+              <span>{{ form.follow  ? form.follow.sxhowlong : '' }}</span>
+            </el-form-item>
+            <el-form-item label="放款利率（%）：">
+              <span>{{ form.follow  ? form.follow.sxcplilue : '' }}</span>
+            </el-form-item>
+
           </el-form>
         </el-col>
       </el-col>

src/layout/intelligentDocking/list.vue

@@ -4,45 +4,50 @@
       <el-col :span="24" class="list">
         <el-table ref="debtTable" :data="debtTable" style="width: 100%">
           <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">
-            <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 property="company.company_name" label="企业名称" align="center"> </el-table-column>
+          <el-table-column property="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'
-                  ? '已拒绝'
-                  : ' '
-              }}</span>
+              <span style="margin-left: 10px">
+                {{
+                scope.row.creditStatus=='0'?'已处理':''
+                ||scope.row.creditStatus=='2'?'审批':''
+                ||scope.row.creditStatus=='1'?'放款':''
+                ||scope.row.creditStatus=='3'?'拒绝':'待处理'
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="300px">
             <template slot-scope="scope">
-              <el-button @click="$router.push({ path: '/intelligentDocking/detail', query: { intelligentId: scope.row.intelligentId } })" type="text">
+              <el-button @click="$router.push({ path: '/intelligentDocking/detail', query: { intelligentId: scope.row._id } })" type="text">
                 <i class="el-icon-view"></i>
               </el-button>
             </template>
           </el-table-column>
         </el-table>
         <el-row>
+          <!--<el-pagination-->
+            <!--@size-change="handleSizeChange"-->
+            <!--@current-change="handleCurrentChange"-->
+            <!--:current-page="currentPage"-->
+            <!--background-->
+            <!--layout="total,  prev, pager, next, jumper"-->
+            <!--:total="total"-->
+            <!--:page-size="pageSize"-->
+          <!--&gt;-->
+          <!--</el-pagination>-->
           <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            background
-            layout="total,  prev, pager, next, jumper"
-            :total="total"
-            :page-size="pageSize"
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="10"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total"
           >
           </el-pagination>
         </el-row>
@@ -69,9 +74,15 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(currentPage) {
-      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    handleCurrentChange(val) {
+      this.$emit('pagechange', { skip: val});
     },
+    // handleSizeChange(val) {
+    //   console.log(`每页 ${val} 条`);
+    // },
+    // handleCurrentChange(currentPage) {
+    //   this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    // },
   },
 };
 </script>

src/layout/tNewAssign/tNewAssignForm.vue

@@ -101,7 +101,7 @@
       WangEditor,
     },
     data: () => ({
-      formTitle: '企业申请信息指派',
+      formTitle: '业务指派',
       /*rules: {
         title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
         type: [{ required: true }],

src/layout/tNewAssign/tNewAssignList.vue

@@ -34,7 +34,7 @@
                     >
                         <!--<el-table-column type="selection" align="center"> </el-table-column>-->
                         <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>
-                        <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
+                        <el-table-column property="company_name" label="企业名称" align="center" width="300px"> </el-table-column>
                         <el-table-column property="money" label="融资金额(万元)" align="center"> </el-table-column>
                         <el-table-column property="use" label="融资用途" align="center"> </el-table-column>
                         <el-table-column property="institution_name" label="金融机构名称" align="center"> </el-table-column>
@@ -283,6 +283,12 @@
     /deep/ .el-table td {
         padding: 11px 0;
     }
+    /deep/  .el-table .cell {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
 
     .other {
         color: #f36302;

src/views/intelligentDocking/index.vue

@@ -6,7 +6,7 @@
           <topInfo :topTitle="topTitle" :display="display"></topInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <list :debtTable="debtTable" :total="total" @handleCurrentChange="handleCurrentChange"></list>
+          <list :debtTable="debtTable" :total="total" @pagechange="pagechange"></list>
         </el-col>
       </el-col>
     </el-row>
@@ -17,7 +17,7 @@
 import topInfo from '@/layout/common/topInfo.vue';
 import list from '@/layout/intelligentDocking/list.vue';
 import { mapState, mapMutations, createNamespacedHelpers } from 'vuex';
-const { mapActions: intelligentFollow } = createNamespacedHelpers('intelligentFollow');
+const { mapActions: intelligentDocking } = createNamespacedHelpers('intelligentDocking');
 export default {
   name: 'index',
   props: {},
@@ -38,18 +38,26 @@ export default {
     ...mapState(['user']),
   },
   methods: {
-    ...intelligentFollow(['getFinishList']),
+    ...intelligentDocking(['dockingSearch']),
     // 查询列表
     async searchInfo({ skip = 1, limit = 10, ...info } = {}) {
-      const res = await this.getFinishList({ skip, limit, ...info });
-      this.$set(this, `debtTable`, res.data.res);
-      this.$set(this, `total`, res.data.total);
+      const res = await this.dockingSearch({ skip, limit, ...info });
+      this.$set(this, `debtTable`, res.result);
+      this.$set(this, `total`, res.total);
     },
     // 分页
+    async pagechange(data) {
+      var skip = data.skip;
+      var limit = 10;
+      var jg_id = this.user.userid;
+      const res = await this.dockingSearch({ skip, limit });
+      this.$set(this, `debtTable`, res.result);
+      this.$set(this, `total`, res.total);
+    },
     async handleCurrentChange({ skip, limit, currentPage }) {
-      const res = await this.getFinishList({ skip, limit });
-      this.$set(this, `debtTable`, res.data.res);
-      this.$set(this, `total`, res.data.total);
+      const res = await this.dockingSearch({ skip, limit });
+      this.$set(this, `debtTable`, res.result);
+      this.$set(this, `total`, res.total);
     },
   },
 };

src/views/tNewAssign/detail.vue

@@ -34,7 +34,7 @@
     },
     data: () => ({
       display: 'block',
-      topTitle: '企业申请信息指派',
+      topTitle: '业务指派',
       ruleForm: {},
       originalData:{},
       jgList:[],

src/views/tNewAssign/index.vue

@@ -27,7 +27,7 @@
       tNewAssignList, //列表
     },
     data: () => ({
-      topTitle: '企业申请信息指派',
+      topTitle: '业务指派',
       display: '',
       tableData: [],
       total: 0,