merge

package-lock.json

@@ -1476,6 +1476,11 @@
         "@types/node": "*"
       }
     },
+    "@types/json-schema": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+      "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -4480,6 +4485,14 @@
       "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
       "dev": true
     },
+    "copy-anything": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz",
+      "integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==",
+      "requires": {
+        "is-what": "^3.7.1"
+      }
+    },
     "copy-concurrently": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
@@ -5956,7 +5969,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "dev": true,
       "requires": {
         "prr": "~1.0.1"
       }
@@ -10069,6 +10081,11 @@
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
+    "is-what": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz",
+      "integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw=="
+    },
     "is-windows": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
@@ -10250,6 +10267,11 @@
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
     },
+    "klona": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
+      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA=="
+    },
     "launch-editor": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz",
@@ -10308,6 +10330,114 @@
         "invert-kv": "^1.0.0"
       }
     },
+    "less": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.0.0.tgz",
+      "integrity": "sha512-av1eEa2D0xZfF7fjLJS/Dld7zAYSLU7EOEJvuOELeaNI3i6L/81AdjbK5/pytaRkBwi7ZEa0433IDvMLskKCOw==",
+      "requires": {
+        "copy-anything": "^2.0.1",
+        "errno": "^0.1.1",
+        "graceful-fs": "^4.1.2",
+        "image-size": "~0.5.0",
+        "make-dir": "^2.1.0",
+        "mime": "^1.4.1",
+        "native-request": "^1.0.5",
+        "parse-node-version": "^1.0.1",
+        "source-map": "~0.6.0",
+        "tslib": "^1.10.0"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "optional": true
+        },
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "optional": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "optional": true
+        }
+      }
+    },
+    "less-loader": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.2.0.tgz",
+      "integrity": "sha512-C/08kYL2+wFLFQ/c8tey4qX6xpPVtBBwGa9gtpI/bktWpSUaUkZxeOUMM2zGDrQ4s/ZVpA+Rv2RyIvwEXNVuIg==",
+      "requires": {
+        "klona": "^2.0.4",
+        "loader-utils": "^2.0.0",
+        "schema-utils": "^3.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.5.2",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+          "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
+        },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+        },
+        "json5": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        },
+        "schema-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "requires": {
+            "@types/json-schema": "^7.0.6",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
+          }
+        }
+      }
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -10738,7 +10868,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
@@ -10747,14 +10876,12 @@
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
         },
         "semver": {
           "version": "5.7.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
         }
       }
     },
@@ -11267,6 +11394,12 @@
         "to-regex": "^3.0.1"
       }
     },
+    "native-request": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz",
+      "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==",
+      "optional": true
+    },
     "natives": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz",
@@ -14689,8 +14822,7 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -17301,8 +17433,7 @@
     "tslib": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-      "dev": true
+      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ=="
     },
     "tty-browserify": {
       "version": "0.0.0",

package.json

@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "axios": "^0.19.0",
-    "babel-plugin-component": "^1.1.1",
     "babel-eslint": "^8.0.1",
+    "babel-plugin-component": "^1.1.1",
     "element-theme": "^2.0.1",
     "element-ui": "^2.11.1",
     "gulp-autoprefixer": "^6.1.0",
@@ -25,6 +25,8 @@
     "gulp-rename": "^1.4.0",
     "gulp-sass": "^4.0.2",
     "js-cookie": "^2.2.0",
+    "less": "^4.0.0",
+    "less-loader": "^7.2.0",
     "lodash": "^4.17.15",
     "node-sass": "^4.12.0",
     "qs": "^6.7.0",

public/index.html

 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
@@ -9,7 +10,7 @@
     window.SITE_CONFIG = {};
     window.SITE_CONFIG['version'] = 'v1.0.0';
     window.SITE_CONFIG['nodeEnv'] = '<%= process.env.VUE_APP_NODE_ENV %>';
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/hmit-admin';                      // api请求地址
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.10.169:8080/hmit-admin';                      // api请求地址
     window.SITE_CONFIG['storeState'] = {};                  // vuex本地储存初始化状态（用于不刷新页面的情况下，也能重置初始化项目中所有状态）
     window.SITE_CONFIG['contentTabDefault'] = {             // 内容标签页默认属性对象
       'name': '',        // 名称, 由 this.$route.name 自动赋值（默认，名称 === 路由名称 === 路由路径）
@@ -28,23 +29,25 @@
   </script>
 
   <!-- 开发环境 -->
-  <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
+  <% if (process.env.VUE_APP_NODE_ENV==='dev' ) { %>
     <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/hmit-admin';</script>
     <% } %>
       <!-- 集成测试环境 -->
-  <% if (process.env.VUE_APP_NODE_ENV === 'prod:sit') { %>
+      <% if (process.env.VUE_APP_NODE_ENV==='prod:sit' ) { %>
         <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/hmit-admin';</script>
         <% } %>
           <!-- 验收测试环境 -->
-  <% if (process.env.VUE_APP_NODE_ENV === 'prod:uat') { %>
+          <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %>
             <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/hmit-admin';</script>
             <% } %>
               <!-- 生产环境 -->
-  <% if (process.env.VUE_APP_NODE_ENV === 'prod') { %>
+              <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %>
                 <script>window.SITE_CONFIG['apiURL'] = 'http://localhost:8080/hmit-admin';</script>
                 <% } %>
 </head>
+
 <body>
   <div id="app"></div>
 </body>
+
 </html>
\ No newline at end of file

src/api/index.js

+import {
+    getData,
+    postData,
+    getListData,
+    postDataWithQuery,
+    postDataFile,
+    putData,
+    postDataImage,
+    deleteData
+} from "../utils/request";
+
+//会议详情
+export function getwoFaultTypeList() {
+    return getData("/workorder/wofaulttype/woFaultTypeList");
+}
+
+//会议保存
+export function getMeeting(dto) {
+    return postData("/meeting/meeting", dto);
+}
\ No newline at end of file

src/i18n/index.js

@@ -16,7 +16,7 @@ export const messages = {
     ...zhCN,
     ...zhCNLocale
   },
-  'zh-TW': {
+  /*  'zh-TW': {
      '_lang': '繁體中文',
      ...zhTW,
      ...zhTWLocale
@@ -25,7 +25,7 @@ export const messages = {
      '_lang': 'English',
      ...enUS,
      ...enLocale
-  }
+   } */
 }
 
 export default new VueI18n({

src/router/index.js

@@ -12,7 +12,7 @@ export const pageRoutes = [
     component: () => import('@/views/pages/404'),
     name: '404',
     meta: { title: '404未找到' },
-    beforeEnter (to, from, next) {
+    beforeEnter(to, from, next) {
       // 拦截处理特殊业务场景
       // 如果, 重定向路由包含__双下划线, 为临时添加路由
       if (/__.*/.test(to.redirectedFrom)) {
@@ -32,11 +32,18 @@ export const moduleRoutes = {
   redirect: { name: 'home' },
   meta: { title: '主入口布局' },
   children: [
-    { path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } }
+    { path: '/home', component: () => import('@/views/modules/home'), name: 'home', meta: { title: '首页', isTab: true } },
+    { path: '/memberManageExamine', component: () => import('@/views/modules/auditInformationManage/memberManageExamine'), name: '会员信息审核', meta: { title: '会员信息审核', isTab: false } },
+
+    { path: '/memberManageDetail', component: () => import('@/views/modules/memberManage/memberManageDetail'), name: '会员信息详情', meta: { title: '会员信息详情', isTab: false } },
+    { path: '/meetingsAdd', component: () => import('@/views/modules/meeting/meetingsAdd'), name: '会议新增', meta: { title: '会议新增', isTab: false } },
+    { path: '/meetingsDetail', component: () => import('@/views/modules/meeting/meetingsDetail'), name: '会议详情', meta: { title: '会议详情', isTab: true } },
+    { path: '/member', component: () => import('@/views/modules/user/user'), name: '会员信息管理', meta: { title: '会员信息管理', isTab: true } },
+    { path: '/shenhe', component: () => import('@/views/modules/auditInformationManage/auditInformationManage'), name: '审核信息管理', meta: { title: '审核信息管理', isTab: true } },
   ]
 }
 
-export function addDynamicRoute (routeParams, router) {
+export function addDynamicRoute(routeParams, router) {
   // 组装路由名称, 并判断是否已添加, 如是: 则直接跳转
   var routeName = routeParams.routeName
   var dynamicRoute = window.SITE_CONFIG['dynamicRoutes'].filter(item => item.name === routeName)[0]
@@ -83,7 +90,7 @@ router.beforeEach((to, from, next) => {
       return
     }
     window.SITE_CONFIG['dictList'] = res.data
-  }).catch(() => {})
+  }).catch(() => { })
   // 获取菜单列表, 添加并全局变量保存
   http.get('/sys/menu/nav').then(({ data: res }) => {
     if (res.code !== 0) {
@@ -103,7 +110,7 @@ router.beforeEach((to, from, next) => {
  * @param {*} route 当前路由
  * @param {*} pageRoutes 页面路由
  */
-function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
+function fnCurrentRouteIsPageRoute(route, pageRoutes = []) {
   var temp = []
   for (var i = 0; i < pageRoutes.length; i++) {
     if (route.path === pageRoutes[i].path) {
@@ -121,7 +128,7 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
  * @param {*} menuList 菜单列表
  * @param {*} routes 递归创建的动态(菜单)路由
  */
-function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
+function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
   var temp = []
   for (var i = 0; i < menuList.length; i++) {
     if (menuList[i].children && menuList[i].children.length >= 1) {

src/utils/request.js

@@ -10,7 +10,11 @@ const http = axios.create({
   timeout: 1000 * 180,
   withCredentials: true
 })
-
+const baseURLL = 'http://192.168.10.157:8080/hmit-admin';
+export function gettoken() {
+  let token = localStorage.getItem("token");
+  return token;
+}
 /**
  * 请求拦截
  */
@@ -61,4 +65,185 @@ http.interceptors.response.use(response => {
   return Promise.reject(error)
 })
 
+export const getData = (url, data) => {
+  let token = gettoken();
+  return new Promise(function (resolve, reject) {
+    axios
+      .get(baseURLL + url, {
+        params: data,
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8",
+          token: token,
+        },
+      })
+      .then(
+        (res) => {
+          console.log("token", token);
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        },
+        (err) => {
+          reject(err);
+        }
+      );
+  });
+};
+
+export const deleteData = (url, data) => {
+  let token = gettoken();
+  return new Promise(function (resolve, reject) {
+    axios
+      .delete(baseURLL + url, {
+        params: data,
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8",
+          token: token,
+        },
+      })
+      .then(
+        (res) => {
+          console.log("token", token);
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        },
+        (err) => {
+          reject(err);
+        }
+      );
+  });
+};
+export const postData = (url, data) => {
+  let token = gettoken();
+  return new Promise(function (resolve, reject) {
+    axios
+      .post(baseURLL + url, data, {
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8",
+          token: token,
+        },
+      })
+      .then(
+        //zcps_token
+        (res) => {
+          console.log("token", token);
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        }
+      );
+  });
+  console.log("aaaaaaaaa", token);
+};
+
+export const putData = (url, data) => {
+  let token = gettoken();
+  return new Promise(function (resolve, reject) {
+    axios
+      .post(baseURLL + url, data, {
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8",
+          token: token,
+        },
+      })
+      .then(
+        //zcps_token
+        (res) => {
+          console.log("token", token);
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        }
+      );
+  });
+};
+export const postDataFile = (url, data) => {
+  return new Promise(function (resolve, reject) {
+    axios
+      .post(baseURLL + url, data, {
+
+        headers: {
+          "Content-Type": "multipart/form-data",
+          Accept: "application/json",
+        },
+      })
+      .then(
+        //zcps_token
+        (res) => {
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        }
+      );
+  });
+};
+
+export const postDataImage = (url, data, remark, flowchartid) => {
+  return new Promise(function (resolve, reject) {
+    axios
+      .post(baseURLL + url, data, {
+        params: { remark: remark, flowchartid: flowchartid },
+        headers: {
+          "Content-Type": "multipart/form-data",
+          Accept: "application/json",
+        },
+      })
+      .then(
+        //zcps_token
+        (res) => {
+          if (res.status === 200) {
+            resolve(res);
+          } else {
+            reject(res);
+          }
+        }
+      );
+  });
+};
+export const postFile = (url, data) => {
+  /*  return new Promise(function (resolve,reject) {
+    axios.post(`${baseUrl}${ url }?${{headers: { 'Content-Type': 'multipart/form-data' }}}${formatDataQuery(data)}`).then(
+      (res)=>{
+        if(res.status===200){
+          resolve(res.data)
+        }else{
+          reject(res)
+        }
+      },
+      (err)=>{
+        console.log('err',err)
+        reject(err)
+      }
+    )
+  })*/
+};
+export const postDataWithQuery = (url, data) => {
+  return new Promise(function (resolve, reject) {
+    axios.post(`${baseURLL}${url}?${formatDataQuery(data)}`).then(
+      (res) => {
+        if (res.status === 200) {
+          resolve(res.data);
+        } else {
+          reject(res);
+        }
+      },
+      (err) => {
+        console.log("err", err);
+        reject(err);
+      }
+    );
+  });
+};
+
 export default http

src/views/modules/area/area-add-or-update.vue

 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="父类ID" prop="parentId">
-          <el-input v-model="dataForm.parentId" placeholder="父类ID"></el-input>
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.id ? $t('add') : $t('update')"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      label-width="120px"
+    >
+      <el-form-item
+        prop="name"
+        :label="$t('dept.name')"
+      >
+        <el-input
+          v-model="dataForm.name"
+          :placeholder="$t('dept.name')"
+        ></el-input>
       </el-form-item>
-          <el-form-item label="区市名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="区市名"></el-input>
+      <el-form-item
+        prop="parentName"
+        :label="$t('dept.parentName')"
+        class="dept-list"
+      >
+        <el-popover
+          v-model="deptListVisible"
+          ref="deptListPopover"
+          placement="bottom-start"
+          trigger="click"
+        >
+          <el-tree
+            :data="deptList"
+            :props="{ label: 'name', children: 'children' }"
+            node-key="id"
+            ref="deptListTree"
+            :highlight-current="true"
+            :expand-on-click-node="false"
+            accordion
+            @current-change="deptListTreeCurrentChangeHandle"
+          >
+          </el-tree>
+        </el-popover>
+        <el-input
+          v-model="dataForm.parentName"
+          v-popover:deptListPopover
+          :readonly="true"
+          :placeholder="$t('dept.parentName')"
+        >
+          <i
+            v-if="$store.state.user.superAdmin === 1 && dataForm.pid !== '0'"
+            slot="suffix"
+            @click.stop="deptListTreeSetDefaultHandle()"
+            class="el-icon-circle-close el-input__icon"
+          >
+          </i>
+        </el-input>
       </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+      <el-form-item
+        prop="sort"
+        :label="$t('dept.sort')"
+      >
+        <el-input-number
+          v-model="dataForm.sort"
+          controls-position="right"
+          :min="0"
+          :label="$t('dept.sort')"
+        ></el-input-number>
       </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button
+        type="primary"
+        @click="dataFormSubmitHandle()"
+      >{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
+import debounce from "lodash/debounce";
 export default {
-  data () {
+  data() {
     return {
       visible: false,
+      deptList: [],
+      deptListVisible: false,
       dataForm: {
-        id: '',
-        parentId: '',
-        name: '',
-        sort: '',
-        creator: '',
-        createDate: ''
-      }
-    }
+        id: "",
+        name: "",
+        pid: "",
+        parentName: "",
+        sort: 0,
+      },
+    };
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
-        parentId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
         ],
-        sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
+        parentName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "change",
+          },
+        ],
+      };
+    },
   },
   methods: {
-    init () {
-      this.visible = true
+    init() {
+      this.visible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs["dataForm"].resetFields();
+        this.getDeptList().then(() => {
           if (this.dataForm.id) {
-          this.getInfo()
+            this.getInfo();
+          } else if (this.$store.state.user.superAdmin === 1) {
+            this.deptListTreeSetDefaultHandle();
+          }
+        });
+      });
+    },
+    // 获取部门列表
+    getDeptList() {
+      return this.$http
+        .get("/area/area/list")
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
           }
+          this.deptList = res.data;
         })
+        .catch(() => {});
     },
     // 获取信息
-    getInfo () {
-      this.$http.get(`/area/area/${this.dataForm.id}`).then(({ data: res }) => {
+    getInfo() {
+      this.$http
+        .get(`/area/area/${this.dataForm.id}`)
+        .then(({ data: res }) => {
           if (res.code !== 0) {
-          return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           }
           this.dataForm = {
             ...this.dataForm,
-          ...res.data
+            ...res.data,
+          };
+          if (this.dataForm.pid === "0") {
+            return this.deptListTreeSetDefaultHandle();
           }
-      }).catch(() => {})
+          this.$refs.deptListTree.setCurrentKey(this.dataForm.pid);
+        })
+        .catch(() => {});
+    },
+    // 上级部门树, 设置默认值
+    deptListTreeSetDefaultHandle() {
+      this.dataForm.pid = "0";
+      this.dataForm.parentName = this.$t("dept.parentNameDefault");
+    },
+    // 上级部门树, 选中
+    deptListTreeCurrentChangeHandle(data) {
+      this.dataForm.pid = data.id;
+      this.dataForm.parentName = data.name;
+      this.deptListVisible = false;
     },
     // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
           if (!valid) {
-          return false
+            return false;
           }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/area/area/', this.dataForm).then(({ data: res }) => {
+          this.$http[!this.dataForm.id ? "post" : "put"](
+            "/area/area",
+            this.dataForm
+          )
+            .then(({ data: res }) => {
               if (res.code !== 0) {
-            return this.$message.error(res.msg)
+                return this.$message.error(res.msg);
               }
               this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
+                message: this.$t("prompt.success"),
+                type: "success",
                 duration: 500,
                 onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                },
+              });
             })
-    }, 1000, { 'leading': true, 'trailing': false })
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
+</script>
+
+<style lang="scss">
+.mod-sys__dept {
+  .dept-list {
+    .el-input__inner,
+    .el-input__suffix {
+      cursor: pointer;
+    }
   }
 }
-</script>
+</style>

src/views/modules/area/area.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-area__area}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="mod-sys__dept">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('area:area:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button v-if="$hasPermission('area:area:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button
+            v-if="$hasPermission('area:area:save')"
+            type="primary"
+            @click="addOrUpdateHandle()"
+          >{{ $t('add') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="区市ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentId" label="父类ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="name" label="区市名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        row-key="id"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column
+          prop="name"
+          :label="$t('dept.name')"
+          header-align="center"
+          min-width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="parentName"
+          :label="$t('dept.parentName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sort"
+          :label="$t('dept.sort')"
+          header-align="center"
+          align="center"
+          width="80"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('area:area:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('area:area:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('area:area:update')"
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id)"
+            >{{ $t('update') }}</el-button>
+            <el-button
+              v-if="$hasPermission('area:area:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
-      </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './area-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./area-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/area/area/page',
-        getDataListIsPage: true,
-        exportURL: '/area/area/export',
-        deleteURL: '/area/area',
-        deleteIsBatch: true
+        getDataListURL: "/area/area/list",
+        deleteURL: "/area/area",
       },
-      dataForm: {
-        id: ''
-      }
-    }
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/auditInformationManage/auditInformationManage.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="mod-sys__user">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.company"
+            placeholder="请输入单位名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('user:user:delete')"
+            type="danger"
+            @click="deleteHandle()"
+          >{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+
+        <!--  <el-form-item>
+          <el-button
+            type="info"
+            @click="taozhuan()"
+          >跳转页面测试按钮</el-button>
+        </el-form-item> -->
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+
+        <el-table-column
+          prop="company"
+          label="单位"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="联系人"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="email"
+          label="邮箱"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="updateDate"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!--   <el-table-column prop="id" label="用户ID" header-align="center" align="center"></el-table-column>
+       
+        <el-table-column prop="sex" label="性别；1,男;2,女" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+       
+        
+        <el-table-column prop="position" label="所属职位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="member" label="是否会员;1,是;2,否" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="committeeId" label="委员会ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="areaId" label="区市ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ifCheck" label="是否审核;0,待审核1,已审核;2,审核未通过" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="openid" label="微信用户openId" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
+   
+        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              v-if="$hasPermission('user:user:update')"
+              type="text"
+              size="small"
+              @click="taozhuan(scope.row.id)"
+            >审核</el-button>
+            <!--  <el-button
+              v-if="$hasPermission('user:user:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/user/user/page",
+        getDataListIsPage: true,
+        exportURL: "/user/user/export",
+        deleteURL: "/user/user",
+        deleteIsBatch: true,
+      },
+      dataForm: {
+        company: "",
+        name: "",
+      },
+    };
+  },
+  methods: {
+    taozhuan(id) {
+      console.log("id", id);
+      this.$router.push({
+        path: "/memberManageExamine",
+        query: { type: "shenhe", id: id },
+      });
+    },
+  },
+  shenhe(id) {},
+};
+</script>

