Merge branch 'hcb' of SH-Arbitrate/Mediation-Frontend into dev
This commit was merged in pull request #49.
This commit is contained in:
@@ -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
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
</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>
|
||||||
@@ -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";
|
||||||
@@ -166,6 +167,7 @@ export default {
|
|||||||
},
|
},
|
||||||
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";
|
||||||
@@ -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();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
/** 发起会议 */
|
/** 发起会议 */
|
||||||
|
|||||||
Reference in New Issue
Block a user