From 9aee7cd51d19b98facaaa180ac746ca68dd824f0 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Fri, 25 Oct 2024 22:02:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=AE=E9=80=9A=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=8D=95=E4=BD=8D=E8=AE=A4=E8=AF=81BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/meeting/MeetingReservationList.vue  | 10 ++++-
 .../admin/meeting/modules/RoomOrderModal.vue  | 39 +++++++++++++------
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/views/admin/meeting/MeetingReservationList.vue b/src/views/admin/meeting/MeetingReservationList.vue
index 3ec9925..92e3e45 100644
--- a/src/views/admin/meeting/MeetingReservationList.vue
+++ b/src/views/admin/meeting/MeetingReservationList.vue
@@ -140,8 +140,8 @@
       @cancel='onCloseCancel'
     >
       <a-textarea
-        v-model='rejectReason'
-        placeholder='请输入驳回原因'
+        v-model='cancelReason'
+        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 = ''
diff --git a/src/views/admin/meeting/modules/RoomOrderModal.vue b/src/views/admin/meeting/modules/RoomOrderModal.vue
index 65bb2ea..049a9e3 100644
--- a/src/views/admin/meeting/modules/RoomOrderModal.vue
+++ b/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 => {
-        let dep = res.data
-        let depList = []
-        for (let key in dep) {
-          let eachObj = dep[key]
-          depList.push({
-            id: eachObj['orgId'].toString(),
-            name: eachObj['orgName']
-          })
-        }
-        this.depList = depList
-      })
+      if (this.isAdmin) {
+        getDep().then(res => {
+          let dep = res.data
+          let depList = []
+          for (let key in dep) {
+            let eachObj = dep[key]
+            depList.push({
+              id: eachObj['orgId'].toString(),
+              name: eachObj['orgName']
+            })
+          }
+          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)