src/views/modules/auditInformationManage/memberManageExamine.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="memberManageExamine">
+      <div class="title"><span class="substyle"><span v-if="type=='shenhe'">审核</span> <span v-if="type=='xiugai'">修改</span> </span> </div>
+    </div>
+
+    <div class="content">
+      <el-form
+        ref="dataForm"
+        :model="dataForm"
+        :rules="dataRule"
+        label-position="left"
+        label-width="150px"
+      >
+        <el-form-item
+          label="单位"
+          prop="company"
+        >
+          <el-input v-model="dataForm.company"></el-input>
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input v-model="dataForm.name"></el-input>
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-radio-group v-model="dataForm.sex">
+            <el-radio label="1">男</el-radio>
+            <el-radio label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="职位">
+          <el-input v-model="dataForm.position"></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="dataForm.mobile"></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱">
+          <el-input v-model="dataForm.email"></el-input>
+        </el-form-item>
+
+        <el-form-item label="上传日期">
+          <el-input v-model="dataForm.updateDate"></el-input>
+        </el-form-item>
+        <el-form-item
+          required
+          prop="ifCheck"
+          v-show="type=='shenhe'"
+          label="审核状态"
+        >
+
+          <el-radio-group
+            v-model="dataForm.ifCheck"
+            @change="changeAuditStatus"
+          >
+            <el-radio label="2">不通过</el-radio>
+            <el-radio label="1">通过</el-radio>
+          </el-radio-group>
+
+        </el-form-item>
+
+        <el-form-item
+          required
+          prop="areaName"
+          v-if="dataForm.ifCheck==1"
+          label="所属市区级"
+        >
+          <el-select
+            style="width:100%"
+            v-model="dataForm.areaName"
+            placeholder="请选择所属市区级"
+          >
+            <el-option
+              v-for="item in optionsOfLocation"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <!--  <el-cascader
+            style="width:100%"
+            v-model="dataForm.areaName"
+            placeholder="请选择所属市区级"
+            :options="optionsOfLocation"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader> -->
+        </el-form-item>
+
+        <el-form-item
+          required
+          prop="committeeName"
+          v-if="dataForm.ifCheck==1"
+          label="所属委员会"
+        >
+          <el-select
+            style="width:100%"
+            v-model="dataForm.committeeName"
+            placeholder="请选择所属委员会"
+            clearable
+          >
+            <el-option
+              v-for="item in optionsOfCommittee"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+
+      <div class="footer">
+        <el-button
+          style="margin-right:40px;border:1px solid #17B3A3;color:#17B3A3;width:100px"
+          @click="goback"
+        >
+          返回
+        </el-button>
+        <el-button
+          style="background:#17B3A3;color:#fff;width:100px"
+          @click="dataFormSubmitHandle()"
+        >
+          <span v-if="type=='shenhe'"> 完成</span>
+          <span v-if="type=='xiugai'"> 保存</span>
+        </el-button>
+      </div>
+    </div>
+
+  </el-card>
+</template>
+
+<script>
+import debounce from "lodash/debounce";
+export default {
+  name: "memberManageExamine",
+  data() {
+    return {
+      type: this.$route.query.type,
+
+      dataForm: {
+        id: "",
+        name: "",
+        company: "", //单位
+        sex: "1",
+        /*  position: "", //职位
+        mobile: "",
+        email: "",
+        ifCheck: 1, //审核状态
+        location: "", //所属市区级
+        committee: "", //所属委员会
+        uploadDate: "", //上传日期 */
+      },
+      optionsOfLocation: [
+        {
+          value: "宁波市",
+          label: "宁波市",
+        },
+        {
+          value: "海曙区",
+          label: "海曙区",
+        },
+        {
+          value: "鄞州区",
+          label: "鄞州区",
+        },
+        {
+          value: "北仑区",
+          label: "北仑区",
+        },
+        {
+          value: "镇海区",
+          label: "镇海区",
+        },
+        /*  {
+          value: "ningbo",
+          label: "宁波市",
+          children: [
+            {
+              value: "haishu",
+              label: "海曙区",
+            },
+            {
+              value: "yingzhou",
+              label: "鄞州区",
+            },
+            {
+              value: "beilun",
+              label: "北仑区",
+            },
+            {
+              value: "zhenhai",
+              label: "镇海区",
+            },
+          ],
+        }, */
+      ],
+      optionsOfCommittee: [
+        {
+          value: "网络安全协会",
+          label: "网络安全协会",
+        },
+        {
+          value: "网络安全协会1",
+          label: "网络安全协会1",
+        },
+        {
+          value: "网络安全协会2",
+          label: "网络安全协会2",
+        },
+        {
+          value: "网络安全协会3",
+          label: "网络安全协会3",
+        },
+        {
+          value: "网络安全协会4",
+          label: "网络安全协会4",
+        },
+      ],
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        /*   company: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ], */
+        ifCheck: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        areaName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        committeeName: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    /*  if (this.$route.query.type == "xiugai") {
+      this.dataForm.ifCheck = 2;
+    } */
+    this.init();
+  },
+  methods: {
+    init() {
+      this.dataForm.id = this.$route.query.id;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/user/user/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          this.dataForm.sex = this.dataForm.sex + "";
+          if (this.dataForm.ifCheck == 0) {
+            this.dataForm.ifCheck = "2";
+          } else {
+            this.dataForm.ifCheck = this.dataForm.ifCheck + "";
+          }
+
+          console.log(this.dataForm);
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: function () {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+
+        this.$confirm("确定提交吗？")
+          .then((_) => {
+            this.$http[!this.dataForm.id ? "post" : "put"](
+              "/user/user/",
+              this.dataForm
+            )
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.$message({
+                  message: this.$t("prompt.success"),
+                  type: "success",
+                  /*   onClose: () => {
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                }, */
+                });
+              })
+              .catch(() => {});
+          })
+          .then(() => {
+            /*  if (this.type == "xiugai") {
+              this.$router.push({ path: "/member" });
+            } else {
+              this.$router.push({ path: "/shenhe" });
+            } */
+            this.$router.go(-1);
+          })
+          .catch((_) => {});
+      });
+    },
+    /*  submitForm(formName) {
+      this.$confirm("确定提交吗？")
+        .then((_) => {
+          this.$refs[formName].validate((valid) => {
+            if (valid) {
+              alert("submit!");
+            } else {
+              console.log("error submit!!");
+              return false;
+            }
+          });
+        })
+        .catch((_) => {});
+    }, */
+    changeAuditStatus(value) {
+      this.dataForm.ifCheck = value;
+    },
+    //返回按钮事件
+    goback() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-form {
+  width: 50%;
+  padding-left: 20px;
+}
+
+.memberManageExamine {
+  width: 100%;
+  font-size: 18px;
+  .title {
+    width: 99%;
+    margin: 0 auto;
+    margin-bottom: 50px;
+
+    padding-bottom: 5px;
+    border-bottom: 1px solid #ccc;
+
+    .substyle {
+      border-left: 5px solid #43cc93;
+      padding-left: 10px;
+    }
+  }
+}
+
+.footer {
+  width: 60%;
+  margin: 0 auto;
+}
+</style>
\ No newline at end of file

src/views/modules/committee/committee-add-or-update.vue

 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="委员会名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="委员会名称"></el-input>
+  <el-dialog
+    :visible.sync="visible"
+    :title="!dataForm.id ? $t('add') : $t('update')"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+  >
+    <el-form
+      :model="dataForm"
+      :rules="dataRule"
+      ref="dataForm"
+      @keyup.enter.native="dataFormSubmitHandle()"
+      :label-width="$i18n.locale === 'en-US' ? '120px' : '150px'"
+    >
+      <el-form-item
+        label="委员会名称"
+        prop="name"
+      >
+        <el-input
+          v-model="dataForm.name"
+          placeholder="委员会名称"
+        ></el-input>
       </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+      <el-form-item
