SH-Arbitrate/Mediation-Frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev

Browse Source
This commit was merged in pull request #27.
This commit is contained in:
hanchaobo
2024-01-30 09:29:58 +08:00
committed by Gitea
parent cbe545ae8a 9a738ad294
commit 47151436f6
4 changed files with 180 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/confirmMediator.vue
+102 -83
View File
@@ -2,19 +2,13 @@
<div>
<el-dialog title="秘书确认调解员" :visible="confirmVisable" v-if="confirmVisable" @close="cancel" center
:distroy-on-close="true">
<div style="margin-bottom: 20px;">
<el-radio-group v-model="confirmFlag">
<el-radio :label="1">同意</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
</div>
<div>
<div>
<div style="margin-bottom: 20px;">调解员</div>
<div v-if="tableDataFlag">
<div style="margin-bottom: 20px;">选择调解员</div>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
<el-table v-if="tableDataFlag" ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" v-if="!confirmShow">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
@@ -25,24 +19,45 @@
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column>
</el-table>
<!-- <div>
<div style="margin-top: 20px;margin-bottom: 20px;">时间</div>
<el-form label-position="right" label-width="80px" :model="formLabelAlign" :disabled="confirmShow">
<el-form-item label="时间">
<el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
<!-- 后期需要三个时间 -->
<!-- <el-form-item label="时间2">
<el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="时间3">
<el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
<!-- </el-form>
</div> -->
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">当前调解员</div>
</div>
<el-table ref="multipleTable" :data="tableDataNow" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">申请人调解员</div>
</div>
<el-table ref="multipleTable" :data="applicantTable" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">被申请人调解员</div>
</div>
<el-table ref="multipleTable" :data="respondentTable" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
@@ -61,37 +76,27 @@ export default {
data() {
return {
tableData: [],
tableDataNow: [],
applicantTable: [],
respondentTable: [],
multipleSelection: [],
tableDataFlag: false,
formLabelAlign: {
time: []
},
formTimeArr: [],
mediatorArr: [],
confirmFlag: 1,
confirmShow: true,
};
},
watch: {
confirmVisable(val) {
if (val) {
this.confirmFlag = 1;
this.mediatorArr = [];
this.formTimeArr = [];
this.selectReservationFn({ id: this.confirmData.id })
}
},
confirmFlag(val) {
if (val == 1) {
this.confirmShow = true;
console.log(this.confirmData.id);
this.selectReservationFn({ id: this.confirmData.id })
} else {
this.confirmShow = false;
listMediator().then(res => {
this.tableData = res.data;
})
}
}
},
},
methods: {
cancel() {
@@ -99,8 +104,14 @@ export default {
},
selectReservationFn(data) {
selectReservation(data).then(res => {
this.tableData = res.data.mediatorList;
this.formLabelAlign.time[0] = res.data.herDates[0];
this.applicantTable = res.data.mediatorList;
this.respondentTable = res.data.resMediatorList;
this.tableDataNow = [{ mediatorId: res.data.mediatorId, mediatorName: res.data.mediatorName }];
if (this.tableDataNow.length > 0) {
this.tableDataFlag = false;
} else {
this.tableDataFlag = true;
}
})
},
/**核实调解员 */
@@ -113,54 +124,62 @@ export default {
},
/**提交选择结果*/
async submitMediator() {
if (this.confirmFlag == 1) {
let userArr = [];
this.tableData.forEach(item => {
userArr.push({
userId: item.mediatorId,
userName: item.mediatorName
})
})
if (this.multipleSelection.length == 0 && this.tableDataNow.length > 0) {
this.verifyMediatorFn({
id: this.confirmData.id,
caseFlowId: this.confirmData.caseFlowId,
userList: userArr,
// herDates: this.formLabelAlign.time
mediatorId: this.tableDataNow[0].mediatorId,
mediatorName: this.tableDataNow[0].mediatorName,
})
} else {
if (this.multipleSelection.length > 1) {
} else if (this.multipleSelection.length > 0 && this.tableDataNow.length == 0) {
this.verifyMediatorFn({
id: this.confirmData.id,
caseFlowId: this.confirmData.caseFlowId,
mediatorId: this.multipleSelection[0].mediatorId,
mediatorName: this.multipleSelection[0].mediatorName,
})
} else if (this.multipleSelection.length > 1 && this.tableDataNow.length == 0) {
Message.error('最多选择一名调解员');
return
} else if (this.multipleSelection.length < 1) {
Message.error('至少选择一名调解员');
return
}
if (this.formLabelAlign.time.length < 1) {
Message.error('至少选择一个时间');
return
}
this.formLabelAlign.time.forEach(item => {
item = moment(
item
).format("YYYY-MM-DD HH:mm:ss");
this.formTimeArr.push(item)
})
this.multipleSelection.forEach(item => {
this.mediatorArr.push({
userId: item.mediatorId,
userName: item.mediatorName
})
})
this.verifyMediatorFn({
id: this.confirmData.id,
caseFlowId: this.confirmData.caseFlowId,
userList: this.mediatorArr,
// herDates: this.formLabelAlign.time
})
}
// if (this.confirmFlag == 1) {
// let userArr = [];
// this.tableData.forEach(item => {
// userArr.push({
// userId: item.mediatorId,
// userName: item.mediatorName
// })
// })
// this.verifyMediatorFn({
// id: this.confirmData.id,
// caseFlowId: this.confirmData.caseFlowId,
// userList: userArr,
// // herDates: this.formLabelAlign.time
// })
// } else {
// if (this.multipleSelection.length > 1) {
// Message.error('最多选择一名调解员');
// return
// } else if (this.multipleSelection.length < 1) {
// Message.error('至少选择一名调解员');
// return
// }
// this.multipleSelection.forEach(item => {
// this.mediatorArr.push({
// userId: item.mediatorId,
// userName: item.mediatorName
// })
// })
// this.verifyMediatorFn({
// id: this.confirmData.id,
// caseFlowId: this.confirmData.caseFlowId,
// userList: this.mediatorArr,
// })
// }
},
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(val, "PPPPPPPPPPPPPPPPPPPP");
}
},
};
src/views/caseManagement/components/departmentMediator.vue
+71 -86
View File
@@ -2,19 +2,13 @@
<div>
<el-dialog title="部门长确认调解员" :visible="departmentVisable" v-if="departmentVisable" @close="cancel" center
:distroy-on-close="true">
<div style="margin-bottom: 20px;">
<el-radio-group v-model="confirmFlag">
<el-radio :label="1">同意</el-radio>
<el-radio :label="2">拒绝</el-radio>
</el-radio-group>
</div>
<div>
<div>
<div style="margin-bottom: 20px;">调解员</div>
<div v-if="tableDataFlag">
<div style="margin-bottom: 20px;">选择调解员</div>
</div>
<el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
<el-table v-if="tableDataFlag" ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" v-if="!confirmShow">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
@@ -25,28 +19,49 @@
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column>
</el-table>
<!-- <div>
<div style="margin-top: 20px;margin-bottom: 20px;">时间</div>
<el-form label-position="right" label-width="80px" :model="formLabelAlign" :disabled="confirmShow">
<el-form-item label="时间">
<el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
<!-- 后期需要三个时间 -->
<!-- <el-form-item label="时间2">
<el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="时间3">
<el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
<!-- </el-form>
</div> -->
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">当前调解员</div>
</div>
<el-table ref="multipleTable" :data="tableDataNow" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">申请人调解员</div>
</div>
<el-table ref="multipleTable" :data="applicantTable" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
<div>
<div style="margin-bottom: 20px;margin-top: 20px;">被申请人调解员</div>
</div>
<el-table ref="multipleTable" :data="respondentTable" tooltip-effect="dark" style="width: 100%">
<el-table-column prop="mediatorName" label="调解员名称">
</el-table-column>
<!-- <el-table-column prop="specialty" label="专业">
</el-table-column>
<el-table-column prop="todoAmount" label="待办数量">
</el-table-column>
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column> -->
</el-table>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
<el-button @click="submitMediator" class="endbutton1" type="primary" round><span>确 认</span></el-button>
<el-button @click="cancel" class="endbutton1"><span>取 消</span></el-button>
<el-button @click="submitMediator" class="endbutton1"><span>确 认</span></el-button>
</div>
</el-dialog>
</div>
@@ -54,44 +69,34 @@
<script>
import { Message } from 'element-ui'
import { listMediator, selectReservation, verifyMediator } from '@/api/caseManagement/caseManagement.js'
import { listMediator, updateBooking, selectReservation, verifyMediator } from '@/api/caseManagement/caseManagement.js'
import moment from "moment";
export default {
props: ["departmentVisable", "departmentData", "queryParams"],
data() {
return {
tableData: [],
tableDataNow: [],
applicantTable: [],
respondentTable: [],
multipleSelection: [],
tableDataFlag: false,
formLabelAlign: {
time: []
},
formTimeArr: [],
mediatorArr: [],
confirmFlag: 1,
confirmShow: true,
};
},
watch: {
departmentVisable(val) {
if (val) {
this.confirmFlag = 1;
this.mediatorArr = [];
this.formTimeArr = [];
this.selectReservationFn({ id: this.departmentData.id })
}
},
confirmFlag(val) {
if (val == 1) {
this.confirmShow = true;
console.log(this.departmentData.id);
this.selectReservationFn({ id: this.departmentData.id })
} else {
this.confirmShow = false;
listMediator().then(res => {
this.tableData = res.data;
})
}
}
},
},
methods: {
cancel() {
@@ -99,8 +104,14 @@ export default {
},
selectReservationFn(data) {
selectReservation(data).then(res => {
this.tableData = res.data.mediatorList;
this.formLabelAlign.time[0] = res.data.herDates[0];
this.applicantTable = res.data.mediatorList;
this.respondentTable = res.data.resMediatorList;
this.tableDataNow = [{ mediatorId: res.data.mediatorId, mediatorName: res.data.mediatorName }];
if (this.tableDataNow.length > 0) {
this.tableDataFlag = false;
} else {
this.tableDataFlag = true;
}
})
},
/**核实调解员 */
@@ -113,54 +124,28 @@ export default {
},
/**提交选择结果*/
async submitMediator() {
if (this.confirmFlag == 1) {
let userArr = [];
this.tableData.forEach(item => {
userArr.push({
userId: item.mediatorId,
userName: item.mediatorName
})
})
if (this.multipleSelection.length == 0 && this.tableDataNow.length > 0) {
this.verifyMediatorFn({
id: this.departmentData.id,
caseFlowId: this.departmentData.caseFlowId,
userList: userArr,
// herDates: this.formLabelAlign.time
mediatorId: this.tableDataNow[0].mediatorId,
mediatorName: this.tableDataNow[0].mediatorName,
})
} else {
if (this.multipleSelection.length > 1) {
} else if (this.multipleSelection.length > 0 && this.tableDataNow.length == 0) {
this.verifyMediatorFn({
id: this.departmentData.id,
caseFlowId: this.departmentData.caseFlowId,
mediatorId: this.multipleSelection[0].mediatorId,
mediatorName: this.multipleSelection[0].mediatorName,
})
} else if (this.multipleSelection.length > 1 && this.tableDataNow.length == 0) {
Message.error('最多选择一名调解员');
return
} else if (this.multipleSelection.length < 1) {
Message.error('至少选择一名调解员');
return
}
if (this.formLabelAlign.time.length < 1) {
Message.error('至少选择一个时间');
return
}
this.formLabelAlign.time.forEach(item => {
item = moment(
item
).format("YYYY-MM-DD HH:mm:ss");
this.formTimeArr.push(item)
})
this.multipleSelection.forEach(item => {
this.mediatorArr.push({
userId: item.mediatorId,
userName: item.mediatorName
})
})
this.verifyMediatorFn({
id: this.departmentData.id,
caseFlowId: this.departmentData.caseFlowId,
userList: this.mediatorArr,
// herDates: this.formLabelAlign.time
})
}
},
handleSelectionChange(val) {
this.multipleSelection = val;
console.log(val, "PPPPPPPPPPPPPPPPPPPP");
}
},
};
src/views/caseManagement/components/selectMediator.vue
+8 -50
View File
@@ -1,6 +1,6 @@
<template>
<div>
<el-dialog title="预约时间/调解员" :visible="mediatorVisable" v-if="mediatorVisable" @close="cancel" center :distroy-on-close="true">
<el-dialog title="预约调解员" :visible="mediatorVisable" v-if="mediatorVisable" @close="cancel" center :distroy-on-close="true">
<div>
<div>
<div style="margin-bottom: 20px;">预约调解员</div>
@@ -18,24 +18,6 @@
<el-table-column prop="completeAmount" label="已办数量">
</el-table-column>
</el-table>
<div>
<div style="margin-top: 20px;margin-bottom: 20px;">预约时间</div>
<el-form label-position="right" label-width="80px" :model="formLabelAlign">
<el-form-item label="时间1">
<el-date-picker v-model="formLabelAlign.time[0]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<!-- 后期需要三个时间 -->
<!-- <el-form-item label="时间2">
<el-date-picker v-model="formLabelAlign.time[1]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item>
<el-form-item label="时间3">
<el-date-picker v-model="formLabelAlign.time[2]" type="datetime" placeholder="选择日期时间">
</el-date-picker>
</el-form-item> -->
</el-form>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton1" round><span>取 消</span></el-button>
@@ -59,17 +41,12 @@ export default {
formLabelAlign: {
time:[]
},
formTimeArr:[],
mediatorArr:[]
};
},
watch: {
mediatorVisable(val) {
if (val) {
// this.this.multipleSelection = [];
// this.formLabelAlign.time = [];
this.mediatorArr = [];
this.formTimeArr = [];
listMediator().then(res=>{
this.tableData = res.data;
})
@@ -82,37 +59,24 @@ export default {
},
/**提交选择结果*/
async submitMediator() {
if (this.multipleSelection.length > 1) {
Message.error('最多选择一名调解员');
if (this.multipleSelection.length > 3) {
Message.error('最多选择三名调解员');
return
}else if(this.multipleSelection.length < 1){
Message.error('至少选择一名调解员');
Message.error('请选择调解员');
return
}
if(this.formLabelAlign.time.length < 1){
Message.error('至少选择一个时间');
return
}
this.formLabelAlign.time.forEach(item=>{
item = moment(
item
).format("YYYY-MM-DD HH:mm:ss");
this.formTimeArr.push(item)
})
this.mediatorArr = [];
this.multipleSelection.forEach(item=>{
this.mediatorArr.push({
userId:item.mediatorId,
userName:item.mediatorName
mediatorId:item.mediatorId,
mediatorName:item.mediatorName
})
})
// await this.createRoomIdFn({
// caseId:this.mediatorData.id
// })
await this.updateBookingFn({
id:this.mediatorData.id,
caseFlowId:this.mediatorData.caseFlowId,
userList:this.mediatorArr,
herDates:this.formTimeArr
mediatorList:this.mediatorArr,
})
},
async updateBookingFn(data){
@@ -122,12 +86,6 @@ export default {
this.$emit('getList', this.queryParams);
})
},
// 生成会议房间号
async createRoomIdFn(data){
await createRoomId(data).then(res=>{
console.log(res,"房间号");
})
},
handleSelectionChange(val) {
this.multipleSelection = val;
// console.log(this.multipleSelection,"LLLLLLLLLLLLLLLLL");
vue.config.js
+3 -3
View File
@@ -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://192.168.3.77:6001' //Q
const API = 'http://172.16.1.17:6001' //w
// vue.config.js 配置说明
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions