Browse Source

5.14修改各项接口

lyn7568 4 years ago
parent
commit
2d58a55216

+ 1 - 1
index.html

4
  <meta charset="UTF-8">
4
  <meta charset="UTF-8">
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
  <meta http-equiv="X-UA-Compatible" content="ie=edge">
6
  <meta http-equiv="X-UA-Compatible" content="ie=edge">
7
  <title>人人快速开发平台</title>
7
  <title>科袖会议管理系统</title>
8
  <% if (process.env.NODE_ENV === 'production') { %>
8
  <% if (process.env.NODE_ENV === 'production') { %>
9
    <!-- 生产环境 -->
9
    <!-- 生产环境 -->
10
    <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>
10
    <script>document.write('<script src="./config/index.js?t=' + new Date().getTime() + '"><\/script>');</script>

+ 6 - 3
src/components/meetingbox/index.vue

3
    <el-card :body-style="{ padding: '8px' }" style="height:400px">
3
    <el-card :body-style="{ padding: '8px' }" style="height:400px">
4
      <div
4
      <div
5
        class="bg"
5
        class="bg"
6
        :style="{backgroundImage: 'url( http://121.42.53.174:9008/static' + image + ')', backgroundSize:'cover'}"
6
        :style="{backgroundImage: 'url( ' + image + ')', backgroundSize:'cover'}"
7
        @click="handClick()"
7
        @click="handClick()"
8
      ></div>
8
      ></div>
9
      <div style="padding: 14px;">
9
      <div style="padding: 14px;">
39
    return {
39
    return {
40
      id: "",
40
      id: "",
41
      httpimage: "",
41
      httpimage: "",
42
      image: null
42
      image: null,
43
      imageUrl: this.imageUrl
43
    };
44
    };
44
  },
45
  },
45
  props: {
46
  props: {
65
          .split(",")
66
          .split(",")
66
          .splice(0, 1)
67
          .splice(0, 1)
67
          .join();
68
          .join();
69
        this.image = this.imageUrl + this.image;
68
      } else {
70
      } else {
69
        this.image = this.httpimage;
71
        this.image = this.httpimage;
72
        this.image = this.imageUrl + this.image;
70
      }
73
      }
71
    },
74
    },
72
    //修改状态
75
    //修改状态
79
          status: this.list.isCheck === 0 ? 1 : 2
82
          status: this.list.isCheck === 0 ? 1 : 2
80
        }
83
        }
