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>
@@ -56,10 +57,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1&& mediationData.mediationMethod=='1'">
+          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1 && mediationData.mediationMethod == '1'">
-             <el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
+            <el-radio-group v-model="formData.sealFlag" :disabled="!selectRoido">
-                <el-radio :label="1">是</el-radio>
+              <el-radio :label="1">是</el-radio>
-                <el-radio :label="0">否</el-radio>
+              <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -110,7 +111,7 @@
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary" v-if="mediationType">{{ isSecretaryRole ? '发起会议' :
-        '进入会议' }}</el-button>
+      '进入会议' }}</el-button>
       <el-button @click="openArbitrationresults" type="primary"
         v-if="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole">确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
@@ -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"
+          :disabled="this.recordArrMediate.length <= 0 && mediationData.mediationMethod == '1' && isSecretaryRole"
-          type="primary" round>
+          class="endbutton1" type="primary" round>
           提 交
         </el-button>
       </div>
@@ -139,10 +140,10 @@ import { getUserProfile } from "@/api/system/user";
 import { reserveConferenceList } from "@/api/metting/metting.js";
 import { getToken } from "@/utils/auth";
 export default {
-  props: ["mediationVisable", "mediationData", "queryParams","applicant"],
+  props: ["mediationVisable", "mediationData", "queryParams", "applicant"],
   data() {
     return {
-      sealFlag:1,
+      sealFlag: 1,
       loanStartDate: "",
       codes: null,
       title: "线上调解",
@@ -156,8 +157,8 @@ export default {
       // isReconci:0,
       formData: {
         affiliate: {},
-        mediaResult:1,
+        mediaResult: 1,
-        sealFlag:1,
+        sealFlag: 1,
       },
       user: "",
       userId: null,
@@ -168,13 +169,13 @@ export default {
       },
       filedata: {
         annexType: 7,
-        isMediaBook:1,
+        isMediaBook: 1,
       },
       fileList: [],
       attachList: [],
       isSecretaryRole: true,
       loadingSubmit: false,
-      selectRoido:true
+      selectRoido: true
     };
   },
   watch: {
@@ -196,11 +197,11 @@ export default {
         this.caseApplicationSelectByIdFn({
           id: this.mediationData.id
         });
-        this.getUser(); 
+        this.getUser();
       }
     },
-    recordArrMediate(val){
+    recordArrMediate(val) {
-      if(val.length >= 1){
+      if (val.length >= 1) {
         this.selectRoido = false;
       }
     }
@@ -213,7 +214,7 @@ export default {
         userId: this.userId,
         caseId: this.mediationData.id
       }).then(res => {
-         this.isSecretaryRole = res.data.isSecretaryRole;
+        this.isSecretaryRole = res.data.isSecretaryRole;
       })
     },
     /**上传地址*/
@@ -232,21 +233,21 @@ export default {
     handlSuccess(res, file) {
       this.codes = res.code
       console.log(res)
-      this.attachList.push({ annexId: res.annexId,annexType:res.annexType});
+      this.attachList.push({ annexId: res.annexId, annexType: res.annexType });
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
     /** 获取案件详情信息 */
     caseApplicationSelectByIdFn(data) {
       caseApplicationSelectById(data).then(res => {
-        if(res.data.mediaResult){
+        if (res.data.mediaResult) {
-           this.formData = res.data;
+          this.formData = res.data;
-        }else{
+        } else {
           this.formData = res.data;
           this.formData.mediaResult = 1;
         }
-        if(res.data.sealFlag==1||res.data.sealFlag==0){
+        if (res.data.sealFlag == 1 || res.data.sealFlag == 0) {
-           this.formData = res.data;
+          this.formData = res.data;
-        }else{
+        } else {
           this.formData = res.data;
           this.formData.sealFlag = 1;
         }
@@ -293,7 +294,7 @@ export default {
         caseFlowId: this.mediationData.caseFlowId,
         batchNumber: "",
         mediaResult: this.formData.mediaResult,
-        sealFlag:this.formData.sealFlag
+        sealFlag: this.formData.sealFlag
       }).then(res => {
         caseApplicationSelectById({
           id: this.mediationData.id
@@ -312,8 +313,12 @@ export default {
       window.open(window.location.origin + "/API" + annexPath, "_black");
     },
     toFileMediate(val) {
+      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");
-      this.$router.push({ path: '/onlyoffice', query: {id:val,flag:1} })
     },
     /** 生成调解书 */
     mediationFn(data) {
@@ -322,7 +327,7 @@ export default {
         this.$emit("cancelMediation");
         this.$emit("getList", this.queryParams);
         this.loadingSubmit = false;
-      }).catch(err=>{
+      }).catch(err => {
         this.loadingSubmit = false;
       });
     },
@@ -338,9 +343,9 @@ export default {
         this.loadingSubmit = true;
       }
       let mediationVal = {}
-      
+
       if (this.codes == 200) {
-        if(this.formData.mediaResult != 1){
+        if (this.formData.mediaResult != 1) {
           this.sealFlag = 0
         }
         mediationVal = {
@@ -350,13 +355,13 @@ export default {
           mediaResult: this.formData.mediaResult,
         }
       } else {
-        if(this.formData.mediaResult != 1){
+        if (this.formData.mediaResult != 1) {
           this.sealFlag = 0
         }
         mediationVal = {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
-          sealFlag:this.sealFlag,
+          sealFlag: this.sealFlag,
           attachList: this.attachList,
           mediaResult: this.formData.mediaResult,
         }
@@ -370,12 +375,13 @@ export default {
   }
 };
 </script>
-  
+
 <style lang="scss" scoped>
 .steps {
   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: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://172.16.0.237:6001' //Q
 // const API = 'http://172.16.1.26:7001' //w