+        label="排序"
+        prop="sort"
+      >
+        <el-input
+          v-model="dataForm.sort"
+          placeholder="排序"
+        ></el-input>
       </el-form-item>
     </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button
+        type="primary"
+        @click="dataFormSubmitHandle()"
+      >{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
 
 <script>
-import debounce from 'lodash/debounce'
+import debounce from "lodash/debounce";
 export default {
-  data () {
+  data() {
     return {
       visible: false,
       dataForm: {
-        id: '',
-        name: '',
-        sort: '',
-        creator: '',
-        createDate: ''
-      }
-    }
+        id: "",
+        name: "",
+        sort: "",
+        creator: "",
+        createDate: "",
+      },
+    };
   },
   computed: {
-    dataRule () {
+    dataRule() {
       return {
         name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
         ],
         sort: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ]
-      }
-    }
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
   },
   methods: {
-    init () {
-      this.visible = true
+    init() {
+      this.visible = true;
       this.$nextTick(() => {
-        this.$refs['dataForm'].resetFields()
+        this.$refs["dataForm"].resetFields();
         if (this.dataForm.id) {
-          this.getInfo()
+          this.getInfo();
         }
-      })
+      });
     },
     // 获取信息
-    getInfo () {
-      this.$http.get(`/committee/committee/${this.dataForm.id}`).then(({ data: res }) => {
+    getInfo() {
+      this.$http
+        .get(`/committee/committee/${this.dataForm.id}`)
+        .then(({ data: res }) => {
           if (res.code !== 0) {
-          return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           }
           this.dataForm = {
             ...this.dataForm,
-          ...res.data
-        }
-      }).catch(() => {})
+            ...res.data,
+          };
+        })
+        .catch(() => {});
     },
     // 表单提交
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs['dataForm'].validate((valid) => {
+    dataFormSubmitHandle: debounce(
+      function () {
+        this.$refs["dataForm"].validate((valid) => {
           if (!valid) {
-          return false
+            return false;
           }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/committee/committee/', this.dataForm).then(({ data: res }) => {
+          this.$http[!this.dataForm.id ? "post" : "put"](
+            "/committee/committee/",
+            this.dataForm
+          )
+            .then(({ data: res }) => {
               if (res.code !== 0) {
-            return this.$message.error(res.msg)
+                return this.$message.error(res.msg);
               }
               this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
+                message: this.$t("prompt.success"),
+                type: "success",
                 duration: 500,
                 onClose: () => {
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
-          })
-        }).catch(() => {})
+                  this.visible = false;
+                  this.$emit("refreshDataList");
+                },
+              });
             })
-    }, 1000, { 'leading': true, 'trailing': false })
-  }
-}
+            .catch(() => {});
+        });
+      },
+      1000,
+      { leading: true, trailing: false }
+    ),
+  },
+};
 </script>

src/views/modules/committee/committee.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
     <div class="mod-committee__committee}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <!--  <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -10,25 +17,59 @@
         </el-form-item>
         <el-form-item>
           <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
-          <el-button v-if="$hasPermission('committee:committee:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button
+            v-if="$hasPermission('committee:committee:save')"
+            type="primary"
+            @click="addOrUpdateHandle()"
+          >{{ $t('add') }}</el-button>
         </el-form-item>
-        <el-form-item>
+        <!-- <el-form-item>
           <el-button v-if="$hasPermission('committee:committee:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="委员会ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="name" label="委员会名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;"
+      >
+
+        <el-table-column
+          prop="name"
+          label="委员会名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sort"
+          label="排序"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('committee:committee:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('committee:committee:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('committee:committee:update')"
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id)"
+            >{{ $t('update') }}</el-button>
+            <el-button
+              v-if="$hasPermission('committee:committee:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -39,35 +80,40 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './committee-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./committee-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/committee/committee/page',
+        getDataListURL: "/committee/committee/page",
         getDataListIsPage: true,
