diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue index c668188..dc36c7f 100644 --- a/src/views/admin/meeting/MeetingMangerList.vue +++ b/src/views/admin/meeting/MeetingMangerList.vue @@ -121,6 +121,9 @@ import { getMeetingDict, saveRoomContent } from '@/api/admin/meeting/roomContent import moment from 'moment' import RoomOrderModal from '@/views/admin/meeting/modules/RoomOrderModal.vue' import { checkPermission } from '@/utils/permissions' +import storage from 'store' +import { ACCESS_TOKEN } from '@/store/mutation-types' +import pick from 'lodash.pick' export default { name: 'MeetingMangerList', @@ -181,6 +184,19 @@ export default { if (this.depId != '') { this.showDepForm = false } + this.mdl = { + loginName: storage.get('DEP_USERNAME'), + password: storage.get('DEP_PWD') + } + this.$nextTick(() => { + this.form.setFieldsValue( + pick( + this.mdl, + 'loginName', + 'password', + ) + ) + }) } // 会议管理员,不需要认证 if (this.isAdmin) { @@ -315,15 +331,19 @@ export default { e.preventDefault() this.form.validateFields((err, values) => { if (!err) { - console.log('单位认证:', values) depLogin(values) .then((res) => { if (res.code === 0) { + storage.set('DEP_USERNAME', values.loginName, 365 * 24 * 60 * 60 * 1000) // 365天保存 + storage.set('DEP_PWD', values.password, 365 * 24 * 60 * 60 * 1000) // 365天保存 this.depId = res.data.orgId this.dep = res.data.orgName this.$message.success(this.dep + ',欢迎您!') this.showDepForm = false } else { + // 认证错误,此时去掉 + storage.remove('DEP_USERNAME') + storage.remove('DEP_PWD') this.$message.error(res.msg) } }) diff --git a/src/views/admin/meeting/modules/RoomOrderModal.vue b/src/views/admin/meeting/modules/RoomOrderModal.vue index e2bcd7c..b9b9edb 100644 --- a/src/views/admin/meeting/modules/RoomOrderModal.vue +++ b/src/views/admin/meeting/modules/RoomOrderModal.vue @@ -529,6 +529,9 @@ export default { let eTime = eachObj['end'] eachObj['date'] = moment(sTime).format('YYYY-MM-DD') eachObj['time'] = moment(sTime).format('YYYY-MM-DD HH:mm') + '~' + moment(eTime).format('HH:mm') + if (eachObj['title'] == '占用' && !eachObj['userOrg']) { + eachObj['userOrg'] = '占用' + } newRecordList.push(eachObj) } this.recordList = newRecordList