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

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

Browse Source
This commit is contained in:
gyj
2024-05-16 16:07:58 +08:00
parent 9d7247a4ed e6645c7685
commit b0e379e8bb
3 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/caseManagement/components/mediation.vue
+10 -4
View File
@@ -1,6 +1,7 @@
<template> <template>
<div> <div>
<el-dialog :title="title" :visible="mediationVisable" @close="cancel" center :distroy-on-close="true" width="1000px"> <el-dialog :title="title" :visible="mediationVisable" @close="cancel" center :distroy-on-close="true"
width="1000px">
<el-form ref="form" :model="formData" label-width="180px"> <el-form ref="form" :model="formData" label-width="180px">
<div class="caseInfo">案件信息：</div> <div class="caseInfo">案件信息：</div>
<el-divider></el-divider> <el-divider></el-divider>
@@ -118,8 +119,8 @@
<span>取 消</span> <span>取 消</span>
</el-button> </el-button>
<el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation" <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
:disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1" :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole"
type="primary" round> class="endbutton1" type="primary" round>
提 交 提 交
</el-button> </el-button>
</div> </div>
@@ -312,8 +313,12 @@ export default {
window.open(window.location.origin + "/API" + annexPath, "_black"); window.open(window.location.origin + "/API" + annexPath, "_black");
}, },
toFileMediate(val) { toFileMediate(val) {
// window.open(window.location.origin + "/API" + annexPath, "_black"); if (this.checkPermi(['caseManagement:list:editOffice'])) {
this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 1 } }) this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 1 } })
} else {
this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
}
// window.open(window.location.origin + "/API" + annexPath, "_black");
}, },
/** 生成调解书 */ /** 生成调解书 */
mediationFn(data) { mediationFn(data) {
@@ -376,6 +381,7 @@ export default {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
::v-deep .el-input--medium .el-input__inner { ::v-deep .el-input--medium .el-input__inner {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
src/views/onlyoffice/onlyoffice.vue
+3
View File
@@ -39,6 +39,9 @@ export default {
) )
.then((res) => { .then((res) => {
this.config = res.data; this.config = res.data;
this.config.editorConfig.callbackUrl = this.config.editorConfig.callbackUrl + "/" + id;
console.log(this.config,"OOOOOOOOOOOOOOOOOOOOOOOOOOO");
// this.config.callbackUrl = this.config.callbackUrl + `/${this.userId}`; // this.config.callbackUrl = this.config.callbackUrl + `/${this.userId}`;
var docEditor = new DocsAPI.DocEditor("placeholder", this.config); var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
}); });
vue.config.js
+2 -2
View File
@@ -11,8 +11,8 @@ const name = process.env.VUE_APP_TITLE || '调解系统' // 网页标题
const port = process.env.port || process.env.npm_config_port || 80 // 端口 const port = process.env.port || process.env.npm_config_port || 80 // 端口
const API = 'http://121.40.189.20:7001' //生产 // const API = 'http://121.40.189.20:7001' //生产
// 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.18:6001' //B
// const API = 'http://172.16.0.237:6001' //Q // const API = 'http://172.16.0.237:6001' //Q
// const API = 'http://172.16.1.26:7001' //w // const API = 'http://172.16.1.26:7001' //w