修复普通人员单位认证BUG

src/views/admin/meeting/MeetingReservationList.vue

@@ -140,8 +140,8 @@
       @cancel='onCloseCancel'
     >
       <a-textarea
-        v-model='rejectReason'
+        v-model='cancelReason'
-        placeholder='请输入驳回原因'
+        placeholder='请输入取消原因'
         :auto-size='{ minRows: 3, maxRows: 5 }'
       />
     </a-modal>
@@ -255,6 +255,11 @@ export default {
         } else {
           this.queryParam.filterDate = ''
         }
+        if (this.isAdmin) {
+          this.queryParam.role = 5
+        } else {
+          this.queryParam.role = 1
+        }
         return getMeetingReservationList(Object.assign(parameter, this.queryParam)).then(res => {
           for (let key in res.rows) {
             let startTime = res.rows[key].start
@@ -403,6 +408,7 @@ export default {
     cancelConfirm(id) {
       this.cancelId = id
       this.showCancelReason = true
+      this.cancelReason = ''
     },
     onCloseCancel() {
       this.cancelId = ''

src/views/admin/meeting/modules/RoomOrderModal.vue

@@ -143,6 +143,7 @@ import moment from 'moment'
 import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { getMeetingDict } from '@/api/admin/meeting/roomContent'
 import { checkPermission } from '@/utils/permissions'
+import deptList from '@/views/system/DeptList.vue'
 
 export default {
   name: 'RoomOrderModal',
@@ -221,18 +222,26 @@ export default {
       })
     },
     getAllDep() {
-      getDep().then(res => {
+      if (this.isAdmin) {
-        let dep = res.data
+        getDep().then(res => {
-        let depList = []
+          let dep = res.data
-        for (let key in dep) {
+          let depList = []
-          let eachObj = dep[key]
+          for (let key in dep) {
-          depList.push({
+            let eachObj = dep[key]
-            id: eachObj['orgId'].toString(),
+            depList.push({
-            name: eachObj['orgName']
+              id: eachObj['orgId'].toString(),
-          })
+              name: eachObj['orgName']
-        }
+            })
-        this.depList = depList
+          }
-      })
+          this.depList = depList
+        })
+      } else {
+        this.depList = [{
+          id: this.depId.toString(),
+          name: this.dep
+        }]
+      }
+
     },
     add(data) {
       console.log(data)
@@ -339,6 +348,12 @@ export default {
           if (this.timeRange == 4) {
             this.timeRangeText = '全天'
           }
+          this.depId = res.mr.userOrgId
+          this.dep = res.mr.userOrg
+          this.depList = [{
+            id: this.depId.toString(),
+            name: this.dep
+          }]
           this.date = moment(res.mr.start).format('YYYY-MM-DD')
           this.getRoomInfo()
           res.mr.start = moment(res.mr.start)