diff --git a/src/api/caseManagement/caseManagement.js b/src/api/caseManagement/caseManagement.js index a9854c3..3e51c70 100644 --- a/src/api/caseManagement/caseManagement.js +++ b/src/api/caseManagement/caseManagement.js @@ -103,3 +103,19 @@ export function selectSealUrl(data) { data: data, }); } +//查询预约信息 +export function selectReservation(data) { + return request({ + url: "/caseApplication/selectReservation", + method: "get", + params: data, + }); + } + //核实调解员 +export function verifyMediator(data) { + return request({ + url: "/caseApplication/verifyMediator", + method: "post", + data: data, + }); +} diff --git a/src/utils/permission.js b/src/utils/permission.js index d96ef3c..a989841 100644 --- a/src/utils/permission.js +++ b/src/utils/permission.js @@ -62,7 +62,27 @@ export function statusRole(value) { if (caseStatus.length == 0) { return false } - if (caseStatus.includes(value)) { + // if (caseStatus.includes(value)) { + // // caseStatus.forEach(item => { + // // if (item == value) { + // // return true + // // } + // // }); + // for(let i = 0;i < caseStatus.length;i++){ + // if(caseStatus[i] == value){ + // return true + // } + // } + // } else { + // return false + // } + let flag = null; + for (let i = 0; i < caseStatus.length; i++) { + if (caseStatus[i] == value) { + flag = caseStatus[i] + } + } + if (flag == value) { return true } else { return false diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 26d3ed4..f999695 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -59,7 +59,7 @@ @@ -104,7 +106,11 @@ - + + + + + @@ -121,6 +127,8 @@ import payDialog from "./components/payDialog.vue"; import paymentdetailsDialog from './components/paymentdetailsDialog.vue' import caseAcceptance from './components/caseAcceptance.vue' import selectMediator from './components/selectMediator.vue' +import confirmMediator from './components/confirmMediator.vue' +import departmentMediator from './components/departmentMediator.vue' export default { name: "caseList", dicts: ["case_flow_node"], @@ -134,6 +142,8 @@ export default { paymentdetailsDialog, caseAcceptance, selectMediator,//调解员弹窗 + confirmMediator, + departmentMediator }, data() { return { @@ -167,6 +177,7 @@ export default { caseAcceptanceData:{},//案件受理数据 mediatorVisable:false,//选择调解员弹窗 timeVisable:false,//预约时间弹窗 + confirmVisable:false,//确认时间/调解员 mediatorData:{}, flag: null, caseData: {}, @@ -175,7 +186,10 @@ export default { caseTime: '', deptList: [], payTitle: '', - tabFlag: false + tabFlag: false, + confirmData:{}, + departmentVisable:false, + departmentData:{} }; }, created() { @@ -245,6 +259,16 @@ export default { this.payForm.caseId = res.data.id; }); }, + /** 确认时间/调解员 */ + secretaryConfirm(val){ + this.confirmVisable = true; + this.confirmData = val; + }, + /** 部门长确认时间/调解员 */ + department(val){ + this.departmentVisable = true; + this.departmentData = val; + }, /** 时间改变处理 */ caseTimeChange() { if (this.caseTime) { @@ -295,6 +319,12 @@ export default { cancelTime(){ this.timeVisable = false; }, + cancelConfirm(){ + this.confirmVisable = false; + }, + cancelDepartment(){ + this.departmentVisable = false; + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1; diff --git a/src/views/caseManagement/components/confirmMediator.vue b/src/views/caseManagement/components/confirmMediator.vue new file mode 100644 index 0000000..f15651c --- /dev/null +++ b/src/views/caseManagement/components/confirmMediator.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManagement/components/departmentMediator.vue b/src/views/caseManagement/components/departmentMediator.vue new file mode 100644 index 0000000..8b86091 --- /dev/null +++ b/src/views/caseManagement/components/departmentMediator.vue @@ -0,0 +1,197 @@ + + + + + \ No newline at end of file diff --git a/src/views/caseManagement/components/selectMediator.vue b/src/views/caseManagement/components/selectMediator.vue index d62710c..6e2c6e7 100644 --- a/src/views/caseManagement/components/selectMediator.vue +++ b/src/views/caseManagement/components/selectMediator.vue @@ -25,14 +25,15 @@ - + + @@ -66,6 +67,8 @@ export default { if (val) { // this.this.multipleSelection = []; // this.formLabelAlign.time = []; + this.mediatorArr = []; + this.formTimeArr = []; listMediator().then(res=>{ this.tableData = res.data; }) @@ -78,8 +81,8 @@ export default { }, /**提交选择结果*/ async submitMediator() { - if (this.multipleSelection.length > 3) { - Message.error('最多选择三名调解员'); + if (this.multipleSelection.length > 1) { + Message.error('最多选择一名调解员'); return }else if(this.multipleSelection.length < 1){ Message.error('至少选择一名调解员'); @@ -107,13 +110,12 @@ export default { userList:this.mediatorArr, herDates:this.formTimeArr }) - console.log(this.mediatorArr,this.formTimeArr,"LLLLLLLLLLLLLLLLLLLLLLLL"); }, async updateBookingFn(data){ await updateBooking(data).then(res=>{ this.$modal.msgSuccess("成功"); - this.$emit("getList",this.queryParams); - this.cancel(); + this.$emit("cancelMediator"); + this.$emit('getList', this.queryParams); }) }, handleSelectionChange(val) { diff --git a/vue.config.js b/vue.config.js index 802bde4..72a8780 100644 --- a/vue.config.js +++ b/vue.config.js @@ -12,10 +12,10 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题 const port = process.env.port || process.env.npm_config_port || 80 // 端口 // const API = 'http://121.40.189.20:9001' //生产 -const API = 'http://121.40.189.20:6001' //测试 +// const API = 'http://121.40.189.20:6001' //测试 // const API = 'http://192.168.3.18:6001' //B // const API = 'http://192.168.3.77:9001' //Q -// const API = 'http://172.16.1.14:6001' //w +const API = 'http://172.16.1.14:6001' //w // vue.config.js 配置说明 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions