Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/SalesModule/CustomerCertification.vue

@@ -91,7 +91,7 @@
             class="w135"
             value-format="yyyy-MM-dd"
             type="date"
-          ></el-date-picker>-
+          ></el-date-picker> -
           <el-date-picker
             v-model="msg.EDate"
             @change="dataDui()"
@@ -100,7 +100,7 @@
             type="date"
           ></el-date-picker>
         </li>
-        <li>
+        <li style="display:none;">
           <span>
             <em>{{$t('system.query_company')}}</em>
             <el-select filterable v-model="msg.RB_Branch_Id">
@@ -118,10 +118,10 @@
           <span>
             <em>状态</em>
           </span>
-          <el-select v-model="msg.MarkOverType">
+          <el-select v-model="msg.ApplyState">
             <el-option label="不限" value="-1" key="-1"></el-option>
             <el-option label="申请中" value="0" key="0"></el-option>
-            <el-option label="通过" value="1" key="1"></el-option>
+            <el-option label="通过" value="3" key="3"></el-option>
             <el-option label="拒绝" value="2" key="2"></el-option>
           </el-select>
         </li>
@@ -166,7 +166,7 @@
         <td>{{item.CreateDateStr}}</td>
         <td>
           <span v-if="item.ApplyState === 0" class="_status_str _status_str_y">审核中</span>
-          <span v-if="item.ApplyState === 1" class="_status_str _status_str_g">已通过</span>
+          <span v-if="item.ApplyState == 3||item.ApplyState === 1" class="_status_str _status_str_g">已通过</span>
           <span v-if="item.ApplyState === 2" class="_status_str _status_str_r">已拒绝</span>
         </td>
         <td>
@@ -207,7 +207,8 @@ export default {
         SDate: "",
         EDate: "",
         ApplyState: "-1",
-        RB_Branch_Id: -2
+        RB_Branch_Id: '',
+        Type:1
       },
       viewerObj: null,
       Reason: "",
@@ -339,6 +340,7 @@ export default {
   mounted() {
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
+    this.msg.RB_Branch_Id = userInfo.RB_Branch_id; //公司ID
     this.getList();
     this.getCompanyList();
   }

src/router/config.js

@@ -641,6 +641,14 @@ export default {
                                 title: '联盟管理'
                             },
                         },
+                        {
+                            path: '/custumerXzCertification', //客户实名认证
+                            name: 'custumerXzCertification',
+                            component: resolve => require(['@/components/administrative/custumerXzCertification'], resolve),
+                            meta: {
+                                title: '客户实名认证'
+                            },
+                        },
                         {
                             path: '/LianMengManagementList', //联盟客户列表管理
                             name: 'LianMengManagementList',