81
      }).then(({ data }) => {
84
      }).then(({ data }) => {
82
          window.console.log(data)
85
        window.console.log(data);
83
86
84
        if (data) {
87
        if (data) {
85
          this.$emit("statusMeeting");
88
          this.$emit("statusMeeting");

+ 1 - 0
src/main.js

24
Vue.prototype.isAuth = isAuth     // 权限方法
24
Vue.prototype.isAuth = isAuth     // 权限方法
25
Vue.prototype.meetingMenu = false     // 会议目录
25
Vue.prototype.meetingMenu = false     // 会议目录
26
Vue.prototype.meetingMenuId = 0     // 会议目录
26
Vue.prototype.meetingMenuId = 0     // 会议目录
27
Vue.prototype.imageUrl = 'http://121.42.53.174:9008/static'
27
28
28
// 保存整站vuex本地储存初始状态
29
// 保存整站vuex本地储存初始状态
29
window.SITE_CONFIG['storeState'] = cloneDeep(store.state)
30
window.SITE_CONFIG['storeState'] = cloneDeep(store.state)

+ 9 - 5
src/utils/index.js

5
/**
5
/**
6
 * 获取uuid
6
 * 获取uuid
7
 */
7
 */
8
export function getUUID () {
8
export function getUUID() {
9
  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
9
  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
10
    return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
10
    return (c === 'x' ? (Math.random() * 16 | 0) : ('r&0x3' | '0x8')).toString(16)
11
  })
11
  })
15
 * 是否有权限
15
 * 是否有权限
16
 * @param {*} key
16
 * @param {*} key
17
 */
17
 */
18
export function isAuth (key) {
18
export function isAuth(key) {
19
  return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
19
  return JSON.parse(sessionStorage.getItem('permissions') || '[]').indexOf(key) !== -1 || false
20
}
20
}
21
21
25
 * @param {*} id
25
 * @param {*} id
26
 * @param {*} pid
26
 * @param {*} pid
27
 */
27
 */
28
export function treeDataTranslate (data, id = 'id', pid = 'parentId') {
28
export function treeDataTranslate(data, id = 'id', pid = 'parentId') {
29
  var res = []
29
  var res = []
30
  var temp = {}
30
  var temp = {}
31
  for (var i = 0; i < data.length; i++) {
31
  for (var i = 0; i < data.length; i++) {
49
}
49
}
50
50
51
/**
51
/**
52
 * 清除登录信息
52
 * 清除登录信息clearLoginInfo
53
 */
53
 */
54
export function clearLoginInfo () {
54
export function clearLoginInfo() {
55
  Vue.cookie.delete('token')
55
  Vue.cookie.delete('token')
56
  store.commit('resetStore')
56
  store.commit('resetStore')
57
  router.options.isAddDynamicMenuRoutes = false
57
  router.options.isAddDynamicMenuRoutes = false
58
}
58
}
59
// 数组去重
60
export function set(arr) {
61
  return [...new Set(arr)]
62
}

+ 113 - 107
src/views/modules/admin/attenders-add-or-update.vue

11
      @keyup.enter.native="dataFormSubmit()"
11
      @keyup.enter.native="dataFormSubmit()"
12
      label-width="100px"
12
      label-width="100px"
13
    >
13
    >
14
      <el-form-item label="姓名" prop="name">
15
        <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
14
      <el-form-item label="姓名" prop="state2">
15
        <el-autocomplete
16
          class="inline-input"
17
          v-model="dataForm.state2"
18
          :fetch-suggestions="querySearch"
19
          placeholder="请输入内容"
20
          :trigger-on-focus="false"
21
          @select="handleSelect"
22
          :style="!dataForm.id ? 'width:80%' :'width:100%' "
23
        ></el-autocomplete>
24
        <el-button
25
          @click="creatorUser"
26
          class="ll-button"
27
          type="primary"
28
          v-show="!dataForm.id"
29
        >添加新的会员</el-button>
16
      </el-form-item>
30
      </el-form-item>
31
17
      <el-form-item label="所属机构" prop="organization">
32
      <el-form-item label="所属机构" prop="organization">
18
        <el-input v-model="dataForm.organization" placeholder="所属机构(单位名称、公司名称)"></el-input>
33
        <el-input v-model="dataForm.organization" placeholder="所属机构(单位名称、公司名称)"></el-input>
19
      </el-form-item>
34
      </el-form-item>
20
      <el-form-item label="职位" prop="position">
35
      <el-form-item label="职位">
21
        <el-input v-model="dataForm.position" placeholder="职位"></el-input>
36
        <el-input v-model="dataForm.position" placeholder="职位"></el-input>
22
      </el-form-item>
37
      </el-form-item>
23
      <el-form-item label="职称" prop="jobTitle">
38
      <el-form-item label="职称">
24
        <el-input v-model="dataForm.jobTitle" placeholder="职称"></el-input>
39
        <el-input v-model="dataForm.jobTitle" placeholder="职称"></el-input>
25
      </el-form-item>
40
      </el-form-item>
26
      <el-form-item label="电话" prop="phone">
27
        <el-input v-model="dataForm.phone" placeholder="电话"></el-input>
41
      <el-form-item label="手机号" prop="phone">
42
        <el-input v-model="dataForm.phone" placeholder="手机号"></el-input>
28
      </el-form-item>
43
      </el-form-item>
29
      <el-form-item label="邮箱" prop="email">
44
      <el-form-item label="邮箱">
30
        <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
45
        <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
31
      </el-form-item>
46
      </el-form-item>
32
      <el-form-item label="办公电话" prop="officephone">
47
      <el-form-item label="办公电话">
33
        <el-input v-model="dataForm.officephone" placeholder="办公电话"></el-input>
48
        <el-input v-model="dataForm.officephone" placeholder="办公电话"></el-input>
34
      </el-form-item>
49
      </el-form-item>
35
50
49
        <el-radio v-model="dataForm.transfer" :label="0">否</el-radio>
64
        <el-radio v-model="dataForm.transfer" :label="0">否</el-radio>
50
      </el-form-item>
65
      </el-form-item>
51
      <el-form-item label="负责人" prop="servicer">
66
      <el-form-item label="负责人" prop="servicer">
52
        <!-- <el-input v-model="dataForm.servicer" placeholder="负责人"></el-input> -->
53
        <el-select v-model="dataForm.servicer" filterable placeholder="请选择">
67
        <el-select v-model="dataForm.servicer" filterable placeholder="请选择">
54
          <el-option
68
          <el-option
55
            v-for="item in employeeList"
69
            v-for="item in employeeList"
60
        </el-select>
74
        </el-select>
61
      </el-form-item>
75
      </el-form-item>
62
      <el-form-item label="用户类型" prop="typeId">
76
      <el-form-item label="用户类型" prop="typeId">
63
        <!-- <el-input v-model="dataForm.servicer" placeholder="负责人"></el-input> -->
64
        <el-select v-model="dataForm.typeId" filterable placeholder="请选择">
77
        <el-select v-model="dataForm.typeId" filterable placeholder="请选择">
65
          <el-option
78
          <el-option
66
            v-for="item in typesofattendersList"
79
            v-for="item in typesofattendersList"
70
          ></el-option>
83
          ></el-option>
71
        </el-select>
84
        </el-select>
72
      </el-form-item>
85
      </el-form-item>
73
74
      <el-form-item label="联系电话" prop="account">
75
        <el-input v-model="dataForm.account" placeholder="联系电话"></el-input>
76
      </el-form-item>
77
      <el-form-item label="联系邮箱" prop="emailLx">
78
        <el-input v-model="dataForm.emailLx" placeholder="联系邮箱"></el-input>
79
      </el-form-item>
80
      <!-- <el-form-item label="创建时间" prop="createTime">
81
        <el-date-picker
82
          v-model="dataForm.createTime"
83
          type="datetime"
84
          placeholder="选择日期时间"
85
          value-format="yyyy-MM-dd HH:mm:ss"
86
        ></el-date-picker>
87
      </el-form-item>
88
      <el-form-item label="修改时间" prop="modifyTime">
89
        <el-date-picker
90
          v-model="dataForm.modifyTime"
91
          type="datetime"
92
          placeholder="选择日期时间"
93
          value-format="yyyy-MM-dd HH:mm:ss"
94
        ></el-date-picker>
95
      </el-form-item>-->
96
      <!-- <el-form-item label="创建者" prop="creater">
97
        <el-input v-model="dataForm.creater" placeholder="创建者"></el-input>
98
      </el-form-item>
99
      <el-form-item label="修改者" prop="modifier">
100
        <el-input v-model="dataForm.modifier" placeholder="修改者"></el-input>
101
      </el-form-item>-->
102
      <el-form-item label="备注" prop="note">
86
      <el-form-item label="备注">
103
        <el-input
87
        <el-input
104
          type="textarea"
88
          type="textarea"
105
          :autosize="{ minRows: 2, maxRows: 4}"
89
          :autosize="{ minRows: 2, maxRows: 4}"
140
        note: "",
124
        note: "",
141
        account: "",
125
        account: "",
142
        emailLx: "",
126
        emailLx: "",
143
        regflag: ""
144
145
        // creater: "",
146
        // modifier: "",
127
        regflag: "",
128
        state2: ""
147
      },
129
      },
148
      dataRule: {
130
      dataRule: {
149
        meetingId: [
131
        meetingId: [
150
          { required: true, message: "会议id不能为空", trigger: "blur" }
132
          { required: true, message: "会议id不能为空", trigger: "blur" }
151
        ],
133
        ],
152
        memberId: [
153
          { required: true, message: "会员id不能为空", trigger: "blur" }
154
        ],
155
        name: [{ required: true, message: "姓名不能为空", trigger: "blur" }],
134
135
        // state2: [{ required: true, message: "没有会员信息", trigger: "blur" }],
156
        organization: [
136
        organization: [
157
          {
137
          {
158
            required: true,
138
            required: true,
160
            trigger: "blur"
140
            trigger: "blur"
161
          }
141
          }
162
        ],
142
        ],
163
        position: [
164
          { required: true, message: "职位不能为空", trigger: "blur" }
165
        ],
166
        jobTitle: [
167
          { required: true, message: "职称不能为空", trigger: "blur" }
168
        ],
169
        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
143
        phone: [{ required: true, message: "电话不能为空", trigger: "blur" }],
170
        email: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
144
        email: [{ required: true, message: "邮箱不能为空", trigger: "blur" }],
171
        officephone: [
172
          { required: true, message: "办公电话不能为空", trigger: "blur" }
173
        ],
174
        typeId: [
175
          { required: true, message: "参会人员类型id不能为空", trigger: "blur" }
176
        ],
145
177
        intention: [
146
        intention: [
178
          { required: true, message: "参会意向不能为空", trigger: "blur" }
147
          { required: true, message: "参会意向不能为空", trigger: "blur" }
179
        ],
148
        ],
189
            message: "负责人(员工id)不能为空",
158
            message: "负责人(员工id)不能为空",
190
            trigger: "blur"
159
            trigger: "blur"
191
          }
160
          }
192
        ],
193
        note: [{ required: true, message: "备注不能为空", trigger: "blur" }],
194
        account: [
195
          { required: true, message: "联系电话不能为空", trigger: "blur" }
196
        ],
197
        emailLx: [
198
          { required: true, message: "联系邮箱不能为空", trigger: "blur" }
199
        ],
200
        regflag: [
201
          {
202
            required: true,
203
            message: "注册情况 0, 1, 2, 现场注册不能为空",
204
            trigger: "blur"
205
          }
206
        ],
207
        createTime: [
208
          { required: true, message: "创建时间不能为空", trigger: "blur" }
209
        ],
210
        modifyTime: [
211
          { required: true, message: "修改时间不能为空", trigger: "blur" }
212
        ],
213
        creater: [
214
          { required: true, message: "创建者不能为空", trigger: "blur" }
215
        ],
216
        modifier: [
217
          { required: true, message: "修改者不能为空", trigger: "blur" }
218
        ],
219
        isDel: [
220
          {
221
            required: true,
222
            message: "是否被删除 状态  0:正常   1:删除不能为空",
223
            trigger: "blur"
224
          }
225
        ]
161
        ]
