From f63f788a76e541848776b0ac97532dd409ed3541 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Tue, 29 Oct 2024 13:00:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=95=B0=E6=8D=AE=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E8=AE=A4=E8=AF=81=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E5=8F=AF=E8=AE=B0=E4=BD=8F=E5=B8=90=E5=8F=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AC=A1=E8=BF=9B=E5=85=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=90=E5=8F=B7=E5=AF=86=E7=A0=81=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85=EF=BC=9B=20PC=E7=AB=AF=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E4=BC=9A=E8=AE=AE=E5=AE=A4=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E9=A2=84=E7=BA=A6=E9=83=A8=E9=97=A8=E3=80=81=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E7=AD=89=E4=BF=A1=E6=81=AF=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=8D=A0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/MeetingMangerList.vue | 22 ++++++++++++++++++-
 .../admin/meeting/modules/RoomOrderModal.vue  |  3 +++
 2 files changed, 24 insertions(+), 1 deletion(-)

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