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 #49.
This commit is contained in:
hanchaobo
2024-02-22 10:48:55 +08:00
committed by Gitea
parent a48004581e a87f8f6471
commit 1f5f7f59d0
2 changed files with 59 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/caseManagement/caseManagement.js
+8
View File
@@ -231,3 +231,11 @@ export function confirmMeetingResult(data) {
data: data data: data
}) })
} }
// 根据用户id查询是否为调解员
export function secretaryRoleByUserId(query) {
return request({
url: '/video/secretaryRoleByUserId',
method: 'get',
params: query
})
}
src/views/caseManagement/components/mediation.vue
+51 -40
View File
@@ -39,19 +39,19 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="申请人案件证据："> <el-form-item label="申请人案件证据：">
<div v-if="applicateArr.length == 0">申请人暂未提供证据！</div> <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
<div v-for="(item, index) in applicateArr" :key="index" v-if="item.annexType == 2"> <div v-for="(item, index) in applicateArr" :key="index" v-if="item.annexType == 2">
<a href="#" @click="toFile(item, index)" style="color: blue">{{ item.annexName }}</a> <a href="#" @click="toFile(item, index)" style="color: blue">{{ item.annexName }}</a>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="mediationType"> <el-col :span="24" v-if="mediationType">
<el-form-item label="调解结果:"> <el-form-item label="调解结果:">
<el-radio-group v-model="mediaResult" @change="resultsMediation"> <el-radio-group v-model="mediaResult" :disabled="!isSecretaryRole" @change="resultsMediation">
<el-radio :label="1">达成调解</el-radio> <el-radio :label="1">达成调解</el-radio>
<el-radio :label="2">未达成调解</el-radio> <el-radio :label="2">未达成调解</el-radio>
<el-radio :label="3">未达成调解但不在争议</el-radio> <el-radio :label="3">未达成调解但不在争议</el-radio>
<el-radio :label="4">未达成调解但同意引入仲裁</el-radio> <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
<el-radio :label="5">达成和解</el-radio> <el-radio :label="5">达成和解</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -98,10 +98,10 @@
<!-- v-if="!mediationType" --> <!-- v-if="!mediationType" -->
<el-col :span="24"> <el-col :span="24">
<el-form-item label="上传调解书"> <el-form-item label="上传调解书">
<el-upload class="upload-demo" accept=".png,.jpg,.doc,.docx,.txt,.pdf" ref="upload" :action="UploadUrl()" :headers="headers" :data="filedata" <el-upload class="upload-demo" accept=".png,.jpg,.doc,.docx,.txt,.pdf" ref="upload" :action="UploadUrl()"
:on-preview="handlePreview" :on-remove="handleRemove" :limit="1" :on-change="beforeUpload" :on-success="handlSuccess" :headers="headers" :data="filedata" :on-preview="handlePreview" :on-remove="handleRemove" :limit="1"
:file-list="fileList"> :on-change="beforeUpload" :on-success="handlSuccess" :file-list="fileList">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <el-button slot="trigger" size="small" :disabled="!isSecretaryRole" type="primary">选取文件</el-button>
<!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> --> <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
<div slot="tip" class="el-upload__tip">只能上传.jpg，png，.doc，docx，.txt，.pdf文件</div> <div slot="tip" class="el-upload__tip">只能上传.jpg，png，.doc，docx，.txt，.pdf文件</div>
</el-upload> </el-upload>
@@ -109,16 +109,16 @@
</el-col> </el-col>
<!-- </el-form> --> <!-- </el-form> -->
</el-form> </el-form>
<el-button @click="openmeeting" type="primary" v-if="mediationType">发起会议</el-button> <el-button @click="openmeeting" type="primary" v-if="mediationType">{{ isSecretaryRole ? '发起会议' :
'进入会议' }}</el-button>
<!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" --> <!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" -->
<el-button @click="openArbitrationresults" type="primary" <el-button @click="openArbitrationresults" type="primary"
v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'">确认会议结果</el-button>
>确认会议结果</el-button>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel" class="endbutton1" round> <el-button @click="cancel" class="endbutton1" round>
<span>取 消</span> <span>取 消</span>
</el-button> </el-button>
<el-button @click="submitMediation" :disabled="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" <el-button v-if="isSecretaryRole" @click="submitMediation" :disabled="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'"
class="endbutton1" type="primary" round> class="endbutton1" type="primary" round>
<span>提 交</span> <span>提 交</span>
</el-button> </el-button>
@@ -131,7 +131,8 @@
import { import {
caseApplicationSelectById, caseApplicationSelectById,
mediation, mediation,
confirmMeetingResult confirmMeetingResult,
secretaryRoleByUserId
} from "@/api/caseManagement/caseManagement.js"; } from "@/api/caseManagement/caseManagement.js";
import { getUserProfile } from "@/api/system/user"; import { getUserProfile } from "@/api/system/user";
import { reserveConferenceList } from "@/api/metting/metting.js"; import { reserveConferenceList } from "@/api/metting/metting.js";
@@ -141,15 +142,15 @@ export default {
data() { data() {
return { return {
loanStartDate: "", loanStartDate: "",
codes:null, codes: null,
title: "线上调解", title: "线上调解",
applicateArr: [], applicateArr: [],
quiltArr: [], quiltArr: [],
recordArr: [], recordArr: [],
recordArrMediate:[], recordArrMediate: [],
roomId: null, roomId: null,
startTime: null, startTime: null,
mediaResult:1, mediaResult: 1,
// isReconci:0, // isReconci:0,
formData: { formData: {
affiliate: {} affiliate: {}
@@ -164,8 +165,9 @@ export default {
filedata: { filedata: {
annexType: 7, annexType: 7,
}, },
fileList:[], fileList: [],
attachList:[], attachList: [],
isSecretaryRole: true,
}; };
}, },
watch: { watch: {
@@ -189,6 +191,14 @@ export default {
}, },
created() { }, created() { },
methods: { methods: {
// 根据用户id查询是否为调解员
secretaryRoleByUserIdFn() {
secretaryRoleByUserId({
userId: this.userId
}).then(res => {
this.isSecretaryRole = res.data.isSecretaryRole;
})
},
/**上传地址*/ /**上传地址*/
UploadUrl() { UploadUrl() {
return window.location.origin + "/API/common/upload"; return window.location.origin + "/API/common/upload";
@@ -196,14 +206,14 @@ export default {
handlePreview(file) { handlePreview(file) {
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
}, },
beforeUpload(flie, fileList) { beforeUpload(flie, fileList) {
this.fileList = fileList; this.fileList = fileList;
}, },
handlSuccess(res, file) { handlSuccess(res, file) {
this.codes = res.code this.codes = res.code
this.attachList = [{annexId:res.annexId}]; this.attachList = [{ annexId: res.annexId }];
// this.$set(this.mediationData, "attachList", {annexId:res.annexId}); // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
}, },
/** 获取案件详情信息 */ /** 获取案件详情信息 */
@@ -214,7 +224,7 @@ export default {
res.data.caseAttachList.forEach(item => { res.data.caseAttachList.forEach(item => {
if (item.annexType == 6) { if (item.annexType == 6) {
this.recordArr.push(item); this.recordArr.push(item);
}else if(item.annexType == 7){ } else if (item.annexType == 7) {
this.recordArrMediate.push(item); this.recordArrMediate.push(item);
} }
}); });
@@ -225,6 +235,7 @@ export default {
getUserProfile().then(response => { getUserProfile().then(response => {
this.user = response.data.userName; this.user = response.data.userName;
this.userId = response.data.userId; this.userId = response.data.userId;
this.secretaryRoleByUserIdFn();
}); });
}, },
/** 发起会议 */ /** 发起会议 */
@@ -250,10 +261,10 @@ export default {
id: this.mediationData.id, id: this.mediationData.id,
caseFlowId: this.mediationData.caseFlowId, caseFlowId: this.mediationData.caseFlowId,
batchNumber: "", batchNumber: "",
mediaResult:this.mediaResult, mediaResult: this.mediaResult,
}).then(res =>{ }).then(res => {
caseApplicationSelectById({ caseApplicationSelectById({
id: this.mediationData.id id: this.mediationData.id
}).then(res => { }).then(res => {
res.data.caseAttachList.forEach(item => { res.data.caseAttachList.forEach(item => {
if (item.annexType == 7) { if (item.annexType == 7) {
@@ -286,26 +297,26 @@ export default {
this.$modal.msgError("请上传调解书"); this.$modal.msgError("请上传调解书");
return return
} }
let mediationVal ={} let mediationVal = {}
if (this.codes == 200){ if (this.codes == 200) {
mediationVal = { mediationVal = {
id: this.mediationData.id, id: this.mediationData.id,
caseFlowId: this.mediationData.caseFlowId, caseFlowId: this.mediationData.caseFlowId,
attachList: this.attachList, attachList: this.attachList,
// isReconci:this.isReconci, // isReconci:this.isReconci,
mediaResult:this.mediaResult, mediaResult: this.mediaResult,
} }
}else{ } else {
mediationVal = { mediationVal = {
id: this.mediationData.id, id: this.mediationData.id,
caseFlowId: this.mediationData.caseFlowId, caseFlowId: this.mediationData.caseFlowId,
mediaResult:this.mediaResult, mediaResult: this.mediaResult,
} }
} }
this.mediationFn(mediationVal); this.mediationFn(mediationVal);
}, },
resultsMediation(){ resultsMediation() {
} }
} }
}; };