update

src/layout/layout-part/newmenu.vue

@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { index, personnel, government, record, serve, enterprise, duijiehui, site, user, links, defaultMenu } from '@/util/role_menu.js';
+import { index, personnel, government, record, policy, serve, enterprise, duijiehui, site, user, links, defaultMenu } from '@/util/role_menu.js';
 import * as menus from '@/util/role_menu.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('login');
@@ -52,9 +52,10 @@ export default {
   methods: {
     ...mapActions(['toGetMenu', 'logout']),
     async search() {
+      console.log(this.user);
       if (!this.user.uid) return;
       if (this.user.role == '1') {
-        this.menu.push(index, ...defaultMenu, personnel, government, record, serve, enterprise, duijiehui, site, user, links);
+        this.menu.push(index, ...defaultMenu, personnel, government, record, policy, serve, enterprise, duijiehui, site, user, links);
         return;
       }
       const res = await this.toGetMenu({ id: this.user.uid });

src/router/index.js

@@ -207,11 +207,6 @@ const routes = [
     path: '/duijiehui/duijieshenhe',
     component: () => import('../views/duijiehui/duijieshenhe.vue'),
   },
-  //对接会子管理员审核详情
-  {
-    path: '/duijiehui/duijiedetail',
-    component: () => import('../views/duijiehui/duijiedetail.vue'),
-  },
   //对接会管理员审核详情
   {
     path: '/duijiehui/duijiehuiexamine',

src/store/live.js

@@ -10,6 +10,7 @@ const mutations = {};
 
 const actions = {
   async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    console.log(info);
     const res = await this.$axios.$get(`${api.informate}`, { skip, limit, ...info });
     return res;
   },

src/util/role_menu.js

@@ -2,44 +2,27 @@ export const index = {
   name: '首页',
   path: '/',
 };
+
 export const government = {
   name: '科技政务',
-  children: [
-    {
-      name: '科技政务',
-      path: '/government/index',
-    },
-  ],
+  path: '/government/index',
 };
 
 export const policy = {
   name: '科技政策',
-  children: [
-    {
-      name: '科技政策',
-      path: '/policy/index',
-    },
-  ],
+  path: '/policy/index',
 };
 
 export const record = {
   name: '科技数据',
-  children: [
-    {
-      name: '科技数据',
-      path: '/record/index',
-    },
-  ],
+
+  path: '/record/index',
 };
 
 export const serve = {
   name: '科技服务',
-  children: [
-    {
-      name: '科技服务',
-      path: '/serve/index',
-    },
-  ],
+
+  path: '/serve/index',
 };
 
 export const personnel = {

src/views/duijiehui/detail.vue

@@ -53,13 +53,10 @@ export default {
     },
     async onSubmit() {
       if (this.id) {
-        this.form.user_id = this.user.id;
-        console.log(this.form);
-
         let res = await this.liveupdate(this.form);
         this.$checkRes(res, '修改成功', '修改失败');
       } else {
-        this.form.user_id = this.user.id;
+        this.form.user_id = this.user.uid;
         let res = await this.livecreate(this.form);
         this.$checkRes(res, '添加成功', '添加失败');
       }

src/views/duijiehui/duijiedetail.vue

@@ -1,19 +0,0 @@
-<template>
-  <div id="duijiedetail">
-    <p>duijiedetail</p>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'duijiedetail',
-  props: {},
-  components: {},
-  data: () => ({}),
-  created() {},
-  computed: {},
-  methods: {},
-};
-</script>
-
-<style lang="scss" scoped></style>

src/views/duijiehui/index.vue

@@ -63,7 +63,7 @@ export default {
         icon: 'el-icon-tickets',
         method: 'tickets',
         display: item => {
-          return item.role == '3' ? true : false;
+          return item.role == '1' ? true : false;
         },
       },
       {
@@ -88,7 +88,13 @@ export default {
       { label: '开始时间', prop: 'start_time' },
       { label: '报名截止时间', prop: 'join_end' },
       { label: '对接会简介', prop: 'desc' },
-
+      {
+        label: '审核状态',
+        prop: 'is_allowed',
+        format: item => {
+          return item === '0' ? '未审核' : item === '1' ? '已允许' : '已拒绝';
+        },
+      },
       {
         label: '对接会状态',
         prop: 'status',
@@ -109,12 +115,12 @@ export default {
   methods: {
     ...live(['query', 'delete', 'update']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      if (this.user.role != '1') info.user_id = this.user.uid;
       const res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         for (const val of res.data) {
           val.role = this.user.role;
         }
-        console.log(res.data);
         this.$set(this, `list`, res.data || []);
         this.$set(this, `total`, res.total);
       }

src/views/menu/index.vue

@@ -15,21 +15,41 @@
       </el-col>
     </el-row>
     <el-drawer title="菜单" :visible.sync="drawer" direction="rtl" @closed="handleClose" :destroy-on-close="true">
-      <data-form :fields="fields" :data="form" :rules="{}" @save="drawerSave" :isNew="drawerIsNew"> </data-form>
+      <el-form :model="form" size="mini" label-width="120px" style="padding:10px">
+        <el-form-item label="名称" prop="role_name">
+          <el-input v-model="form.role_name"></el-input>
+        </el-form-item>
+        <el-form-item label="菜单分级" prop="type">
+          <el-select v-model="form.type" @change="clearCode">
+            <el-option value="1" label="一级菜单"></el-option>
+            <el-option value="2" label="二级菜单"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="名称" prop="code" v-if="form.type == 2">
+          <el-select v-model="form.code" @change="updateView">
+            <el-option v-for="(i, index) in list" :key="index" :label="i.role_name" :value="i.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="路由" prop="url">
+          <el-input v-model="form.url"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="drawerSave">保存</el-button>
+        </el-form-item>
+      </el-form>
     </el-drawer>
   </div>
 </template>
 
 <script>
 import topInfo from '@/layout/public/top.vue';
-import dataForm from '@/components/form.vue';
 import dataTable from '@/components/data-table.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('role');
 export default {
   name: 'index',
   props: {},
-  components: { topInfo, dataTable, dataForm },
+  components: { topInfo, dataTable },
   data: () => {
     return {
       drawer: false,
@@ -71,7 +91,7 @@ export default {
     toAdd() {
       this.drawer = true;
     },
-    async drawerSave({ data, isNew }) {
+    async drawerSave({ data = this.form, isNew = this.drawerIsNew }) {
       let res;
       let msg;
       if (isNew) {
@@ -87,6 +107,7 @@ export default {
       }
     },
     toEdit({ data }) {
+      if (data.code) data.type = '2';
       this.$set(this, 'form', data);
       this.drawer = true;
       this.drawerIsNew = false;
@@ -100,6 +121,12 @@ export default {
       this.form = {};
       this.drawerIsNew = true;
     },
+    clearCode(data) {
+      if (data == '1') this.form.code = undefined;
+    },
+    updateView() {
+      this.$forceUpdate();
+    },
   },
   computed: {
     ...mapState(['user']),

src/views/permission/index.vue

@@ -123,6 +123,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.el-drawer__body {
+  overflow: scroll;
+}
 .top {
   height: 40px;
   background-color: #f5f5f5;