Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

src/views/caseManagement/components/mediation.vue

@@ -40,7 +40,7 @@
           <el-form-item label="申请人案件证据：">
             <div v-if="applicateArr.length == 0">申请人暂未提供证据！</div>
             <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="toFile2(item.annexPath)" style="color: blue">{{ item.annexName }}</a>
             </div>
           </el-form-item>
         </el-col>
@@ -55,14 +55,14 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="24">
+        <el-col :span="24">
-          <el-form-item label="是否和解" v-if="mediaResult==1">
+          <el-form-item label="是否用印申请" v-if="formData.mediaResult == 1">
-             <el-radio-group v-model="isReconci">
+             <el-radio-group v-model="sealFlag">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </el-form-item>
-        </el-col> -->
+        </el-col>
         <!-- <el-col :span="24">
           <el-form-item label="被申请人案件证据：">
             <div v-if="quiltArr.length == 0">被申请人暂未提供证据！</div>
@@ -142,6 +142,7 @@ export default {
   props: ["mediationVisable", "mediationData", "queryParams","applicant"],
   data() {
     return {
+      sealFlag:1,
       loanStartDate: "",
       codes: null,
       title: "线上调解",
@@ -260,8 +261,8 @@ export default {
     /** 发起会议 */
     openmeeting() {
       window.open(
-        // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie`
+        // `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
-        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie`
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
       );
     },
     /**提交仲裁结果 */
@@ -325,17 +326,24 @@ export default {
       let mediationVal = {}
       
       if (this.codes == 200) {
+        if(this.formData.mediaResult != 1){
+          this.sealFlag = 0
+        }
         mediationVal = {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
           attachList: this.attachList,
-          // isReconci:this.isReconci,
+          sealFlag:this.sealFlag,
           mediaResult: this.formData.mediaResult,
         }
       } else {
+        if(this.formData.mediaResult != 1){
+          this.sealFlag = 0
+        }
         mediationVal = {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
+          sealFlag:this.sealFlag,
           mediaResult: this.formData.mediaResult,
         }
       }

src/views/onlyoffice/onlyoffice.vue

@@ -26,11 +26,11 @@ export default {
     },
     methods: {
         getConfig(id) {
-            let edit = edit;
+            let edit = "edit";
             if (this.flag == 0) {
                 edit = 'view';
             } else {
-                edit = 'edit'
+                edit = 'edit';
             }
             axios.get(`http://121.40.189.20:9090/onlyOfficeConfig/${edit}/${id}/${this.userId}/desktop/true`).then(res => {
                 this.config = res.data;
@@ -83,35 +83,12 @@ export default {
         websocketclose(e) {
             console.log('断开连接', e)
         },
-        // 点击按钮
-        // btnClick() {
-        //     // 因为需求是每次点击都是发起不同ws连接，拿到的数据也不一致，所以连接前要先断开上次的连接
-        //     if (this.websock) {
-        //         this.websock.close() // 关闭websocket连接
-        //     }
-        //     this.initWebSocket() // 初始化weosocket，发起连接
-        //     // 这里使用定时器是为了等待连接后才发送数据，避免错误
-        //     setTimeout(() => {
-        //         //添加状态判断，当为OPEN时，前端发送消息给后端
-        //         if (this.websock.readyState === 1) {
-        //             // 把后台需要的参数数据传过去
-        //             let obj = {
-        //                 jobId: 111,
-        //                 token: 'xxxxx',
-        //                 message: 'send ok'
-        //             }
-        //             //发给后端的数据需要字符串化
-        //             this.websock.send(JSON.stringify(obj))
-        //         }
-        //     }, 500)
-        // }
     },
     mounted() {
         let id = this.$route.query.id;
         this.flag = this.$route.query.flag;
         this.getConfig(id);
         this.initWebSocket();
-        console.log(this.userId, "PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP");
     },
     watch: {