Merge branch 'dev' into gyj

src/api/metting/metting.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 生成会议号
 export function createRoomId(data) {
   return request({
-    url: 'video/createRoomId',
+    url: 'caseApplication/createRoomId',
     method: 'get',
     params: data
   })

src/store/modules/permission.js

@@ -126,7 +126,7 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
+    return (resolve) => require([`@/views/${view}`], resolve)
   }
 }
 

src/views/caseManagement/components/selectMediator.vue

@@ -105,9 +105,9 @@ export default {
                     userName:item.mediatorName
                 })
             })
-            await this.createRoomIdFn({
-                caseId:this.mediatorData.id
-            })
+            // await this.createRoomIdFn({
+            //     caseId:this.mediatorData.id
+            // })
             await this.updateBookingFn({
                 id:this.mediatorData.id,
                 caseFlowId:this.mediatorData.caseFlowId,

src/views/caseManagement/components/timeConfirm.vue

@@ -31,6 +31,7 @@
 <script>
 import { Message } from 'element-ui'
 import { listMediator, selectReservation,confirmDate } from '@/api/caseManagement/caseManagement.js'
+import { createRoomId } from '@/api/metting/metting.js'
 import moment from "moment";
 export default {
     props: ["timeConfirmVisable", "timeConfirmData", "queryParams"],
@@ -89,8 +90,17 @@ export default {
                 this.$emit('getList', this.queryParams);
             })
         },
+        // 生成会议房间号
+        createRoomIdFn(data){
+            createRoomId(data).then(res=>{
+                console.log(res,"房间号");
+            })
+        },
         /**提交选择结果*/
         async submitMediator() {
+            this.createRoomIdFn({
+                caseId:this.timeConfirmData.id
+            })
             if (this.confirmFlag == 1) {
                 let userArr = [];
                 this.tableData.forEach(item => {