更新

src/components/enterprise/appointment.vue

@@ -68,7 +68,7 @@ export default {
   overflow: hidden;
 }
 .main {
-  min-height: 520px;
+  min-height: 600px;
   overflow: hidden;
 
   background: #e9edf6;
@@ -77,7 +77,7 @@ export default {
   background-position: center center;
 }
 .left {
-  min-height: 520px;
+  min-height: 560px;
   margin: 0 10px 0 0;
   width: 20%;
 }
@@ -90,7 +90,7 @@ export default {
 }
 .right {
   width: 79%;
-  min-height: 520px;
+  min-height: 600px;
   overflow: hidden;
   background-color: #fff;
 }

src/layout/enterprise/appointment.vue

@@ -19,8 +19,8 @@
             <el-table-column prop="title" label="对接会标题"> </el-table-column>
             <el-table-column prop="start_time" label="开始时间" :show-overflow-tooltip="true"> </el-table-column>
             <el-table-column prop="join_end" label="报名截止时间" :show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="province" label="省" :show-overflow-tooltip="true"> </el-table-column>
-            <el-table-column prop="place" label="市" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="sheng" label="省" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="shi" label="市" :show-overflow-tooltip="true"> </el-table-column>
             <el-table-column label="审核状态" align="center">
               <template slot-scope="scoped">
                 {{ scoped.row.is_allowed === '0' ? '未审核' : scoped.row.is_allowed === '1' ? '审核通过' : '审核拒绝' }}
@@ -155,7 +155,7 @@ export default {
 }
 .left {
   float: left;
-  height: 500px;
+  min-height: 630px;
   overflow: hidden;
   margin: 0 auto;
   padding: 20px 10px 20px 10px;

src/layout/enterprise/duijiecontext.vue

@@ -71,7 +71,7 @@ export default {
     },
     changeshenge(value) {
       console.log(value);
-            this.$emit('placesubmit', { value});
+      this.$emit('placesubmit', { value });
     },
   },
 };

src/router/index.js

@@ -46,14 +46,14 @@ const live = [
       },
       {
         path: '/market/marketfabu',
-        name: 'market_index',
+        name: 'market_fabu',
         meta: { title: '我要发布', subSite: true },
         component: () => import('../views/market/marketfabu.vue'),
       },
 
       {
         path: '/personnel/rencai',
-        name: 'personnel',
+        name: 'personnelrencai',
         meta: { title: '专家详情', subSite: true },
         component: () => import('../views/personnel/rencai.vue'),
       },
@@ -66,7 +66,7 @@ const live = [
       //科技超市列表
       {
         path: '/supermaket/supermarketlist',
-        name: 'supermarketuct',
+        name: 'supermarketlist',
         component: () => import('../views/supermaket/supermarketlist.vue'),
       },
 
@@ -168,7 +168,7 @@ const live = [
       {
         path: '/live/liveApply',
         meta: { title: '项目申请', subSite: true },
-        name: 'live_apply',
+        name: 'live_applys',
         component: () => import('../views/hall/liveApply.vue'),
       },
 
@@ -183,7 +183,7 @@ const live = [
   //企业-信息管理
   {
     path: '/enterprise/enterprisexx',
-    name: 'enterprisexuqiu',
+    name: 'enterprisexx',
     component: () => import('../views/enterprise/enterprisexx.vue'),
   },
 
@@ -202,7 +202,7 @@ const live = [
   //修改密码
   {
     path: '/enterprise/xiugai',
-    name: 'enterprisedg',
+    name: 'xiugai',
     component: () => import('../views/enterprise/xiugai.vue'),
   },
   //展会管理
@@ -246,7 +246,7 @@ const live = [
   //企业-基本信息
   {
     path: '/enterprise/enterprisejb',
-    name: 'enterprisefabu',
+    name: 'enterprisejb',
     component: () => import('../views/enterprise/enterprisejb.vue'),
   },
 
@@ -290,7 +290,7 @@ const live = [
   {
     path: '/live/hall/dock/zhuanjiaDetail',
     meta: { title: '专家信息详情', subSite: true },
-    name: 'dock_Detail',
+    name: 'zhuanjiaDetail',
     component: () => import('../views/hall/dock/zhuanjiaDetail.vue'),
   },
 

src/views/enterprise/appointment.vue

@@ -23,6 +23,7 @@ import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
 const { mapActions: dock } = createNamespacedHelpers('dock');
 const { mapActions: apply } = createNamespacedHelpers('apply');
 const { mapActions: login } = createNamespacedHelpers('login');
+const { mapActions: place } = createNamespacedHelpers('place');
 
 export default {
   name: 'adviserList',
@@ -60,13 +61,32 @@ export default {
     ...dock(['query', 'delete', 'update']),
     ...apply({ applyupdate: 'update' }),
     ...login({ logout: 'logout', transactiondtetle: 'delete' }),
+    ...place({ palcequery: 'query', palcefetch: 'fetch' }),
     //查询
     async search({ skip = 0, limit = 4 } = { skip: 0, limit: 4 }) {
       let res = await this.query({ skip, limit });
-      console.log(res.data);
+      for (const val of res.data) {
+        let parent = val.province;
+        let places = val.place;
+        console.log(places);
+
+        let level = 1;
+        let reslte = await this.palcefetch({ level, parent });
+        let resltes = await this.palcefetch({ level: 2, parent });
+        // console.log(reslte.data);
+        var arr = reslte.data.filter(item => item.code === parent);
+        var cre = resltes.data.filter(item => item.code === places);
+        console.log(cre);
+        for (const shi of cre) {
+          val.shi = shi.name;
+        }
+        for (const sheng of arr) {
+          val.sheng = sheng.name;
+        }
+      }
+
       this.$set(this, `resultTable`, res.data);
       this.$set(this, `total`, res.total);
-      console.log();
     },
 
     //查询
@@ -112,7 +132,6 @@ export default {
         this.toLogin();
       }
     },
-
     async toLogin() {
       this.$router.push({ path: '/platlive' });
     },
@@ -126,7 +145,6 @@ export default {
       row.dock_id = this.datas.id;
       row.id = row._id;
       console.log(row);
-
       let res = await this.applyupdate(row);
       this.$checkRes(res, '通过审核', '添加失败');
     },