226
      },
162
      },
227
      employeeList: [],
163
      employeeList: [],
228
      typesofattendersList: []
164
      typesofattendersList: [],
165
      restaurants: []
229
    };
166
    };
230
  },
167
  },
231
  created() {
168
  created() {
232
    this.getEmployee();
169
    this.getEmployee();
233
    this.getTypesofattenders();
170
    this.getTypesofattenders();
171
    this.getMember();
234
  },
172
  },
235
  methods: {
173
  methods: {
236
    init(id) {
174
    init(id) {
237
      this.dataForm.id = id || 0;
175
      this.dataForm.id = id || 0;
176
      this.dataForm.memberId = 0;
238
      this.visible = true;
177
      this.visible = true;
239
      this.$nextTick(() => {
178
      this.$nextTick(() => {
240
        this.$refs["dataForm"].resetFields();
179
        this.$refs["dataForm"].resetFields();
262
              this.dataForm.transfer = data.attenders.transfer;
201
              this.dataForm.transfer = data.attenders.transfer;
263
              this.dataForm.servicer = data.attenders.servicer;
202
              this.dataForm.servicer = data.attenders.servicer;
264
              this.dataForm.note = data.attenders.note;
203
              this.dataForm.note = data.attenders.note;
265
              this.dataForm.account = data.attenders.account;
266
              this.dataForm.emailLx = data.attenders.emailLx;
267
              this.dataForm.regflag = data.attenders.regflag;
268
              this.dataForm.createTime = data.attenders.createTime;
269
              this.dataForm.modifyTime = data.attenders.modifyTime;
270
              this.dataForm.creater = data.attenders.creater;
271
              this.dataForm.modifier = data.attenders.modifier;
272
              this.dataForm.isDel = data.attenders.isDel;
204
              this.dataForm.state2 = data.attenders.name;
273
            }
205
            }
274
          });
206
          });
207
        } else {
208
          this.dataForm.meetingId = "";
209
          this.dataForm.memberId = "";
210
          this.dataForm.name = "";
211
          this.dataForm.organization = "";
212
          this.dataForm.position = "";
213
          this.dataForm.jobTitle = "";
214
          this.dataForm.phone = "";
215
          this.dataForm.email = "";
216
          this.dataForm.officephone = "";
217
          this.dataForm.typeId = "";
218
          this.dataForm.intention = "";
219
          this.dataForm.room = "";
220
          this.dataForm.transfer = "";
221
          this.dataForm.servicer = "";
222
          this.dataForm.note = "";
223
          this.dataForm.state2 = "";
275
        }
224
        }
