huwhois 4 years ago
parent
commit
33c08d874f
3 changed files with 42 additions and 130 deletions
  1. 12 59
      src/router/index.js
  2. 1 3
      src/views/modules/admin/sign.vue
  3. 29 68
      src/views/modules/admin/signinfo.vue

+ 12 - 59
src/router/index.js

@ -69,8 +69,7 @@ router.beforeEach((to, from, next) => {
69 69
      params: http.adornParams()
70 70
    }).then(({data}) => {
71 71
      if (data && data.code === 0) {
72
        // fnAddDynamicMenuRoutes(data.menuList)
73
        fnAddDynamicMenuRoutesMy(data.menuList)
72
        fnAddDynamicMenuRoutes(data.menuList)
74 73
        router.options.isAddDynamicMenuRoutes = true
75 74
        sessionStorage.setItem('menuList', JSON.stringify(data.menuList || '[]'))
76 75
        sessionStorage.setItem('permissions', JSON.stringify(data.permissions || '[]'))
@ -103,67 +102,13 @@ function fnCurrentRouteType (route, globalRoutes = []) {
103 102
  return temp.length >= 1 ? fnCurrentRouteType(route, temp) : 'main'
104 103
}
105 104
106
/**
107
 * 添加动态(菜单)路由
108
 * @param {*} menuList 菜单列表
109
 * @param {*} routes 递归创建的动态(菜单)路由
110
 */
111
// function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
112
//   var temp = []
113
//   for (var i = 0; i < menuList.length; i++) {
114
//     if (menuList[i].list && menuList[i].list.length >= 1) {
115
//       temp = temp.concat(menuList[i].list)
116
//     } else if (menuList[i].url && /\S/.test(menuList[i].url)) {
117
//       menuList[i].url = menuList[i].url.replace(/^\//, '')
118
//       var route = {
119
//         path: menuList[i].url.replace('/', '-'),
120
//         component: null,
121
//         name: menuList[i].url.replace('/', '-'),
122
//         meta: {
123
//           menuId: menuList[i].menuId,
124
//           title: menuList[i].name,
125
//           isDynamic: true,
126
//           isTab: true,
127
//           iframeUrl: ''
128
//         }
129
//       }
130
//       // url以http[s]://开头, 通过iframe展示
131
//       if (isURL(menuList[i].url)) {
132
//         route['path'] = `i-${menuList[i].menuId}`
133
//         route['name'] = `i-${menuList[i].menuId}`
134
//         route['meta']['iframeUrl'] = menuList[i].url
135
//       } else {
136
//         try {
137
//           route['component'] = _import(`modules/${menuList[i].url}`) || null
138
//         } catch (e) {}
139
//       }
140
141
//       routes.push(route)
142
//     }
143
//   }
144
//   if (temp.length >= 1) {
145
//     fnAddDynamicMenuRoutes(temp, routes)
146
//   } else {
147
//     mainRoutes.name = 'main-dynamic'
148
//     mainRoutes.children = routes
149
//     router.addRoutes([
150
//       mainRoutes,
151
//       { path: '*', redirect: { name: '404' } }
152
//     ])
153
//     sessionStorage.setItem('dynamicMenuRoutes', JSON.stringify(mainRoutes.children || '[]'))
154
//     console.log('\n')
155
//     console.log('%c!<-------------------- 动态(菜单)路由 s -------------------->', 'color:blue')
156
//     console.log(mainRoutes.children)
157
//     console.log('%c!<-------------------- 动态(菜单)路由 e -------------------->', 'color:blue')
158
//   }
159
// }
160
161 105
/**
162 106
 * 2020-03-11 修改动态路由
107
 * 添加动态(菜单)路由
163 108
 * @param {*} menuList 菜单列表
164 109
 * @param {*} routes 递归创建的动态(菜单)路由
165 110
 */
166
function fnAddDynamicMenuRoutesMy (menuList = [], routes = []) {
111
function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
167 112
  var temp = []
168 113
  for (var i = 0; i < menuList.length; i++) {
169 114
    if (menuList[i].list && menuList[i].list.length >= 1) {
@ -174,6 +119,9 @@ function fnAddDynamicMenuRoutesMy (menuList = [], routes = []) {
174 119
        path: addMeetingId(menuList[i].url.replace('/', '-'), menuList[i].me),
175 120
        component: null,
176 121
        name: addMeetingId(menuList[i].url.replace('/', '-'), menuList[i].me),
122
        // path: menuList[i].url.replace('/', '-'),
123
        // component: null,
124
        // name: menuList[i].url.replace('/', '-'),
177 125
        meta: {
178 126
          menuId: menuList[i].menuId,
179 127
          title: menuList[i].name,
@ -197,7 +145,7 @@ function fnAddDynamicMenuRoutesMy (menuList = [], routes = []) {
197 145
    }
198 146
  }
199 147
  if (temp.length >= 1) {
200
    fnAddDynamicMenuRoutesMy(temp, routes)
148
    fnAddDynamicMenuRoutes(temp, routes)
201 149
  } else {
202 150
    mainRoutes.name = 'main-dynamic'
203 151
    mainRoutes.children = routes
@ -213,6 +161,11 @@ function fnAddDynamicMenuRoutesMy (menuList = [], routes = []) {
213 161
  }
214 162
}
215 163
164
/**
165
 * 会议相关路由添加路由参数id
166
 * @param {*} url
167
 * @param {*} me
168
 */
216 169
function addMeetingId (url, me) {
217 170
  // console.log(url)
218 171
  if (me === 1) {

+ 1 - 3
src/views/modules/admin/sign.vue

@ -128,10 +128,8 @@
128 128
        meetingId: 0
129 129
      }
130 130
    },
131
    created () {
132
      this.meetingId = this.$route.params.id
133
    },
134 131
    activated () {
132
      this.meetingId = this.$route.params.id
135 133
      this.getDataList()
136 134
    },
137 135
    methods: {

+ 29 - 68
src/views/modules/admin/signinfo.vue

@ -22,24 +22,6 @@
22 22
        align="center"
23 23
        width="50">
24 24
      </el-table-column>
25
      <el-table-column
26
        prop="id"
27
        header-align="center"
28
        align="center"
29
        label="签到id">
30
      </el-table-column>
31
      <el-table-column
32
        prop="aId"
33
        header-align="center"
34
        align="center"
35
        label="参会人员id">
36
      </el-table-column>
37
      <el-table-column
38
        prop="meetingId"
39
        header-align="center"
40
        align="center"
41
        label="会议id">
42
      </el-table-column>
43 25
      <el-table-column
44 26
        prop="truename"
45 27
        header-align="center"
@ -52,71 +34,46 @@
52 34
        align="center"
53 35
        label="所属机构(单位名称、公司名称">
54 36
      </el-table-column>
55
      <el-table-column
56
        prop="position"
57
        header-align="center"
58
        align="center"
59
        label="职位id">
60
      </el-table-column>
61
      <el-table-column
62
        prop="jobTitle"
63
        header-align="center"
64
        align="center"
65
        label="职称">
66
      </el-table-column>
67
      <el-table-column
68
        prop="phone"
69
        header-align="center"
70
        align="center"
71
        label="电话">
72
      </el-table-column>
73
      <el-table-column
74
        prop="typeId"
75
        header-align="center"
76
        align="center"
77
        label="参会人员类型id">
78
      </el-table-column>
79 37
      <el-table-column
80 38
        prop="typeAttenders"
81 39
        header-align="center"
82 40
        align="center"
83
        label="">
84
      </el-table-column>
85
      <el-table-column
86
        prop="servicer"
87
        header-align="center"
88
        align="center"
89
        label="负责人(员工id)">
90
      </el-table-column>
91
      <el-table-column
92
        prop="servername"
93
        header-align="center"
94
        align="center"
95
        label="">
41
        label="用户类型">
96 42
      </el-table-column>
97 43
      <el-table-column
98 44
        prop="isPay"
99 45
        header-align="center"
100 46
        align="center"
101
        label="">
47
        label="是否已缴费">
48
        <template slot-scope="scope">
49
          <span v-if="scope.row.isPay === 1">是</span>
50
          <span v-else>否</span>
51
        </template>
102 52
      </el-table-column>
103 53
      <el-table-column
104
        prop="status"
54
        prop="regflag"
105 55
        header-align="center"
106 56
        align="center"
107
        label="签到状态">
57
        label="注册情况">
58
        <template slot-scope="scope">
59
          <span>{{registerStatus[scope.row.regflag]}}</span>
60
        </template>
108 61
      </el-table-column>
109 62
      <el-table-column
110 63
        prop="badge"
111 64
        header-align="center"
112 65
        align="center"
113 66
        label="是否完成胸卡打印">
67
        <template slot-scope="scope">
68
          <span v-if="scope.row.badge === 1">是</span>
69
          <span v-else>否</span>
70
        </template>
114 71
      </el-table-column>
115 72
      <el-table-column
116
        prop="lastTime"
73
        prop="servername"
117 74
        header-align="center"
118 75
        align="center"
119
        label="最后签到时间">
76
        label="负责人">
120 77
      </el-table-column>
121 78
      <el-table-column
122 79
        prop="note"
@ -124,17 +81,11 @@
124 81
        align="center"
125 82
        label="备注">
126 83
      </el-table-column>
127
      <el-table-column
128
        prop="regflag"
129
        header-align="center"
130
        align="center"
131
        label="注册情况 0, 1, 2, 现场注册">
132
      </el-table-column>
133 84
      <el-table-column
134 85
        prop="createTime"
135 86
        header-align="center"
136 87
        align="center"
137
        label="创建时间">
88
        label="注册时间">
138 89
      </el-table-column>
139 90
      <el-table-column
140 91
        fixed="right"
@ -167,6 +118,13 @@
167 118
  export default {
168 119
    data () {
169 120
      return {
121
        // 注册情况
122
        registerStatus: {
123
          '0': '',
124
          '1': '网上报名',
125
          '2': '现场注册',
126
          '3': '后台添加'
127
        },
170 128
        dataForm: {
171 129
          key: ''
172 130
        },
@ -176,13 +134,15 @@
176 134
        totalPage: 0,
177 135
        dataListLoading: false,
178 136
        dataListSelections: [],
179
        addOrUpdateVisible: false
137
        addOrUpdateVisible: false,
138
        meetindId: 0
180 139
      }
181 140
    },
182 141
    components: {
183 142
      AddOrUpdate
184 143
    },
185 144
    activated () {
145
      this.meetindId = this.$route.params.id
186 146
      this.getDataList()
187 147
    },
188 148
    methods: {
@ -193,6 +153,7 @@
193 153
          url: this.$http.adornUrl('/admin/signinfo/list'),
194 154
          method: 'get',
195 155
          params: this.$http.adornParams({
156
            'meetingId': this.meetindId,
196 157
            'page': this.pageIndex,
197 158
            'limit': this.pageSize,
198 159
            'key': this.dataForm.key