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

src/views/caseManagement/components/mediation.vue

@@ -228,7 +228,8 @@ export default {
     },
     handlSuccess(res, file) {
       this.codes = res.code
-      this.attachList = [{ annexId: res.annexId }];
+      console.log(res)
+      this.attachList = [{ annexId: res.annexId,annexType:res.annexType}];
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
     /** 获取案件详情信息 */
@@ -268,8 +269,8 @@ export default {
     openmeeting() {
       this.mediationVisable = false
       window.open(
-        `http://localhost:8080/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
+        // `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&token=${getToken()}`
+        `https://txroom.xayunmei.com/#/home?name=${this.user}&id=${this.formData.id}&userId=${this.userId}&roomId=${this.formData.roomId}&type=tiaojie&token=${getToken()}`
       );
     },
     /**提交仲裁结果 */
@@ -341,6 +342,7 @@ export default {
           id: this.mediationData.id,
           caseFlowId: this.mediationData.caseFlowId,
           attachList: this.attachList,
+          mediaResult: this.formData.mediaResult,
         }
       } else {
         if(this.formData.mediaResult != 1){
@@ -353,6 +355,7 @@ export default {
           mediaResult: this.formData.mediaResult,
         }
       }
+      console.log(mediationVal)
       this.mediationFn(mediationVal);
     },
     resultsMediation() {