会议室bug提交

back/src/views/modules/activiti/RoomExamineAdmin.vue

@@ -232,6 +232,9 @@ export default {
       id: '',
       num: '',
       file: '',
+      name: '',
+      roomName: '',
+      creator: '',
     }
   },
   mounted() {
@@ -268,10 +271,12 @@ export default {
       if (num == '1') {
         this.dialogVisibleChuli = true
         this.id = item.id
+        this.name = item.name
+        this.roomName = item.roomName
+        this.creator = item.creator
       } else {
         this.dialogVisible = true
         this.$http.get(`bookMeeting/${item.id}`).then(({ data: res }) => {
-          console.log(55555555)
           this.file = res.data.file
         })
       }
@@ -283,6 +288,9 @@ export default {
         auditViem: this.desc,
         state: this.radio,
         id: this.id,
+        name: this.name,
+        roomName: this.roomName,
+        creator: this.creator,
       }
       this.$http.put('/bookMeeting', query).then(({ data: res }) => {
         this.dialogVisibleChuli = false

back/src/views/modules/myAgent/ConferenceRoom.vue

@@ -246,7 +246,7 @@ export default {
         ],
         area: [
           { required: true, message: '请输入会议室面积', trigger: 'blur' },
-          { min: 1, type: 'number', trigger: 'blur' },
+          { min: 1, trigger: 'blur' },
         ],
         description: [
           { required: true, message: '请填写描述内容', trigger: 'blur' },

front/src/views/home/infrastructurePage.vue

@@ -204,7 +204,13 @@
           style="display: flex; flex-direction: column; margin-top: 0.2rem"
         >
           <span style="margin-bottom: 0.2rem">
-            审核结果：{{ lookData.state === '2' ? '通过' : '不通过' }}
+            审核结果：{{
+              lookData.state == 2
+                ? '通过'
+                : lookData.state == 1
+                ? '审核中'
+                : '不通过'
+            }}
           </span>
           <span style="width: 8rem; margin-bottom: 0.3rem">
             审核意见：{{ lookData.auditViem }}
@@ -1054,9 +1060,11 @@
   //获取不可选择的小时
   const disabledStartHours = () => {
     if (roomEndTime.value) {
+      console.log(roomEndTime.value, 5555555555)
       let hours = []
-      let hour = moment().hour()
+      let hour = roomEndTime.value.substr(0, 2)
-      for (let i = hour + 1; i < 24; i++) {
+      console.log(hour, 888888888888)
+      for (let i = hour; i < 24; i++) {
         hours.push(i)
       }
       return hours
@@ -1066,10 +1074,10 @@
   const disabledStartMinutes = (selectedHour) => {
     if (roomEndTime.value) {
       let minutes = []
-      let hour = moment().hour()
+      let hour = roomEndTime.value.substr(0, 2)
-      let minute = moment().minute()
+      let minute = roomEndTime.value.substr(3, 2)
-      if (selectedHour === hour) {
+      if (selectedHour == hour) {
-        for (let i = minute + 1; i < 60; i++) {
+        for (let i = minute; i < 60; i++) {
           minutes.push(i)
         }
       }
@@ -1080,11 +1088,11 @@
   const disabledStartSeconds = (selectedHour, selectedMinute) => {
     if (roomEndTime.value) {
       let seconds = []
-      let hour = moment().hour()
+      let hour = roomEndTime.value.substr(0, 2)
-      let minute = moment().minute()
+      let minute = roomEndTime.value.substr(3, 2)
-      let second = moment().second()
+      let second = roomEndTime.value.substr(6, 2)
-      if (selectedHour === hour && selectedMinute.value === minute) {
+      if (selectedHour == hour && selectedMinute.value == minute) {
-        for (let i = second + 1; i < 60; i++) {
+        for (let i = second - 1; i < 60; i++) {
           seconds.push(i)
         }
       }
@@ -1095,7 +1103,7 @@
   const disabledEndHours = () => {
     if (roomCreateTime.value) {
       let hours = []
-      let hour = moment().hour()
+      let hour = roomCreateTime.value.substr(0, 2)
       for (let i = 0; i < hour; i++) {
         hours.push(i)
       }
@@ -1106,9 +1114,9 @@
   const disabledEndMinutes = (selectedHour) => {
     if (roomCreateTime.value) {
       let minutes = []
-      let hour = moment().hour()
+      let hour = roomCreateTime.value.substr(0, 2)
-      let minute = moment().minute()
+      let minute = roomCreateTime.value.substr(3, 2)
-      if (selectedHour === hour) {
+      if (selectedHour == hour) {
         for (let i = 0; i < minute; i++) {
           minutes.push(i)
         }
@@ -1120,11 +1128,11 @@
   const disabledEndSeconds = (selectedHour, selectedMinute) => {
     if (roomCreateTime.value) {
       let seconds = []
-      let hour = moment().hour()
+      let hour = roomCreateTime.value.substr(0, 2)
-      let minute = moment().minute()
+      let minute = roomCreateTime.value.substr(3, 2)
-      let second = moment().second()
+      let second = roomCreateTime.value.substr(6, 2)
-      if (selectedHour === hour && selectedMinute.value === minute) {
+      if (selectedHour == hour && selectedMinute.value == minute) {
-        for (let i = 0; i < second; i++) {
+        for (let i = 0; i <= second; i++) {
           seconds.push(i)
         }
       }
@@ -1136,8 +1144,8 @@
   const disabledTimeHours = () => {
     if (formState.endTime) {
       let hours = []
-      let hour = moment().hour()
+      let hour = formState.endTime.substr(0, 2)
-      for (let i = hour + 1; i < 24; i++) {
+      for (let i = hour; i < 24; i++) {
         hours.push(i)
       }
       return hours
@@ -1147,10 +1155,10 @@
   const disabledTimeMinutes = (selectedHour) => {
     if (formState.endTime) {
       let minutes = []
-      let hour = moment().hour()
+      let hour = formState.endTime.substr(0, 2)
-      let minute = moment().minute()
+      let minute = formState.endTime.substr(3, 2)
-      if (selectedHour === hour) {
+      if (selectedHour == hour) {
-        for (let i = minute + 1; i < 60; i++) {
+        for (let i = minute; i < 60; i++) {
           minutes.push(i)
         }
       }
@@ -1161,11 +1169,11 @@
   const disabledTimeSeconds = (selectedHour, selectedMinute) => {
     if (formState.endTime) {
       let seconds = []
-      let hour = moment().hour()
+      let hour = formState.endTime.substr(0, 2)
-      let minute = moment().minute()
+      let minute = formState.endTime.substr(3, 2)
-      let second = moment().second()
+      let second = formState.endTime.substr(6, 2)
-      if (selectedHour === hour && selectedMinute.value === minute) {
+      if (selectedHour == hour && selectedMinute.value == minute) {
-        for (let i = second + 1; i < 60; i++) {
+        for (let i = second - 1; i < 60; i++) {
           seconds.push(i)
         }
       }
@@ -1176,7 +1184,7 @@
   const disabledTimeEndHours = () => {
     if (formState.startTime) {
       let hours = []
-      let hour = moment().hour()
+      let hour = formState.startTime.substr(0, 2)
       for (let i = 0; i < hour; i++) {
         hours.push(i)
       }
@@ -1187,9 +1195,9 @@
   const disabledTimeEndMinutes = (selectedHour) => {
     if (formState.startTime) {
       let minutes = []
-      let hour = moment().hour()
+      let hour = formState.startTime.substr(0, 2)
-      let minute = moment().minute()
+      let minute = formState.startTime.substr(3, 2)
-      if (selectedHour === hour) {
+      if (selectedHour == hour) {
         for (let i = 0; i < minute; i++) {
           minutes.push(i)
         }
@@ -1201,11 +1209,11 @@
   const disabledTimeEndSeconds = (selectedHour, selectedMinute) => {
     if (formState.startTime) {
       let seconds = []
-      let hour = moment().hour()
+      let hour = formState.startTime.substr(0, 2)
-      let minute = moment().minute()
+      let minute = formState.startTime.substr(3, 2)
-      let second = moment().second()
+      let second = formState.startTime.substr(6, 2)
-      if (selectedHour === hour && selectedMinute.value === minute) {
+      if (selectedHour == hour && selectedMinute.value == minute) {
-        for (let i = 0; i < second; i++) {
+        for (let i = 0; i <= second; i++) {
           seconds.push(i)
         }
       }