276
      });
225
      });
277
    },
226
    },
300
              room: this.dataForm.room,
249
              room: this.dataForm.room,
301
              transfer: this.dataForm.transfer,
250
              transfer: this.dataForm.transfer,
302
              servicer: this.dataForm.servicer,
251
              servicer: this.dataForm.servicer,
303
              note: this.dataForm.note,
304
              account: this.dataForm.account,
305
              emailLx: this.dataForm.emailLx,
306
            
252
              note: this.dataForm.note
307
            })
253
            })
308
          }).then(({ data }) => {
254
          }).then(({ data }) => {
309
            if (data && data.code === 0) {
255
            if (data && data.code === 0) {
350
        if (data && data.code === 0) {
296
        if (data && data.code === 0) {
351
          this.typesofattendersList = data.list;
297
          this.typesofattendersList = data.list;
352
        }
298
        }
353
        window.console.log(data.list);
354
      });
299
      });
300
    },
301
    createFilter(queryString) {
302
      return restaurant => {
303
        return (
304
          restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
305
          0
306
        );
307
      };
308
    },
309
    querySearch(queryString, cb) {
310
      var restaurants = this.restaurants;
311
      var results = queryString
312
        ? restaurants.filter(this.createFilter(queryString))
313
        : restaurants;
314
      if (results.length === 0) {
315
        this.$message.error("没有会员信息,请添加会员信息");
316
      }
317
      cb(results);
318
    },
319
    //获取会员信息
320
    getMember() {
321
      this.$http({
322
        url: this.$http.adornUrl("/admin/member/listall"),
323
        method: "get"
324
      }).then(({ data }) => {
325
        if (data.code === 0 && data) {
326
          for (let i = 0; i < data.list.length; i++) {
327
            data.list[i].value =
328
              data.list[i].truename + "," + data.list[i].organization;
329
          }
330
          this.restaurants = data.list;
331
        }
332
      });
333
    },
334
    handleSelect(item) {
335
      if (item) {
336
        this.dataForm.jiobTitle = item.jiobTitle;
337
        this.dataForm.organization = item.organization;
338
        this.dataForm.phone = item.phone;
339
        this.dataForm.position = item.position;
340
        this.dataForm.memberId = item.id;
341
        this.dataForm.name = item.truename;
342
        this.dataForm.state2 = item.truename;
343
      }
344
    },
345
    creatorUser() {
346
      this.dataForm.name = this.dataForm.state2;
347
      if (this.dataForm.name) {
348
        this.$message({
349
          message: "添加成功",
350
          type: "success",
351
          duration: 1000
352
        });
353
      }
355
    }
354
    }
356
  }
355
  }
357
};
356
};
358
</script>
357
</script>
358
<style lang="scss" scoped>
359
.ll-button {
360
  position: absolute;
361
  top: 0;
362
  right: 0;
363
}
364
</style>

+ 1 - 1
src/views/modules/admin/company.vue

76
        companyname: ""
76
        companyname: ""
77
      },
77
      },
78
      dataList: [],
78
      dataList: [],
79
      pageIndex: 0,
79
      pageIndex: 1,
80
      pageSize: 10,
80
      pageSize: 10,
81
      totalPage: 0,
81
      totalPage: 0,
82
      dataListLoading: false,
82
      dataListLoading: false,

+ 1 - 1
src/views/modules/admin/employee.vue

75
        key: ""
75
        key: ""
76
      },
76
      },
77
      dataList: [],
77
      dataList: [],
78
      pageIndex: 0,
78
      pageIndex: 1,
79
      pageSize: 10,
79
      pageSize: 10,
80
      totalPage: 0,
80
      totalPage: 0,
81
      dataListLoading: false,
81
      dataListLoading: false,

+ 1 - 1
src/views/modules/admin/lecture.vue

67
        key: ""
67
        key: ""
68
      },
68
      },
69
      dataList: [],
69
      dataList: [],
70
      pageIndex: 0,
70
      pageIndex: 1,
71
      pageSize: 10,
71
      pageSize: 10,
72
      totalPage: 0,
72
      totalPage: 0,
73
      dataListLoading: false,
73
      dataListLoading: false,

+ 6 - 6
src/views/modules/admin/meeting-add-or-update.vue

333
              endTime: this.dataForm.endTime,
333
              endTime: this.dataForm.endTime,
334
              officeWebsite: this.dataForm.officeWebsite,
334
              officeWebsite: this.dataForm.officeWebsite,
335
              titlePicture: this.titlePictureList.join(),
335
              titlePicture: this.titlePictureList.join(),
336
              subjects: this.subjects.join(),
337
              industries: this.industry.join(),
338
              attendersType: this.typesofattender.join(),
339
              serviceIds: this.dataForm.serviceIds,
340
              contactNames: this.employeePerson.join(),
341
              contactIds: this.employeePersonId.join(),
336
              subjects: this.subjects,
337
              industries: this.industry,
338
              attendersType: this.typesofattender,
339
              serviceId: this.dataForm.serviceIds,
340
              contactNames: this.employeePerson,
341
              contactIds: this.employeePersonId,
342
              onlineRegDeadline: this.dataForm.onlineRegDeadline,
342
              onlineRegDeadline: this.dataForm.onlineRegDeadline,
343
              onsiteRegDeadline: this.dataForm.onsiteRegDeadline,
343
              onsiteRegDeadline: this.dataForm.onsiteRegDeadline,
344
              introduction: this.dataForm.introduction
344
              introduction: this.dataForm.introduction

+ 17 - 7
src/views/modules/admin/meeting.vue

1
<template>
1
<template>
2
  <div class="ll-content" v-loading="loading">
2
  <div class="ll-content" v-loading="loading">
3
    <h1>{{meetingData.nameCn}}</h1>
3
    <h1 >{{meetingData.nameCn}}</h1>
4
    <div class="box">
4
    <div class="box">
5
      <img :src="imageNull" class="bgMeeting" />
5
      <img :src="imageNull" class="bgMeeting" />
6
      <el-form label-width="200px">
7
        <el-form-item label="会议名称" class="fz_30">{{meetingData.nameCn}}</el-form-item>
6
      <el-form label-width="200px" style="margin-top:20px">
7
        <!-- <el-form-item label="会议名称" class="fz_30" style="margin-top:50px">{{meetingData.nameCn}}</el-form-item> -->
8
        <el-form-item label="会议时间">{{meetingData.startTime}}</el-form-item>
8
        <el-form-item label="会议时间">{{meetingData.startTime}}</el-form-item>
9
        <el-form-item label="举办地点">{{meetingData.address}}</el-form-item>
9
        <el-form-item label="举办地点">{{meetingData.address}}</el-form-item>
