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

src/views/caseManagement/components/mediation.vue

@@ -1,6 +1,7 @@
 <template>
   <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">
         <div class="caseInfo">案件信息：</div>
         <el-divider></el-divider>
@@ -118,8 +119,8 @@
           <span>取 消</span>
         </el-button>
         <el-button v-if="isSecretaryRole" :loading="loadingSubmit" @click="submitMediation"
-          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole" class="endbutton1"
-          type="primary" round>
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole"
+          class="endbutton1" type="primary" round>
           提 交
         </el-button>
       </div>
@@ -312,8 +313,12 @@ export default {
       window.open(window.location.origin + "/API" + annexPath, "_black");
     },
     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 } })
+      } else {
+        this.$router.push({ path: '/onlyoffice', query: { id: val, flag: 0 } })
+      }
+      // window.open(window.location.origin + "/API" + annexPath, "_black");
     },
     /** 生成调解书 */
     mediationFn(data) {
@@ -376,6 +381,7 @@ export default {
   display: flex;
   flex-wrap: wrap;
 }
+
 ::v-deep .el-input--medium .el-input__inner {
   height: 40px;
   line-height: 40px;

src/views/onlyoffice/onlyoffice.vue

@@ -39,6 +39,9 @@ export default {
         )
         .then((res) => {
           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}`;
           var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
         });

vue.config.js

@@ -11,8 +11,8 @@ 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:7001'  //生产
-// const API = 'http://121.40.189.20:6001'  //测试
+// const API = 'http://121.40.189.20:7001'  //生产
+const API = 'http://121.40.189.20:6001'  //测试
 // const API = 'http://192.168.3.18:6001'  //B
 // const API = 'http://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.26:7001' //w