-        exportURL: '/committee/committee/export',
-        deleteURL: '/committee/committee',
-        deleteIsBatch: true
+        exportURL: "/committee/committee/export",
+        deleteURL: "/committee/committee",
+        deleteIsBatch: true,
       },
       dataForm: {
-        id: ''
-      }
-    }
+        id: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/home.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-home">
-      <el-row :gutter="20">
-        <el-col :span="12" :xs="24">
-          <table>
-            <tr>
-              <th>{{ $t('home.sysInfo.name') }}</th>
-              <td>{{ $t('home.sysInfo.nameVal') }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.version') }}</th>
-              <td>{{ $t('home.sysInfo.versionVal') }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.osName') }}</th>
-              <td>{{ sysInfo.osName }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.osVersion') }}</th>
-              <td>{{ sysInfo.osVersion }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.osArch') }}</th>
-              <td>{{ sysInfo.osArch }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.processors') }}</th>
-              <td>{{ sysInfo.processors }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.totalPhysical') }}</th>
-              <td>{{ sysInfo.totalPhysical }}MB</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.freePhysical') }}</th>
-              <td>{{ sysInfo.freePhysical }}MB</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.memoryRate') }}</th>
-              <td>{{ sysInfo.memoryRate }}%</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.userLanguage') }}</th>
-              <td>{{ sysInfo.userLanguage }}</td>
-            </tr>
-          </table>
-        </el-col>
-        <el-col :span="12" :xs="24">
-          <table>
-            <tr>
-              <th>{{ $t('home.sysInfo.jvmName') }}</th>
-              <td>{{ sysInfo.jvmName }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.javaVersion') }}</th>
-              <td>{{ sysInfo.javaVersion }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.javaHome') }}</th>
-              <td>{{ sysInfo.javaHome }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.userDir') }}</th>
-              <td>{{ sysInfo.userDir }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.javaTotalMemory') }}</th>
-              <td>{{ sysInfo.javaTotalMemory }}MB</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.javaFreeMemory') }}</th>
-              <td>{{ sysInfo.javaFreeMemory }}MB</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.javaMaxMemory') }}</th>
-              <td>{{ sysInfo.javaMaxMemory }}MB</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.userName') }}</th>
-              <td>{{ sysInfo.userName }}</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.systemCpuLoad') }}</th>
-              <td>{{ sysInfo.systemCpuLoad }}%</td>
-            </tr>
-            <tr>
-              <th>{{ $t('home.sysInfo.userTimezone') }}</th>
-              <td>{{ sysInfo.userTimezone }}</td>
-            </tr>
-          </table>
-        </el-col>
-      </el-row>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div
+      class="mod-home"
+      style="text-align:center;font-size:30px"
+    >
+      欢迎登陆汇民综合管理系统！！
     </div>
   </el-card>
 </template>
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       sysInfo: {
-        osName: '',
-        osVersion: '',
-        osArch: '',
+        osName: "",
+        osVersion: "",
+        osArch: "",
         processors: 0,
         totalPhysical: 0,
         freePhysical: 0,
         memoryRate: 0,
-        userLanguage: '',
-        jvmName: '',
-        javaVersion: '',
-        javaHome: '',
-        userDir: '',
+        userLanguage: "",
+        jvmName: "",
+        javaVersion: "",
+        javaHome: "",
+        userDir: "",
         javaTotalMemory: 0,
         javaFreeMemory: 0,
         javaMaxMemory: 0,
-        userName: '',
+        userName: "",
         systemCpuLoad: 0,
-        userTimezone: ''
-      }
-    }
+        userTimezone: "",
       },
-  created () {
-    this.getSysInfo()
+    };
+  },
+  created() {
+    this.getSysInfo();
   },
   methods: {
-    getSysInfo () {
-      this.$http.get('/sys/info').then(({ data: res }) => {
+    getSysInfo() {
+      this.$http
+        .get("/sys/info")
+        .then(({ data: res }) => {
           if (res.code !== 0) {
-          return this.$message.error(res.msg)
-        }
-        this.sysInfo = res.data
-      }).catch(() => {})
+            return this.$message.error(res.msg);
           }
-  }
-}
+          this.sysInfo = res.data;
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>

src/views/modules/meeting/committee-table.vue

+<template>
+  <div class="committee-table">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
+      <el-form-item>
+        <el-input
+          v-model="dataForm.committee"
+          placeholder="委员会名称"
+          clearable
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-input
+          v-model="dataForm.name"
+          placeholder="姓名"
+          clearable
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button
+          @click="getDataList()"
+          type="primary"
+        >{{ $t('query') }}</el-button>
+      </el-form-item>
+
+    </el-form>
+    <!--  <el-table
+      v-loading="dataListLoading"
+      :data="dataList"
+      row-key="id"
+      border
+      style="width: 100%;"
+      @selection-change="dataListSelectionChangeHandle"
+      @sort-change="dataListSortChangeHandle"
+    >
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="name"
+        label="委员会人员"
+        header-align="center"
+        min-width="150"
+      ></el-table-column>
+
+    </el-table> -->
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;margin-bottom: 20px;"
+      row-key="id"
+      border
+      :indent="16"
+      :select-on-indeterminate="false"
+      @select="select"
+      @select-all="selectAll"
+      @selection-change="selectionChange"
+      :tree-props="{children: 'childList'}"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="委员会人员"
+        header-align="center"
+      >
+      </el-table-column>
+
+    </el-table>
+    {{ selectArr.map(el => el.id) }}
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+export default {
+  name: "committee-table",
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/sys/dept/list",
+        deleteURL: "/sys/dept",
+      },
+      tableData: [
+        {
+          id: 1,
+          name: "会长及副会长",
+          childList: [
+            {
+              id: 31,
+              name: "王小虎",
+            },
+            {
+              id: 32,
+              name: "王小虎",
+            },
+          ],
+        },
+        {
+          id: 2,
+          name: "协会监事",
+          childList: [
+            {
+              id: 3,
+              name: "张亮亮",
+            },
+            {
+              id: 4,
+              name: "王小虎",
+            },
+          ],
+        },
+      ],
+      selectArr: [],
+      dataForm: {
+        committee: "",
+        name: "",
+      },
+    };
+  },
+  methods: {
+    select(selection, row) {
+      if (
+        selection.some((el) => {
+          return row.id === el.id;
+        })
+      ) {
+        if (row.childList) {
+          row.childList.map((j) => {
+            this.toggleSelection(j, true);
+          });
+        }
+      } else {
+        if (row.childList) {
+          row.childList.map((j) => {
+            this.toggleSelection(j, false);
+          });
+        }
+      }
+    },
+    selectAll(selection) {
+      // tabledata第一层只要有在selection里面就是全选
+      const isSelect = selection.some((el) => {
+        const tableDataIds = this.tableData.map((j) => j.id);
+        return tableDataIds.includes(el.id);
+      });
+      // tableDate第一层只要有不在selection里面就是全不选
+      const isCancel = !this.tableData.every((el) => {
+        const selectIds = selection.map((j) => j.id);
+        return selectIds.includes(el.id);
+      });
+      if (isSelect) {
+        selection.map((el) => {
+          if (el.childList) {
+            el.childList.map((j) => {
+              this.toggleSelection(j, true);
+            });
+          }
+        });
+      }
+      if (isCancel) {
+        this.tableData.map((el) => {
+          if (el.childList) {
+            el.childList.map((j) => {
+              this.toggleSelection(j, false);
+            });
+          }
+        });
+      }
+    },
+    selectionChange(selection) {
+      this.selectArr = selection;
+    },
+    toggleSelection(row, select) {
+      if (row) {
+        this.$nextTick(() => {
+          this.$refs.table && this.$refs.table.toggleRowSelection(row, select);
+        });
+      }
+    },
+    cancelAll() {
+      this.$refs.table.clearSelection();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.committee-table {
+  width: 100%;
+}
+</style>
\ No newline at end of file

src/views/modules/meeting/location-table.vue

+<template>
+  <div class="location-table">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
+      <el-form-item>
+        <el-cascader
+          v-model="dataForm.location"
+          placeholder="请选择所属市区级"
+          :options="optionsOfLocation"
+          :props="{ checkStrictly: true }"
+          clearable
+        ></el-cascader>
+      </el-form-item>
+      <el-form-item>
+        <el-input
+          v-model="dataForm.name"
+          placeholder="姓名"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          @click="getDataList()"
+          type="primary"
+        >{{ $t('query') }}</el-button>
+      </el-form-item>
+
+    </el-form>
+    <!--  <el-table
+      v-loading="dataListLoading"
+      :data="dataList"
+      row-key="id"
+      border
+      @selection-change="dataListSelectionChangeHandle1"
+      @sort-change="dataListSortChangeHandle"
+      style="width: 100%;"
+    >
+      <el-table-column
+        type="selection"
+        header-align="center"
+        align="center"
+        width="50"
+      ></el-table-column>
+     
+
+      <el-table-column
+        prop="name"
+        label="委员会人员"
+        header-align="center"
+        min-width="150"
+      >
+       
+
+      </el-table-column>
+
+    </el-table> -->
+
+    <el-table
+      ref="table"
+      :data="tableData"
+      style="width: 100%;margin-bottom: 20px;"
+      row-key="id"
+      border
+      :indent="16"
+      :select-on-indeterminate="false"
+      @select="select"
+      @select-all="selectAll"
+      @selection-change="selectionChange"
+      :tree-props="{children: 'childList'}"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="委员会人员"
+        header-align="center"
+      >
+      </el-table-column>
+
+    </el-table>
+    {{ selectArr.map(el => el.id) }}
+    <!--   <div style="margin-top: 20px">
+      <el-button @click="cancelAll()">取消选择</el-button>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+export default {
+  name: "location-table",
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      tableData: [
+        {
+          id: 1,
+          name: "鄞州区",
+          childList: [
+            {
+              id: 31,
+              name: "王小虎",
+            },
+            {
+              id: 32,
+              name: "王小虎",
+            },
+          ],
+        },
+        {
+          id: 2,
+          name: "海曙区",
+          childList: [
+            {
+              id: 311,
+              name: "张亮亮",
+            },
+            {
+              id: 321,
+              name: "王小虎",
+            },
+          ],
+        },
+      ],
+      selectArr: [],
+
+      mixinViewModuleOptions: {
+        getDataListURL: "/sys/dept/list",
+        deleteURL: "/sys/dept",
+      },
+      dataListSelections: [],
+      dataForm: {
+        name: "",
+        location: "",
+      },
+      optionsOfLocation: [
+        {
+          value: "ningbo",
+          label: "宁波",
+          children: [
+            {
+              value: "haishu",
+              label: "海曙区",
+            },
+            {
+              value: "yingzhou",
+              label: "鄞州区",
+            },
+            {
+              value: "beilun",
+              label: "北仑区",
+            },
+            {
+              value: "zhenhai",
+              label: "镇海区",
+            },
+          ],
+        },
+      ],
+    };
+  },
+  methods: {
+    dataListSelectionChangeHandle1(val) {
+      this.dataListSelections = val;
+      console.log(val);
+    },
+    select(selection, row) {
+      if (
+        selection.some((el) => {
+          return row.id === el.id;
+        })
+      ) {
+        if (row.childList) {
+          row.childList.map((j) => {
+            this.toggleSelection(j, true);
+          });
+        }
+      } else {
+        if (row.childList) {
+          row.childList.map((j) => {
+            this.toggleSelection(j, false);
+          });
+        }
+      }
+    },
+    selectAll(selection) {
+      // tabledata第一层只要有在selection里面就是全选
+      const isSelect = selection.some((el) => {
+        const tableDataIds = this.tableData.map((j) => j.id);
+        return tableDataIds.includes(el.id);
+      });
+      // tableDate第一层只要有不在selection里面就是全不选
+      const isCancel = !this.tableData.every((el) => {
+        const selectIds = selection.map((j) => j.id);
+        return selectIds.includes(el.id);
+      });
+      if (isSelect) {
+        selection.map((el) => {
+          if (el.childList) {
+            el.childList.map((j) => {
+              this.toggleSelection(j, true);
+            });
+          }
+        });
+      }
+      if (isCancel) {
+        this.tableData.map((el) => {
+          if (el.childList) {
+            el.childList.map((j) => {
+              this.toggleSelection(j, false);
+            });
+          }
+        });
+      }
+    },
+    selectionChange(selection) {
+      this.selectArr = selection;
+    },
+    toggleSelection(row, select) {
+      if (row) {
+        this.$nextTick(() => {
+          this.$refs.table && this.$refs.table.toggleRowSelection(row, select);
+        });
+      }
+    },
+    cancelAll() {
+      this.$refs.table.clearSelection();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.location-table {
+  width: 100%;
+}
+</style>
\ No newline at end of file

src/views/modules/meeting/meeting.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
     <div class="mod-meeting__meeting}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="会议名称"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <!-- <el-form-item>
+          <el-button
+            type="info"
+            @click="exportHandle()"
+          >{{ $t('export') }}</el-button>
+        </el-form-item> -->
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button
+            v-if="$hasPermission('meeting:meeting:save')"
+            type="primary"
+            @click="add()"
+          >{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('meeting:meeting:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button
+            v-if="$hasPermission('meeting:meeting:delete')"
+            type="danger"
+            @click="deleteHandle()"
+          >{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('meeting:meeting:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button @click="detail()">详情测试</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="会议ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="name" label="会议名称" header-align="center" align="center"></el-table-column>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="会议名称"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="createDate"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!--  <el-table-column prop="id" label="会议ID" header-align="center" align="center"></el-table-column>
+     
         <el-table-column prop="author" label="发布人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="content" label="会议内容" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column> -->
+
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('meeting:meeting:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('meeting:meeting:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('meeting:meeting:update')"
+              type="text"
+              size="small"
+              @click="add(scope.row.id)"
+            >{{ $t('update') }}</el-button>
+            <!--  <el-button
+              v-if="$hasPermission('meeting:meeting:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button> -->
+            <el-button
+              type="text"
+              size="small"
+              @click="detail(scope.row.id)"
+            >详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -40,35 +109,58 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './meeting-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./meeting-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/meeting/meeting/page',
+        getDataListURL: "/meeting/meeting/page",
         getDataListIsPage: true,
-        exportURL: '/meeting/meeting/export',
-        deleteURL: '/meeting/meeting',
-        deleteIsBatch: true
+        exportURL: "/meeting/meeting/export",
+        deleteURL: "/meeting/meeting",
+        deleteIsBatch: true,
       },
       dataForm: {
-        id: ''
-      }
-    }
+        name: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+  methods: {
+    add(id) {
+      this.$router.push({
+        path: "/meetingsAdd",
+        query: {
+          id: id,
+        },
+      });
+    },
+    detail(id) {
+      this.$router.push({
+        path: "/meetingsDetail",
+        query: {
+          id: id,
+        },
+      });
+    },
+  },
+};
 </script>

src/views/modules/meeting/meetingsAdd.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="meetingsAdd">
+      <div class="title"><span class="substyle">会议内容 </span> </div>
+      <div class="meetingsContent">
+        <el-form
+          :rules="dataRule"
+          ref="dataForm"
+          :model="dataForm"
+        >
+          <div
+            class="meeting"
+            style="width:100%;border:2px solid #ccc;border-radius:5px;margin-bottom:20px"
+          >
+            <el-form-item prop="name">
+              <el-input
+                v-model="dataForm.name"
+                style="font-size:22px;border:0"
+                placeholder="请在这里输入会议标题"
+              ></el-input>
+            </el-form-item>
+            <el-form-item
+              prop="content"
+              label=""
+            >
+
+              <el-input
+                type="textarea"
+                :rows="14"
+                resize="none"
+                v-model="dataForm.content"
+                placeholder="请在这里输入会议内容"
+              ></el-input>
+
+            </el-form-item>
+          </div>
+          <el-form-item
+            label="选择发送人员:"
+            prop="allPeople"
+          >
+
+            <el-tooltip
+              :content="dataForm.allPeople"
+              placement="left"
+              :disabled="people.length>0?false:true"
+            >
+              <div class="peoplehide">
+                <span
+                  v-for="(item,index) in people.slice(0,200)"
+                  :key="index"
+                >
+                  {{item}}
+                  <span v-if="index<199&&index<people.length-1">、</span>
+
+                </span>
+
+                <span v-if="people.length>200">...</span>
+                <el-button
+                  @click="isShow=true"
+                  class="sendbtn"
+                  circle
+                  icon="el-icon-plus"
+                ></el-button>
+              </div>
+
+            </el-tooltip>
+
+          </el-form-item>
+
+        </el-form>
+
+        <el-dialog
+          title="选择发送人员"
+          :visible.sync="isShow"
+          width="50%"
+          :before-close="handleClose"
+        >
+          <el-tabs
+            v-model="activeName"
+            @tab-click="handleClick"
+          >
+            <el-tab-pane
+              label="委员会选择"
+              name="first"
+            >
+              <committeeTable />
+            </el-tab-pane>
+            <el-tab-pane
+              label="市区级选择"
+              name="second"
+            >
+              <locationTable />
+            </el-tab-pane>
+
+          </el-tabs>
+          <span
+            slot="footer"
+            class="dialog-footer"
+          >
+            <el-button @click="handleClose1">取 消</el-button>
+            <el-button
+              type="primary"
+              @click="sub()"
+            >确 认</el-button>
+          </span>
+        </el-dialog>
+
+      </div>
+
+      <div class="footer">
+        <el-button
+          style="border:1px solid #17B3A3;color:#17B3A3;width:100px"
+          @click="goback"
+        >
+          返回
+        </el-button>
+        <el-button
+          @click="dataFormSubmitHandle()"
+          style="background:#17B3A3;color:#fff"
+        >保存并发送
+        </el-button>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import committeeTable from "./committee-table";
+import locationTable from "./location-table";
+import debounce from "lodash/debounce";
+
+export default {
+  name: "meetingsAdd",
+  data() {
+    return {
+      isShow: false,
+
+      activeName: "first",
+      people: ["111", "222"],
+      dataForm: {
+        id: "",
+        name: "",
+        content: "",
+        allPeople: "",
+      },
+    };
+  },
+  computed: {
+    dataRule() {
+      return {
+        name: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        content: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+        allPeople: [
+          {
+            required: true,
+            message: this.$t("validate.required"),
+            trigger: "blur",
+          },
+        ],
+      };
+    },
+  },
+  created() {
+    this.init();
+    this.dataForm.allPeople = this.people.join(",");
+  },
+  methods: {
+    init() {
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.$route.query.id) {
+          this.dataForm.id = this.$route.query.id;
+          if (this.dataForm.id) {
+            this.getInfo();
+          }
+        }
+      });
+    },
+    //确定选择人员
+    sub() {
+      this.$confirm("确定提交吗？")
+        .then((_) => {
+          this.isShow = false;
+        })
+        .catch((_) => {});
+    },
+
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/meeting/meeting/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          console.log(this.dataForm);
+        })
+        .catch(() => {});
+    },
+    // 表单提交
+    dataFormSubmitHandle: function () {
+      this.$refs["dataForm"].validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+
+        this.$confirm("确定提交吗？")
+          .then((_) => {
+            this.$http[!this.dataForm.id ? "post" : "put"](
+              "/meeting/meeting/",
+              this.dataForm
+            )
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg);
+                }
+                this.$message({
+                  message: this.$t("prompt.success"),
+                  type: "success",
+                });
+              })
+              .catch(() => {});
+          })
+          .catch((_) => {});
+      });
+    },
+
+    //提交表单
+    /*   submitForm(formName) {
+      this.$confirm("确定保存并发送吗？")
+        .then((_) => {
+          this.$refs[formName].validate((valid) => {
+            if (valid) {
+              alert("submit!");
+            } else {
+              console.log("error submit!!");
+              return false;
+            }
+          });
+        })
+        .catch((_) => {});
+    }, */
+    //模态框右上角关闭按钮的事件
+    handleClose(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          done();
+        })
+        .catch((_) => {});
+    },
+    //取消按钮的事件
+    handleClose1(done) {
+      this.$confirm("确认关闭？")
+        .then((_) => {
+          this.isShow = false;
+        })
+        .catch((_) => {});
+    },
+    handleClick(tab, event) {
+      console.log(tab, event);
+    },
+
+    //返回按钮事件
+    goback() {
+      this.$router.go(-1);
+    },
+  },
+  components: {
+    committeeTable,
+    locationTable,
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-textarea__inner {
+  font-size: 16px;
+  border: 0;
+  padding: 0 0 0 30px;
+}
+.meeting {
+  /deep/.el-input__inner {
+    font-size: 22px !important;
+    border: 0;
+  }
+}
+
+/deep/.el-dialog__header {
+  background: #17b3a3;
+  /deep/.el-dialog__title {
+    color: #fff;
+  }
+
+  /deep/ .el-dialog {
+    background: #fff;
+  }
+  /deep/.el-dialog__headerbtn .el-dialog__close {
+    color: #fff;
+  }
+}
+
+/* /deep/.el-tooltip__popper {
+  width: 600px !important;
+} */
+/* /deep/.el-tooltip__popper.is-dark {
+  background: red;
+  color: #fff;
+  width: 50%;
+} */
+
+.meetingsAdd {
+  width: 100%;
+  font-size: 18px;
+
+  /*  /deep/.el-textarea__inner {
+    font-size: 14px;
+  } */
+
+  .title {
+    width: 99%;
+    margin: 0 auto;
+    margin-bottom: 20px;
+
+    padding-bottom: 5px;
+    border-bottom: 1px solid #ccc;
+
+    .substyle {
+      border-left: 5px solid #43cc93;
+      padding-left: 10px;
+    }
+  }
+  .meetingsContent {
+    width: 98%;
+    margin: 0 auto;
+    .sendbtn {
+      margin-left: 20px;
+      border: 1px solid #17b3a3;
+      color: #17b3a3;
+    }
+  }
+  .footer {
+    width: 99%;
+    text-align: right;
+  }
+  .peoplehide {
+    display: inline-block;
+    width: 85%;
+    /*  width: 200px;
+    height: 100px;
+    word-break: keep-all;
+
+    white-space: nowrap;
+
+    overflow: hidden;
+
+    text-overflow: ellipsis; */
+  }
+}
+</style>
\ No newline at end of file

src/views/modules/meeting/meetingsDetail.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="meetingsDetail">
+      <div class="title"><span class="substyle">会议内容 </span> </div>
+      <div class="meetingsContent">
+        <el-form>
+          <el-form-item label="">
+            <el-input
+              type="textarea"
+              :autosize="{ minRows: 6, maxRows: 14 }"
+              v-model="dataform1.meetingContent"
+              resize="none"
+              placeholder="暂无"
+              disabled
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            required
+            label="发送人员:"
+          >
+            <el-input
+              disabled
+              type="textarea"
+              :rows="4"
+              class="sendpeople"
+              placeholder="暂无"
+              v-model="dataform1.people"
+            ></el-input>
+
+          </el-form-item>
+        </el-form>
+
+        <div class="title other"><span class="substyle ">报名参会人员 </span> </div>
+        <el-form
+          :inline="true"
+          :model="dataForm"
+          @keyup.enter.native="getDataList()"
+        >
+          <el-form-item>
+            <el-input
+              v-model="dataForm.company"
+              placeholder="请输入单位名称"
+              clearable
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-input
+              v-model="dataForm.name"
+              placeholder="请输入姓名"
+              clearable
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              v-if="$hasPermission('sys:user:export')"
+              type="info"
+              @click="exportHandle()"
+            >{{ $t('export') }}</el-button>
+          </el-form-item>
+
+        </el-form>
+        <el-table
+          v-loading="dataListLoading"
+          :data="dataList"
+          border
+          @selection-change="dataListSelectionChangeHandle"
+          @sort-change="dataListSortChangeHandle"
+          style="width: 100%;"
+        >
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            width="50"
+          ></el-table-column>
+          <el-table-column
+            prop="company"
+            label="单位"
+            header-align="center"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="name"
+            label="姓名"
+            header-align="center"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="email"
+            label="邮箱"
+            header-align="center"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="mobile"
+            label="手机号"
+            sortable="custom"
+            header-align="center"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="gender"
+            label="性别"
+            sortable="custom"
+            header-align="center"
+            align="center"
+          >
+            <template slot-scope="scope">
+              {{ $getDictLabel("gender", scope.row.gender) }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="position"
+            label="职位"
+            header-align="center"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="createDate"
+            label="报名时间"
+            header-align="center"
+            align="center"
+            width="200"
+          ></el-table-column>
+
+        </el-table>
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="limit"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="pageSizeChangeHandle"
+          @current-change="pageCurrentChangeHandle"
+        >
+        </el-pagination>
+      </div>
+    </div>
+
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+export default {
+  name: "meetingsDetail",
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/sys/user/page",
+        getDataListIsPage: true,
+        deleteURL: "/sys/user",
+        deleteIsBatch: true,
+        exportURL: "/sys/user/export",
+      },
+      dataform1: {
+        meetingContent: "1111",
+        people:
+          "张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧，张网吧",
+      },
+      dataForm: {
+        company: "",
+        name: "",
+      },
+    };
+  },
+  methods: {
+    init() {
+      console.log(this.$route.query.id);
+      this.dataForm.id = this.$route.query.id;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+
+      console.log("ppp", this.dataForm.sex);
+      console.log("pppo", typeof this.dataForm.sex);
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/meeting/meeting/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          console.log("ppppppp", this.dataForm);
+          console.log("ppp", this.dataForm.sex);
+          this.dataForm.sex = this.dataForm.sex + "";
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-textarea__inner {
+  font-size: 22px;
+}
+/deep/.el-input.is-disabled .el-input__inner {
+  color: #000;
+  background: #fff;
+  // border: 0;
+  flex: 1;
+}
+/deep/.el-textarea.is-disabled .el-textarea__inner {
+  color: #000;
+  background: #fff;
+}
+
+/deep/.el-form-item__content {
+  display: flex;
+}
+
+.meetingsDetail {
+  width: 100%;
+  font-size: 18px;
+  .title {
+    width: 99%;
+    margin: 0 auto;
+    margin-bottom: 20px;
+
+    padding-bottom: 5px;
+    border-bottom: 1px solid #ccc;
+
+    .substyle {
+      border-left: 5px solid #43cc93;
+      padding-left: 10px;
+    }
+  }
+
+  .other {
+    //background: #eee;
+    margin-top: 50px;
+  }
+
+  .sendpeople {
+    /deep/.el-textarea__inner {
+      font-size: 14px;
+    }
+  }
+  .meetingsContent {
+    width: 98%;
+    margin: 0 auto;
+    .sendbtn {
+      border: 1px solid #17b3a3;
+      color: #17b3a3;
+    }
+  }
+}
+</style>
\ No newline at end of file

src/views/modules/memberManage/memberManage.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="mod-sys__user">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
+        <el-form-item>
+          <el-input
+            v-model="dataForm.company"
+            placeholder="请输入单位名称"
+            clearable
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-cascader
+            v-model="dataForm.location"
+            placeholder="请选择所属市区级"
+            :options="optionsOfLocation"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="dataForm.committee"
+            placeholder="请选择所属委员会"
+            clearable
+          >
+            <el-option
+              v-for="item in optionsOfCommittee"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('sys:user:delete')"
+            type="danger"
+            @click="deleteHandle()"
+          >{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('sys:user:export')"
+            type="info"
+            @click="exportHandle()"
+          >{{ $t('export') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="info"
+            @click="taozhuan()"
+          >跳转页面测试按钮</el-button>
+          <el-button
+            type="info"
+            @click="taozhuanDe()"
+          >跳转详情测试按钮</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        @sort-change="dataListSortChangeHandle"
+        style="width: 100%;"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="company"
+          label="单位"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="联系人"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          :label="$t('user.mobile')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="committee"
+          label="委员会"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+
+        <el-table-column
+          prop="location"
+          label="所属市区"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+
+        <el-table-column
+          prop="createDate"
+          :label="$t('user.createDate')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="taozhuan(scope.row.id)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="taozhuanDe(scope.row.id)"
+            >详情</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
+      </el-pagination>
+
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from "@/mixins/view-module";
+
+export default {
+  mixins: [mixinViewModule],
+  data() {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: "/user/user/page",
+        getDataListIsPage: true,
+        deleteURL: "/user/user",
+        deleteIsBatch: true,
+        exportURL: "/user/user/export",
+      },
+      dataForm: {
+        company: "",
+        name: "",
+        location: "",
+        committee: "",
+      },
+      optionsOfLocation: [
+        {
+          value: "ningbo",
+          label: "宁波",
+          children: [
+            {
+              value: "haishu",
+              label: "海曙区",
+            },
+            {
+              value: "yingzhou",
+              label: "鄞州区",
+            },
+            {
+              value: "beilun",
+              label: "北仑区",
+            },
+            {
+              value: "zhenhai",
+              label: "镇海区",
+            },
+          ],
+        },
+      ],
+      optionsOfCommittee: [
+        {
+          value: "网络安全协会",
+          label: "网络安全协会",
+        },
+        {
+          value: "网络安全协会1",
+          label: "网络安全协会1",
+        },
+        {
+          value: "网络安全协会2",
+          label: "网络安全协会2",
+        },
+        {
+          value: "网络安全协会3",
+          label: "网络安全协会3",
+        },
+        {
+          value: "网络安全协会4",
+          label: "网络安全协会4",
+        },
+      ],
+    };
+  },
+  methods: {
+    taozhuan(id) {
+      this.$router.push({
+        path: "/memberManageExamine",
+        query: { type: "xiugai" },
+      });
+    },
+
+    taozhuanDe(id) {
+      this.$router.push({
+        path: "/memberManageDetail",
+        query: { type: "xiangqing" },
+      });
+    },
+  },
+};
+</script>

src/views/modules/memberManage/memberManageDetail.vue

+<template>
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
+    <div class="memberManageDetail">
+      <div class="title"><span
+          v-if="type=='xiangqing'"
+          class="substyle"
+        >详情 </span> </div>
+    </div>
+
+    <div class="content">
+      <el-form
+        ref="dataForm"
+        :model="dataForm"
+        label-position="left"
+        label-width="150px"
+      >
+        <el-form-item label="单位">
+          <el-input
+            disabled
+            v-model="dataForm.company"
+            placeholder="暂无"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="姓名">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.name"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="性别">
+          <el-radio-group
+            disabled
+            v-model="dataForm.sex"
+          >
+            <el-radio label="1">男</el-radio>
+            <el-radio label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="职位">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.position"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.mobile"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="邮箱">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.email"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="上传日期">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.updateDate"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="所属市区级">
+
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.areaName"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item label="所属委员会">
+          <el-input
+            disabled
+            placeholder="暂无"
+            v-model="dataForm.committeeName"
+          ></el-input>
+        </el-form-item>
+
+      </el-form>
+
+      <div class="footer">
+        <el-button
+          style="border:1px solid #17B3A3;color:#17B3A3;width:100px;margin-left:170px"
+          @click="goback"
+        >
+          返回
+        </el-button>
+
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+export default {
+  name: "memberManageDetail",
+  data() {
+    return {
+      type: this.$route.query.type,
+      dataForm: {
+        id: "",
+        name: "",
+        company: "", //单位
+        sex: "1",
+        position: "", //职位
+        mobile: "",
+        email: "",
+        auditStatus: "1", //审核状态
+        location: "", //所属市区级
+        committee: "", //所属委员会
+        uploadDate: "", //上传日期
+      },
+    };
+  },
+  created() {
+    this.dataForm.id = this.$route.query.id;
+    this.init();
+  },
+  methods: {
+    //返回按钮事件
+    goback() {
+      this.$router.go(-1);
+    },
+    init() {
+      console.log(this.$route.query.id);
+      this.dataForm.id = this.$route.query.id;
+      this.$nextTick(() => {
+        this.$refs["dataForm"].resetFields();
+        if (this.dataForm.id) {
+          this.getInfo();
+        }
+      });
+
+      console.log("ppp", this.dataForm.sex);
+      console.log("pppo", typeof this.dataForm.sex);
+    },
+    // 获取信息
+    getInfo() {
+      this.$http
+        .get(`/user/user/${this.dataForm.id}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          }
+          this.dataForm = {
+            ...this.dataForm,
+            ...res.data,
+          };
+          console.log("ppppppp", this.dataForm);
+          console.log("ppp", this.dataForm.sex);
+          this.dataForm.sex = this.dataForm.sex + "";
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-form {
+  width: 50%;
+  padding-left: 20px;
+}
+/deep/.el-input.is-disabled .el-input__inner {
+  color: #000 !important;
+  background: #fff;
+}
+
+.memberManageDetail {
+  width: 100%;
+  font-size: 18px;
+  .title {
+    width: 99%;
+    margin: 0 auto;
+    margin-bottom: 50px;
+
+    padding-bottom: 5px;
+    border-bottom: 1px solid #ccc;
+
+    .substyle {
+      border-left: 5px solid #43cc93;
+      padding-left: 10px;
+    }
+  }
+}
+.footer {
+  width: 60%;
+}
+</style>
\ No newline at end of file

src/views/modules/sys/dept.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
     <div class="mod-sys__dept">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:dept:save')"
+            type="primary"
+            @click="addOrUpdateHandle()"
+          >{{ $t('add') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
-        <el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
-        <el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        row-key="id"
+        border
+        style="width: 100%;"
+      >
+        <el-table-column
+          prop="name"
+          :label="$t('dept.name')"
+          header-align="center"
+          min-width="150"
+        ></el-table-column>
+        <el-table-column
+          prop="parentName"
+          :label="$t('dept.parentName')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="sort"
+          :label="$t('dept.sort')"
+          header-align="center"
+          align="center"
+          width="80"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id)"
+            >{{ $t('update') }}</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './dept-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./dept-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/sys/dept/list',
-        deleteURL: '/sys/dept'
-      }
-    }
+        getDataListURL: "/sys/dept/list",
+        deleteURL: "/sys/dept",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/sys/user.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
     <div class="mod-sys__user">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-input v-model="dataForm.username" :placeholder="$t('user.username')" clearable></el-input>
+          <el-input
+            v-model="dataForm.username"
+            :placeholder="$t('user.username')"
+            clearable
+          ></el-input>
         </el-form-item>
         <el-form-item>
-          <ren-select v-model="dataForm.gender" dict-type="gender" :placeholder="$t('user.gender')"></ren-select>
+          <ren-select
+            v-model="dataForm.gender"
+            dict-type="gender"
+            :placeholder="$t('user.gender')"
+          ></ren-select>
         </el-form-item>
         <el-form-item>
-          <ren-dept-tree v-model="dataForm.deptId" :placeholder="$t('dept.title')" :query="true"></ren-dept-tree>
+          <el-form-item>
+            <el-cascader
+              v-model="dataForm.location"
+              placeholder="请选择所属市区级"
+              :options="optionsOfLocation"
+              :props="{ checkStrictly: true }"
+              clearable
+            ></el-cascader>
+          </el-form-item>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:save')"
+            type="primary"
+            @click="addOrUpdateHandle()"
+          >{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:delete')"
+            type="danger"
+            @click="deleteHandle()"
+          >{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('sys:user:export')" type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button
+            v-if="$hasPermission('sys:user:export')"
+            type="info"
+            @click="exportHandle()"
+          >{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table
@@ -30,28 +65,99 @@
         border
         @selection-change="dataListSelectionChangeHandle"
         @sort-change="dataListSortChangeHandle"
-        style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center" align="center">
+        style="width: 100%;"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="username"
+          :label="$t('user.username')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="deptName"
+          label="所属市区级"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="email"
+          :label="$t('user.email')"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          :label="$t('user.mobile')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="gender"
+          :label="$t('user.gender')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
             {{ $getDictLabel("gender", scope.row.gender) }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center" align="center">
+        <el-table-column
+          prop="status"
+          :label="$t('user.status')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('user.status0') }}</el-tag>
-            <el-tag v-else size="small" type="success">{{ $t('user.status1') }}</el-tag>
+            <el-tag
+              v-if="scope.row.status === 0"
+              size="small"
+              type="danger"
+            >{{ $t('user.status0') }}</el-tag>
+            <el-tag
+              v-else
+              size="small"
+              type="success"
+            >{{ $t('user.status1') }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center" align="center" width="180"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column
+          prop="createDate"
+          :label="$t('user.createDate')"
+          sortable="custom"
+          header-align="center"
+          align="center"
+          width="180"
+        ></el-table-column>
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('sys:user:update')"
+              type="text"
+              size="small"
+              @click="addOrUpdateHandle(scope.row.id)"
+            >{{ $t('update') }}</el-button>
+            <el-button
+              v-if="$hasPermission('sys:user:delete')"
+              type="text"
+              size="small"
+              @click="deleteHandle(scope.row.id)"
+            >{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -62,37 +168,66 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './user-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./user-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/sys/user/page',
+        getDataListURL: "/sys/user/page",
         getDataListIsPage: true,
-        deleteURL: '/sys/user',
+        deleteURL: "/sys/user",
         deleteIsBatch: true,
-        exportURL: '/sys/user/export'
+        exportURL: "/sys/user/export",
+      },
+      optionsOfLocation: [
+        {
+          value: "ningbo",
+          label: "宁波",
+          children: [
+            {
+              value: "haishu",
+              label: "海曙区",
+            },
+            {
+              value: "yingzhou",
+              label: "鄞州区",
+            },
+            {
+              value: "beilun",
+              label: "北仑区",
             },
+            {
+              value: "zhenhai",
+              label: "镇海区",
+            },
+          ],
+        },
+      ],
       dataForm: {
-        username: '',
-        deptId: '',
-        gender: ''
-      }
-    }
+        username: "",
+        deptId: "",
+        gender: "",
+      },
+    };
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

src/views/modules/user/user.vue

 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card
+    shadow="never"
+    class="aui-card--fill"
+  >
     <div class="mod-user__user}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+      >
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input
+            v-model="dataForm.company"
+            placeholder="请输入单位名称"
+            clearable
+          ></el-input>
         </el-form-item>
+
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-input
+            v-model="dataForm.name"
+            placeholder="请输入姓名"
+            clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-cascader
+            v-model="dataForm.area"
+            placeholder="请选择所属市区级"
+            :options="optionsOfLocation"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
         </el-form-item>
         <el-form-item>
-          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-select
+            v-model="dataForm.committee"
+            placeholder="请选择所属委员会"
+            clearable
+          >
+            <el-option
+              v-for="item in optionsOfCommittee"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
+
         <el-form-item>
-          <el-button v-if="$hasPermission('user:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+
         <el-form-item>
-          <el-button v-if="$hasPermission('user:user:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button
+            v-if="$hasPermission('user:user:delete')"
+            type="danger"
+            @click="deleteHandle()"
+          >{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button
+            v-if="$hasPermission('user:user:export')"
+            type="info"
+            @click="exportHandle()"
+          >{{ $t('export') }}</el-button>
+        </el-form-item>
+        <!--    <el-form-item>
+          <el-button
+            type="info"
+            @click="taozhuan()"
+          >跳转页面测试按钮</el-button>
+          <el-button
+            type="info"
+            @click="taozhuanDe()"
+          >跳转详情测试按钮</el-button>
+        </el-form-item> -->
       </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="用户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="name" label="用户名" header-align="center" align="center"></el-table-column>
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        @selection-change="dataListSelectionChangeHandle"
+        style="width: 100%;"
+      >
+        <el-table-column
+          type="selection"
+          header-align="center"
+          align="center"
+          width="50"
+        ></el-table-column>
+        <el-table-column
+          prop="company"
+          label="单位"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="name"
+          label="联系人"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          label="手机号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="committeeName"
+          label="委员会"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="areaName"
+          label="所属市区"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="updateDate"
+          label="创建时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <!--    <el-table-column prop="id" label="用户ID" header-align="center" align="center"></el-table-column>
+       
         <el-table-column prop="sex" label="性别；1,男;2,女" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+      
         <el-table-column prop="email" label="邮箱" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="company" label="企业名称" header-align="center" align="center"></el-table-column>
+    
         <el-table-column prop="position" label="所属职位" header-align="center" align="center"></el-table-column>
         <el-table-column prop="member" label="是否会员;1,是;2,否" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="committeeId" label="委员会ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="areaId" label="区市ID" header-align="center" align="center"></el-table-column>
+      
         <el-table-column prop="ifCheck" label="是否审核;0,待审核1,已审核;2,审核未通过" header-align="center" align="center"></el-table-column>
         <el-table-column prop="openid" label="微信用户openId" header-align="center" align="center"></el-table-column>
         <el-table-column prop="creator" label="创建者" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+       
+        <el-table-column prop="updateDate" label="更新时间" header-align="center" align="center"></el-table-column> -->
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="150"
+        >
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('user:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('user:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button
+              v-if="$hasPermission('user:user:update')"
+              type="text"
+              size="small"
+              @click="taozhuan(scope.row.id)"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="taozhuanDe(scope.row.id)"
+            >详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,35 +170,104 @@
         :total="total"
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <add-or-update
+        v-if="addOrUpdateVisible"
+        ref="addOrUpdate"
+        @refreshDataList="getDataList"
+      ></add-or-update>
     </div>
   </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './user-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./user-add-or-update";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/user/user/page',
+        getDataListURL: "/user/user/page",
         getDataListIsPage: true,
-        exportURL: '/user/user/export',
-        deleteURL: '/user/user',
-        deleteIsBatch: true
+        exportURL: "/user/user/export",
+        deleteURL: "/user/user",
+        deleteIsBatch: true,
       },
       dataForm: {
-        id: ''
-      }
-    }
+        company: "",
+        name: "",
+        area: "",
+        committee: "",
+      },
+      optionsOfLocation: [
+        {
+          value: "ningbo",
+          label: "宁波",
+          children: [
+            {
+              value: "haishu",
+              label: "海曙区",
+            },
+            {
+              value: "yingzhou",
+              label: "鄞州区",
+            },
+            {
+              value: "beilun",
+              label: "北仑区",
+            },
+            {
+              value: "zhenhai",
+              label: "镇海区",
+            },
+          ],
+        },
+      ],
+      optionsOfCommittee: [
+        {
+          value: "网络安全协会",
+          label: "网络安全协会",
+        },
+        {
+          value: "网络安全协会1",
+          label: "网络安全协会1",
+        },
+        {
+          value: "网络安全协会2",
+          label: "网络安全协会2",
+        },
+        {
+          value: "网络安全协会3",
+          label: "网络安全协会3",
+        },
+        {
+          value: "网络安全协会4",
+          label: "网络安全协会4",
+        },
+      ],
+    };
+  },
+  methods: {
+    taozhuan(id) {
+      this.$router.push({
+        path: "/memberManageExamine",
+        query: { type: "xiugai", id: id },
+      });
+    },
+
+    taozhuanDe(id) {
+      this.$router.push({
+        path: "/memberManageDetail",
+        query: { type: "xiangqing", id: id },
+      });
+    },
   },
   components: {
-    AddOrUpdate
-  }
-}
+    AddOrUpdate,
+  },
+};
 </script>

vue.config.js

@@ -2,6 +2,7 @@
  * 配置参考: https://cli.vuejs.org/zh/config/
  */
 module.exports = {
+  lintOnSave: false, //如果为false，就是取消eslint规则的检查
   publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   chainWebpack: config => {
     const svgRule = config.module.rule('svg')