10
        <el-form-item label="涉及学科">
10
        <el-form-item label="涉及学科">
23
  </div>
23
  </div>
24
</template>
24
</template>
25
<script>
25
<script>
26
import { set } from "@/utils";
27
26
export default {
28
export default {
27
  name: "",
29
  name: "",
28
  data() {
30
  data() {
39
  computed: {
41
  computed: {
40
    imageNull() {
42
    imageNull() {
41
      return this.image.includes(",")
43
      return this.image.includes(",")
42
        ? "http://121.42.53.174:9008/static" +
44
        ? this.imageUrl +
43
            this.image
45
            this.image
44
              .split(",")
46
              .split(",")
45
              .splice(0, 1)
47
              .splice(0, 1)
46
              .join()
48
              .join()
47
        : "http://121.42.53.174:9008/static" + this.image;
49
        : this.imageUrl + this.image;
48
    }
50
    }
49
  },
51
  },
50
  beforeMount() {},
52
  beforeMount() {},
51
  created() {},
53
  created() {
54
    this.demo()
55
  },
52
  activated() {
56
  activated() {
53
    this.getMeeting();
57
    this.getMeeting();
54
  },
58
  },
62
          method: "get",
66
          method: "get",
63
          params: this.$http.adornParams()
67
          params: this.$http.adornParams()
64
        }).then(res => {
68
        }).then(res => {
65
          window.console.log(res.data);
66
          if (res.data && res.data.code === 0) {
69
          if (res.data && res.data.code === 0) {
70
            window.console.log(res);
67
            this.meetingData = res.data.meeting;
71
            this.meetingData = res.data.meeting;
68
            this.industries = res.data.meeting.industries.split(",");
72
            this.industries = res.data.meeting.industries.split(",");
73
            // this.industries = set(this.industries);
69
            this.image = res.data.meeting.titlePicture;
74
            this.image = res.data.meeting.titlePicture;
70
            this.subjectsList = res.data.meeting.subjects.split(",");
75
            this.subjectsList = res.data.meeting.subjects.split(",");
76
            // this.subjectsList = set(this.subjectsList);
71
            this.loading = false;
77
            this.loading = false;
72
          }
78
          }
73
        });
79
        });
74
      }
80
      }
81
    },
82
    demo(){
83
      let ll = set(this.subjectsList)
84
      window.console.log(ll)
75
    }
85
    }
76
  }
86
  }
77
};
87
};

+ 4 - 5
src/views/modules/admin/member-add-or-update.vue

15
        <el-input v-model="dataForm.truename" placeholder="姓名"></el-input>
15
        <el-input v-model="dataForm.truename" placeholder="姓名"></el-input>
16
      </el-form-item>
16
      </el-form-item>
17
      <el-form-item label="用户名" prop="username">
17
      <el-form-item label="用户名" prop="username">
18
        <el-input v-model="dataForm.username" placeholder="用户名"></el-input>
18
        <el-input v-model="dataForm.username" placeholder="手机号"></el-input>
19
      </el-form-item>
19
      </el-form-item>
20
      <el-form-item label="密码" prop="password">
20
      <el-form-item label="密码" prop="password">
21
        <el-input v-model="dataForm.password" placeholder="密码"></el-input>
21
        <el-input v-model="dataForm.password" placeholder="密码"></el-input>
171
              this.dataForm.createTime = data.member.createTime;
171
              this.dataForm.createTime = data.member.createTime;
172
              this.dataForm.modifyTime = data.member.modifyTime;
172
              this.dataForm.modifyTime = data.member.modifyTime;
173
              this.dataForm.isCheck = data.member.isCheck;
173
              this.dataForm.isCheck = data.member.isCheck;
174
              this.showimg =
175
                "http://121.42.53.174:9008/static" + data.member.titlePic;
174
              this.showimg = this.imageUrl + data.member.titlePic;
176
            }
175
            }
177
          });
176
          });
178
        }
177
        }
