Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/components/enterprise/duijiestatus.vue

@@ -26,7 +26,7 @@
 <script>
 import heads from '@/layout/enterprise/heads.vue';
 import mainMenu from '@/layout/enterprise/mainMenu.vue';
-import shenhe from '@/layout/enterprise/shenhe.vue';
+import duijiestatus from '@/layout/enterprise/duijiestatus.vue';
 import foot from '@/layout/live/foot.vue';
 export default {
   name: 'adviserList',

src/components/enterprise/look.vue

@@ -0,0 +1,93 @@
+<template>
+  <div id="adviserList">
+    <el-row>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="top">
+          <heads></heads>
+        </el-col>
+        <div class="w_1200">
+          <el-col :span="5" class="left">
+            <el-col :span="24" class="leftTop">
+              <mainMenu :liebiaoList="liebiaoList" v-on="$listeners"></mainMenu>
+            </el-col>
+          </el-col>
+          <el-col :span="19" class="right">
+            <look v-on="$listeners" :resultTable="resultTable"></look>
+          </el-col>
+        </div>
+        <el-col :span="24" class="foots">
+          <foot></foot>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import heads from '@/layout/enterprise/heads.vue';
+import mainMenu from '@/layout/enterprise/mainMenu.vue';
+import look from '@/layout/enterprise/look.vue';
+import foot from '@/layout/live/foot.vue';
+
+export default {
+  name: 'adviserList',
+  props: {
+    info: null, //站点信息
+    liebiaoList: null, //分类导航
+    form: null,
+    resultTable: null,
+  },
+  components: {
+    heads,
+    mainMenu, //分类导航
+    look, //右侧
+    foot,
+  },
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.w_1200 {
+  width: 80%;
+  margin: 0 auto;
+}
+
+.menu {
+  height: 70px;
+  overflow: hidden;
+}
+.main {
+  min-height: 520px;
+  overflow: hidden;
+  padding: 10px 0;
+  background: #e9edf6;
+  background-attachment: fixed;
+  background-size: cover;
+  background-position: center center;
+}
+.left {
+  min-height: 520px;
+  margin: 0 10px 0 0;
+  width: 20%;
+}
+
+.leftTop {
+  background: #fff;
+  height: 520px;
+  overflow: hidden;
+  margin: 0 0 10px 0;
+}
+.right {
+  width: 79%;
+  min-height: 520px;
+  overflow: hidden;
+  background-color: #fff;
+}
+.foots {
+  margin: 10px 0 0 0;
+}
+</style>

src/layout/enterprise/appointment.vue

@@ -2,7 +2,8 @@
   <div id="technical">
     <el-col :span="24" class="main">
       <el-col :span="24" class="left">
-        <el-col :span="24" class="downLeftTop">
+        <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> <span @click="add()">创建对接会</span></el-col>
+        <!-- <el-col :span="24" class="downLeftTop">
           <el-image :src="downLeftTopImage"></el-image>
           <span class="topText">
             <span>展会预约</span>
@@ -12,7 +13,7 @@
             >
             <span @click="add()">创建对接会</span>
           </span>
-        </el-col>
+        </el-col> -->
         <el-col :span="24" class="infoLeft">
           <el-table :data="resultTable" stripe style="width: 96%" border>
             <el-table-column prop="title" label="对接会标题"> </el-table-column>
@@ -49,12 +50,15 @@
                   <el-tooltip class="item" effect="dark" content="审核对接会状态" placement="top-start"><i class="el-icon-bangzhu"></i></el-tooltip>
                 </el-button>
 
-                <el-button size="mini" type="text" v-if="scope.row.is_allowed == '1'" @click.prevent="deleteRow(scope.row.id)">
+                <el-button size="mini" type="text" v-if="scope.row.is_allowed == '1'" @click.prevent="look(scope.row)">
                   <el-tooltip class="item" effect="dark" content="查看申请状况" placement="top-start"><i class="el-icon-pie-chart"></i></el-tooltip>
                 </el-button>
               </template>
             </el-table-column>
           </el-table>
+          <el-col :span="24">
+            <page :total="total" position="right"></page>
+          </el-col>
         </el-col>
       </el-col>
     </el-col>
@@ -69,6 +73,7 @@ export default {
   name: 'technical',
   props: {
     resultTable: null,
+    total: null,
   },
   components: {},
   data: () => ({
@@ -106,13 +111,34 @@ export default {
 
     status(id) {
       console.log(id);
-            this.$router.push({ path: '/enterprise/duijiestatus', query: { id: id } });
+      this.$router.push({ path: '/enterprise/duijiestatus', query: { id: id } });
+    },
+
+    look(row) {
+      console.log(row);
+      this.$router.push({ path: '/enterprise/look', query: { data: row } });
     },
   },
 };
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
+.leftTop span:last-child {
+  float: right;
+  cursor: pointer;
+}
 .jishuImage {
   width: 100%;
   height: 100%;

src/layout/enterprise/context.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="recruitLists">
     <el-row>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>事项管理</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的订购" name="first">
@@ -264,6 +265,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;

src/layout/enterprise/contextfabuxx.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="recruitLists">
     <el-row>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>我的发布</span> </el-col>
       <el-col :span="24">
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的需求" name="first">
@@ -580,6 +581,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
@@ -606,7 +619,7 @@ p {
 }
 
 .fbListCenterTwo {
-  width: 48%;
+  width: 45%;
   float: left;
   margin-left: 10px;
   margin-right: 10px;
@@ -627,6 +640,7 @@ p {
   width: 22%;
   border-right: 1px solid #ccc;
   height: 100px;
+  padding-left: 20px;
 }
 .fbListCenterC p {
   padding: 5px 0;

src/layout/enterprise/duijiestatus.vue

@@ -38,13 +38,9 @@
             <el-form-item label="简介">
               <el-input type="textarea" v-model="form.desc" :disabled="true"></el-input>
             </el-form-item>
-            <el-form-item label="审核" :disabled="true">
-              <el-radio v-model="form.is_allowed" label="1">允许</el-radio>
-              <el-radio v-model="form.is_allowed" label="2">拒绝</el-radio>
-            </el-form-item>
-
-            <el-form-item label="拒绝理由" v-if="form.is_allowed == 2">
-              <el-input type="textarea" v-model="form.reason" placeholder="无"></el-input>
+            <el-form-item label="状态" :disabled="true">
+              <el-radio v-model="form.status" label="1">开始</el-radio>
+              <el-radio v-model="form.status" label="2">结束</el-radio>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSubmit()">提交</el-button>

src/layout/enterprise/jibencontext.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="rightcont">
     <el-col class="zhengce">
-      <el-col :span="24" class="topTitle"> <span>基本信息</span></el-col>
+      <el-col :span="24" class="leftTop"> <span>|</span> <span>基本信息</span> </el-col>
       <el-col :span="24" class="info">
         <el-form ref="form" :model="form" label-width="80px">
           <el-form-item label="用户名：">
@@ -113,13 +113,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.leftTop {
+  font-size: 18px;
+  width: 96%;
+  height: 41px;
+  line-height: 35px;
+  border-bottom: 1px solid #e5e5e5;
+  position: relative;
+  bottom: 1px;
+  margin: 10px;
+  font-weight: 600;
+  color: #22529a;
+}
 p {
   padding: 0;
   margin: 0;
 }
-.zhengce {
-  padding: 20px;
-}
 .zhengce .topTitle {
   font-size: 22px;
   color: #22529a;
@@ -128,7 +137,8 @@ p {
 
 .zhengce .info {
   float: left;
-  width: 100%;
+  width: 90%;
+  padding: 10px;
 }
 .zhengce .info p {
   float: left;
@@ -144,4 +154,7 @@ p {
   width: 100px;
   height: 100px;
 }
+/deep/.el-button {
+  margin: 10px auto;
+}
 </style>

src/layout/enterprise/look.vue

@@ -0,0 +1,187 @@
+<template>
+  <div id="technical">
+    <el-col :span="24" class="main">
+      <el-col :span="24" class="left">
+        <el-col :span="24" class="downLeftTop">
+          <el-image :src="downLeftTopImage"></el-image>
+          <span class="topText">
+            <span>展会预约</span>
+            <span
+              ><p>A</p>
+              <p>ppointment</p></span
+            >
+          </span>
+        </el-col>
+        <el-col :span="24" class="infoLeft">
+          <el-table :data="resultTable" stripe style="width: 96%" border>
+            <el-table-column prop="user_name" label="用户名称"> </el-table-column>
+            <el-table-column label="买家/卖家" :show-overflow-tooltip="true">
+              <template slot-scope="scoped">
+                {{ scoped.row.buyer === '0' ? '买家' : scoped.row.buyer === '1' ? '卖家' : '' }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="contact" label="联系人" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="contact_tel" label="联系人电话" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="email" label="邮箱" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="company" label="单位名称" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column prop="apply_time" label="申请时间" :show-overflow-tooltip="true"> </el-table-column>
+            <el-table-column label="审核状态" align="center">
+              <template slot-scope="scoped">
+                {{ scoped.row.status === '0' ? '未审核' : scoped.row.status === '1' ? '审核通过' : '审核拒绝' }}
+              </template>
+            </el-table-column>
+
+            <el-table-column label="操作">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" @click.prevent="success(scope.row)">
+                  <el-tooltip class="item" effect="dark" content="审核通过" placement="top-start"><i class="el-icon-refresh"></i></el-tooltip>
+                </el-button>
+
+                <el-button size="mini" type="text" @click.prevent="shibai(scope.row)">
+                  <el-tooltip class="item" effect="dark" content="审核拒绝" placement="top-start"><i class="el-icon-refresh"></i></el-tooltip>
+                </el-button>
+                <el-button size="mini" type="text" @click.prevent="deleteRow(scope.row.id)">
+                  <el-tooltip class="item" effect="dark" content="删除" placement="top-start"><i class="el-icon-delete"></i></el-tooltip>
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+import _ from 'lodash';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: news } = createNamespacedHelpers('news');
+export default {
+  name: 'technical',
+  props: {
+    resultTable: null,
+  },
+  components: {},
+  data: () => ({
+    downLeftTopImage: require('@/assets/live/square_big.png'),
+    jishuImage: require('@/assets/live/main3.png'),
+  }),
+  created() {
+    this.searchInfo();
+  },
+  computed: {
+    pageTitle() {
+      return `${this.$route.meta.title}`;
+    },
+  },
+  metaInfo() {
+    return { title: this.$route.meta.title };
+  },
+
+  methods: {
+    ...news(['query']),
+    async searchInfo() {},
+    add() {
+      this.$router.push({ path: '/enterprise/duijiedetail' });
+    },
+
+    shibai(row) {
+      this.$emit('shibai', row);
+    },
+    success(row) {
+      this.$emit('success', row);
+    },
+    deleteRow(id) {
+      this.$emit('deleteRow', id);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.jishuImage {
+  width: 100%;
+  height: 100%;
+}
+.main {
+  width: 100%;
+  margin: 0 auto;
+  float: none;
+}
+.left {
+  float: left;
+  height: 500px;
+  overflow: hidden;
+  margin: 0 auto;
+  padding: 20px 20px 20px 20px;
+}
+.leftTitle {
+  text-align: center;
+  position: relative;
+}
+.topText {
+  width: 94%;
+  border-bottom: 2.5px solid #044b79;
+  display: inline-block;
+  position: relative;
+  top: -10px;
+  margin: 0 0 0 5px;
+}
+.topText span:first-child {
+  font-size: 24px;
+  font-weight: 700;
+  color: #000000;
+  padding: 0 10px;
+  top: 4px;
+}
+
+.topText span p:first-child {
+  font-weight: 800;
+  font-size: 34px;
+  color: #92959a;
+  top: 11px;
+  display: inline-block;
+}
+
+.topText span p:last-child {
+  display: inline-block;
+  font-weight: 700;
+  font-size: 18px;
+  color: #92959a;
+}
+.topText span:last-child {
+  float: right;
+  font-size: 16px;
+  font-weight: 700;
+  color: #044b79;
+  position: relative;
+  top: 20px;
+  cursor: pointer;
+}
+.infoLeft {
+  height: 480px;
+  padding: 20px 20px;
+  margin: 1px 0 0 0;
+}
+.leftListDown {
+  position: relative;
+}
+.leftListDown span:first-child {
+  display: inline-block;
+  width: 80%;
+  height: 3px;
+  background: rgba(4, 75, 121, 0.37);
+  margin: 0 10px 0 0;
+  position: absolute;
+  left: -10px;
+  top: 10px;
+}
+.leftListDown span:last-child {
+  font-size: 16px;
+  float: right;
+  padding: 0 15px 0 0;
+  color: #044b79;
+  font-weight: 700;
+  cursor: pointer;
+}
+</style>

src/layout/enterprise/parts/room.vue

@@ -51,6 +51,9 @@ export default {
   width: 95%;
   margin: 20px;
 }
+/deep/.el-table--border td {
+  cursor: pointer;
+}
 .leftTop {
   font-size: 18px;
   width: 96%;

src/router/index.js

@@ -176,13 +176,30 @@ const live = [
     meta: { title: '对接会', subSite: true },
     component: () => import('../views/enterprise/duijiedetail.vue'),
   },
-  //展会预约-创建
+  //展会预约-shenhe
   {
     path: '/enterprise/shenhe',
     name: 'exhibitishenhe',
-    meta: { title: '对接会状态审核', subSite: true },
+    meta: { title: '对接会审核', subSite: true },
     component: () => import('../views/enterprise/shenhe.vue'),
   },
+
+  //展会预约-状态审核
+  {
+    path: '/enterprise/duijiestatus',
+    name: 'exhibitiduijiestatus',
+    meta: { title: '对接会状态审核', subSite: true },
+    component: () => import('../views/enterprise/duijiestatus.vue'),
+  },
+
+  //展会预约-查看申请情况
+  {
+    path: '/enterprise/look',
+    name: 'exhibitilook',
+    meta: { title: '对接会状态审核', subSite: true },
+    component: () => import('../views/enterprise/look.vue'),
+  },
+
   //企业-基本信息
   {
     path: '/enterprise/enterprisejb',

src/views/enterprise/duijiestatus.vue

@@ -78,7 +78,7 @@ export default {
     async onSubmit() {
       if (this.id) {
         this.form.user_id = this.user.uid;
-        let res = await this.shenhe(this.form);
+        let res = await this.update(this.form);
         this.$checkRes(res, '审核成功', '审核失败');
       }
       this.$router.push({ path: '/enterprise/appointment' });

src/views/enterprise/look.vue

@@ -0,0 +1,115 @@
+<template>
+  <div id="adviserList">
+    <look-detail
+      :liebiaoList="liebiaoList"
+      @deleteRow="deleteRow"
+      @success="success"
+      @shibai="shibai"
+      :resultTable="resultTable"
+      @onsave="onsaveClick"
+    ></look-detail>
+  </div>
+</template>
+
+<script>
+import lookDetail from '@/components/enterprise/look.vue';
+import { createNamespacedHelpers, mapGetters, mapState } from 'vuex';
+const { mapActions: apply } = createNamespacedHelpers('apply');
+const { mapActions: login } = createNamespacedHelpers('login');
+export default {
+  name: 'adviserList',
+  props: {},
+  components: {
+    lookDetail,
+  },
+  data: () => ({
+    info: {},
+    liebiaoList: [
+      { name: '基本信息' },
+      { name: '消息管理' },
+      { name: '我的发布' },
+      { name: '事项管理' },
+      { name: '展会预约' },
+      { name: '返回首页' },
+      { name: '修改密码' },
+      { name: '注销账号' },
+    ],
+    resultTable: [],
+    form: {},
+  }),
+  created() {
+    this.search();
+  },
+  computed: {
+    data() {
+      return this.$route.query.data;
+    },
+    ...mapState(['user']),
+  },
+  methods: {
+    ...apply(['query', 'delete', 'update']),
+    ...login({ logout: 'logout', transactiondtetle: 'delete' }),
+    //查询
+    async search() {
+      console.log(this.data);
+      // let id = this.data;
+
+      // console.log(res.data);
+
+      this.$set(this, `resultTable`, this.data.apply);
+      console.log();
+    },
+    async onsaveClick({ id }) {
+      console.log(id);
+      if (id === '基本信息') {
+        this.$router.push({ path: '/enterprise/enterprisejb' });
+      } else if (id === '消息管理') {
+        this.$router.push({ path: '/enterprise/enterprisexx' });
+      } else if (id === '我的发布') {
+        this.$router.push({ path: '/enterprise/enterprisefabu' });
+      } else if (id === '事项管理') {
+        this.$router.push({ path: '/enterprise/enterprisedg' });
+      } else if (id === '展会预约') {
+        this.$router.push({ path: '/enterprise/appointment' });
+      } else if (id === '修改密码') {
+        this.$router.push({ path: '/enterprise/xiugai' });
+      } else if (id === '返回首页') {
+        this.$router.push({ path: '/home' });
+      } else if (id === '注销账号') {
+        this.logout();
+        this.$message({
+          message: '注销成功',
+          type: 'success',
+        });
+        this.toLogin();
+      }
+    },
+
+    async toLogin() {
+      this.$router.push({ path: '/' });
+    },
+    async success(row) {
+      row.status = '1';
+      row.dock_id = this.data.id;
+      row.id = data._id;
+      console.log(row);
+      let res = await this.update(row);
+      this.$checkRes(res, '通过审核', '添加失败');
+    },
+    async shibai(row) {
+      row.status = '2';
+      row.dock_id = this.data.id;
+      row.id = data._id;
+      console.log(row);
+      let res = await this.update(row);
+      this.$checkRes(res, '审核拒绝', '添加失败');
+    },
+    async deleteRow(id) {
+      const res = await this.delete(id);
+      if (this.$checkRes(res, '删除成功', res.errmsg || '删除失败')) this.search();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped></style>