From 205cb756be4d907a0851df5bb0299016e0689637 Mon Sep 17 00:00:00 2001
From: zhangzhuliang <577851561@qq.com>
Date: Fri, 2 Sep 2022 11:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8B=E8=BD=BD=E9=99=84=E4=BB=B6=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=92=8C=E8=BE=93=E5=85=A5=E6=A1=86=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/activiti/RoomExamineAdmin.vue     | 24 +++++++++++++------
 .../views/modules/myAgent/ConferenceRoom.vue  |  4 ++--
 front/src/views/home/infrastructurePage.vue   | 11 ++++++++-
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/back/src/views/modules/activiti/RoomExamineAdmin.vue b/back/src/views/modules/activiti/RoomExamineAdmin.vue
index f5a7aaa6..b441ae1c 100644
--- a/back/src/views/modules/activiti/RoomExamineAdmin.vue
+++ b/back/src/views/modules/activiti/RoomExamineAdmin.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="roomBox">
     <div class="roomExamineSearch">
       <el-input
-        v-model="roomName"
+        v-model="roomNameA"
         style="width: 160px"
         placeholder="请输入会议室名称"
       ></el-input>
@@ -195,6 +195,17 @@
             <el-input type="textarea" v-model="desc"></el-input>
           </el-col>
         </el-row>
+        <el-row style="display: flex; margin-top: 20px">
+          <el-col :span="2">附件：</el-col>
+          <el-col :span="16">
+            <el-button
+              v-if="file != ''"
+              size="mini"
+              @click="downloadTemplate(file)"
+              >下载</el-button
+            >
+          </el-col>
+        </el-row>
         <div slot="footer" class="dialog-footer">
           <el-button @click="No">取 消</el-button>
           <el-button type="primary" @click="ok">确 定</el-button>
@@ -233,8 +244,8 @@ export default {
       num: '',
       file: '',
       name: '',
-      roomName: '',
       creator: '',
+      roomNameA: '',
     }
   },
   mounted() {
@@ -244,10 +255,9 @@ export default {
     getSerach() {
       this.$http
         .get(
-          `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomName}&state=${this.value}`
+          `/bookMeeting/auditPage?page=${this.page}&limit=${this.limit}&roomName=${this.roomNameA}&state=${this.value}`
         )
         .then(({ data: res }) => {
-          console.log(res, 7777777)
           this.tableData = res.data.list
           this.total = res.data.total
         })
@@ -276,10 +286,10 @@ export default {
         this.creator = item.creator
       } else {
         this.dialogVisible = true
-        this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
-          this.file = res.data.file
-        })
       }
+      this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
+        this.file = res.data.file
+      })
       this.lookData = item
     },
 
diff --git a/back/src/views/modules/myAgent/ConferenceRoom.vue b/back/src/views/modules/myAgent/ConferenceRoom.vue
index 132875e9..10478c69 100644
--- a/back/src/views/modules/myAgent/ConferenceRoom.vue
+++ b/back/src/views/modules/myAgent/ConferenceRoom.vue
@@ -228,7 +228,7 @@ export default {
       ruleForm: {
         name: '',
         num: '',
-        area: '',
+        area: 0,
         capacity: '',
         pic: '',
         id: '',
@@ -246,7 +246,7 @@ export default {
         ],
         area: [
           { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, trigger: 'blur' },
+          { min: 1, type: 'number', trigger: 'blur' },
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },
diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue
index 7ee824d1..27cd733b 100644
--- a/front/src/views/home/infrastructurePage.vue
+++ b/front/src/views/home/infrastructurePage.vue
@@ -809,6 +809,7 @@
     dept: '',
     matter: '',
     file: '',
+    roomName: '',
   })
   const fileList = ref([])
   const useForm = Form.useForm
@@ -838,7 +839,7 @@
     phone: [
       {
         required: true,
-        pattern: /^1[3|4|5|7|8][0-9]\d{8}$/,
+        pattern: /^1[3|4|5|7|8|9][0-9]\d{8}$/,
         message: '请输入正确的手机号',
       },
     ],
@@ -1239,8 +1240,10 @@
   }
   //预约
   const appointment = (item) => {
+    console.log(item, 8888888888)
     dateId.value = item.id
     formState.roomId = item.id
+    formState.roomName = item.name
     appointmentRoom.value = true
   }
   //预约弹框 选择日期
@@ -1297,6 +1300,12 @@
       .then(() => {
         setSubmit(formState).then(({ data: res }) => {
           appointmentRoom.value = false
+          rulesRef.bookDate = []
+          rulesRef.startTime = []
+          rulesRef.name = []
+          rulesRef.matter = []
+          rulesRef.phone = []
+          rulesRef.dept = []
           formState.roomId = ''
           formState.bookDate = ''
           formState.startTime = '' //开始时间