246
      if (response && response.code === 0) {
245
      if (response && response.code === 0) {
247
        if (response.hasOwnProperty("thumb")) {
246
        if (response.hasOwnProperty("thumb")) {
248
          this.dataForm.titlePic = response.thumb;
247
          this.dataForm.titlePic = response.thumb;
249
          this.showimg = "http://121.42.53.174:9008/static" + response.thumb;
248
          this.showimg = this.imageUrl + response.thumb;
250
        } else {
249
        } else {
251
          this.showimg = "http://121.42.53.174:9008/static" + response.picname;
250
          this.showimg = this.imageUrl + response.picname;
252
          this.dataForm.titlePic = response.picname;
251
          this.dataForm.titlePic = response.picname;
253
          this.dialogVisible = true;
252
          this.dialogVisible = true;
254
        }
253
        }

+ 2 - 2
src/views/modules/admin/member.vue

28
      <el-table-column prop="username" header-align="center" align="center" label="账号"></el-table-column>
28
      <el-table-column prop="username" header-align="center" align="center" label="账号"></el-table-column>
29
      <el-table-column prop="organization" header-align="center" align="center" label="所属机构"></el-table-column>
29
      <el-table-column prop="organization" header-align="center" align="center" label="所属机构"></el-table-column>
30
      <el-table-column prop="position" header-align="center" align="center" label="职位"></el-table-column>
30
      <el-table-column prop="position" header-align="center" align="center" label="职位"></el-table-column>
31
      <el-table-column prop="jobTitle" header-align="center" align="center" label="职称"></el-table-column>
31
      <!-- <el-table-column prop="jobTitle" header-align="center" align="center" label="职称"></el-table-column> -->
32
      <el-table-column prop="phone" header-align="center" align="center" label="电话"></el-table-column>
32
      <el-table-column prop="phone" header-align="center" align="center" label="电话"></el-table-column>
33
      <el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
33
      <el-table-column prop="email" header-align="center" align="center" label="邮箱"></el-table-column>
34
      <el-table-column prop="meetingCounts" header-align="center" align="center" label="参会场次"></el-table-column>
34
      <el-table-column prop="meetingCounts" header-align="center" align="center" label="参会场次"></el-table-column>
35
      <el-table-column prop="meetingName" header-align="center" align="center" label="最后参加会议"></el-table-column>
35
      <el-table-column prop="meetingName" header-align="center" align="center" label="最后参加会议"></el-table-column>
36
      <el-table-column prop="servicerName" header-align="center" align="center" label="负责人"></el-table-column>
36
      <!-- <el-table-column prop="servicerName" header-align="center" align="center" label="负责人"></el-table-column> -->
37
      <el-table-column
37
      <el-table-column
38
        prop="createTime"
38
        prop="createTime"
39
        header-align="center"
39
        header-align="center"

+ 1 - 1
src/views/modules/admin/paper.vue

81
        key: ""
81
        key: ""
82
      },
82
      },
83
      dataList: [],
83
      dataList: [],
84
      pageIndex: 0,
84
      pageIndex: 1,
85
      pageSize: 10,
85
      pageSize: 10,
86
      totalPage: 0,
86
      totalPage: 0,
87
      dataListLoading: false,
87
      dataListLoading: false,

+ 2 - 1
src/views/modules/admin/payment.vue

83
        key: ""
83
        key: ""
84
      },
84
      },
85
      dataList: [],
85
      dataList: [],
86
      pageIndex: 0,
86
      pageIndex: 1,
87
      pageSize: 10,
87
      pageSize: 10,
88
      totalPage: 0,
88
      totalPage: 0,
89
      dataListLoading: false,
89
      dataListLoading: false,
112
        })
112
        })
113
      }).then(({ data }) => {
113
      }).then(({ data }) => {
114
        if (data && data.code === 0) {
114
        if (data && data.code === 0) {
115
          
115
          this.dataList = data.page.list;
116
          this.dataList = data.page.list;
116
          this.totalPage = data.page.totalCount;
117
          this.totalPage = data.page.totalCount;
117
        } else {
118
        } else {