Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev
This commit was merged in pull request #24.
This commit is contained in:
+1
-1
@@ -5,4 +5,4 @@ VUE_APP_TITLE = 调解系统
|
|||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 若依管理系统/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/API'
|
||||||
|
|||||||
+1
-2
@@ -9,8 +9,7 @@
|
|||||||
"build:prod": "vue-cli-service build",
|
"build:prod": "vue-cli-service build",
|
||||||
"build:stage": "vue-cli-service build --mode staging",
|
"build:stage": "vue-cli-service build --mode staging",
|
||||||
"preview": "node build/index.js --preview",
|
"preview": "node build/index.js --preview",
|
||||||
"lint": "eslint --ext .js,.vue src",
|
"lint": "eslint --ext .js,.vue src"
|
||||||
"dev_t": "set NODE_OPTIONS=\"--openssl-legacy-provider\" & npm run dev\n"
|
|
||||||
},
|
},
|
||||||
"husky": {
|
"husky": {
|
||||||
"hooks": {
|
"hooks": {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import request from '@/utils/request'
|
|||||||
// 生成会议号
|
// 生成会议号
|
||||||
export function createRoomId(data) {
|
export function createRoomId(data) {
|
||||||
return request({
|
return request({
|
||||||
url: 'video/createRoomId',
|
url: 'caseApplication/createRoomId',
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: data
|
params: data
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -126,7 +126,7 @@ export const loadView = (view) => {
|
|||||||
return (resolve) => require([`@/views/${view}`], resolve)
|
return (resolve) => require([`@/views/${view}`], resolve)
|
||||||
} else {
|
} else {
|
||||||
// 使用 import 实现生产环境的路由懒加载
|
// 使用 import 实现生产环境的路由懒加载
|
||||||
return () => import(`@/views/${view}`)
|
return (resolve) => require([`@/views/${view}`], resolve)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -105,9 +105,9 @@ export default {
|
|||||||
userName:item.mediatorName
|
userName:item.mediatorName
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
await this.createRoomIdFn({
|
// await this.createRoomIdFn({
|
||||||
caseId:this.mediatorData.id
|
// caseId:this.mediatorData.id
|
||||||
})
|
// })
|
||||||
await this.updateBookingFn({
|
await this.updateBookingFn({
|
||||||
id:this.mediatorData.id,
|
id:this.mediatorData.id,
|
||||||
caseFlowId:this.mediatorData.caseFlowId,
|
caseFlowId:this.mediatorData.caseFlowId,
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
<script>
|
<script>
|
||||||
import { Message } from 'element-ui'
|
import { Message } from 'element-ui'
|
||||||
import { listMediator, selectReservation,confirmDate } from '@/api/caseManagement/caseManagement.js'
|
import { listMediator, selectReservation,confirmDate } from '@/api/caseManagement/caseManagement.js'
|
||||||
|
import { createRoomId } from '@/api/metting/metting.js'
|
||||||
import moment from "moment";
|
import moment from "moment";
|
||||||
export default {
|
export default {
|
||||||
props: ["timeConfirmVisable", "timeConfirmData", "queryParams"],
|
props: ["timeConfirmVisable", "timeConfirmData", "queryParams"],
|
||||||
@@ -89,8 +90,17 @@ export default {
|
|||||||
this.$emit('getList', this.queryParams);
|
this.$emit('getList', this.queryParams);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
// 生成会议房间号
|
||||||
|
createRoomIdFn(data){
|
||||||
|
createRoomId(data).then(res=>{
|
||||||
|
console.log(res,"房间号");
|
||||||
|
})
|
||||||
|
},
|
||||||
/**提交选择结果*/
|
/**提交选择结果*/
|
||||||
async submitMediator() {
|
async submitMediator() {
|
||||||
|
this.createRoomIdFn({
|
||||||
|
caseId:this.timeConfirmData.id
|
||||||
|
})
|
||||||
if (this.confirmFlag == 1) {
|
if (this.confirmFlag == 1) {
|
||||||
let userArr = [];
|
let userArr = [];
|
||||||
this.tableData.forEach(item => {
|
this.tableData.forEach(item => {
|
||||||
|
|||||||
Reference in New Issue
Block a user