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

src/api/caseManagement/caseManagement.js

     params: query
   })
 }
-
+// 确定会议结果
+export function confirmMeetingResult(data) {
+  return request({
+    url: '/caseApplication/confirmMeetingResult',
+    method: 'post',
+    data: data
+  })
+}

src/views/caseManagement/components/caseAcceptance.vue

     <!-- 案件受理 -->
     <el-dialog title="案件受理" :visible="showAcceptance" @close="cancel" :destroy-on-close="true" center>
       <el-form ref="courtReviewform" :model="courtReviewform">
-        <el-form-item label="是否同意受理:">
+        <el-form-item label="被申请人是否同意调解:">
           <el-radio-group v-model="courtReviewform.agreeFlag">
             <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-form-item label="是否仲裁确认:" v-if="courtReviewform.agreeFlag == 1" >
+        <!-- <el-form-item label="是否仲裁确认:" v-if="courtReviewform.agreeFlag == 1" >
           <el-radio-group v-model="courtReviewform.arbitrateConfirm">
             <el-radio :label="1">是</el-radio>
             <el-radio :label="0">否</el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item v-if="courtReviewform.agreeFlag == 0" label="拒绝理由:" prop="rejectReason" :rules="[
           {
             required: true,

src/views/caseManagement/components/mediation.vue

         <el-col :span="24" v-if="mediationType">
           <el-form-item label="调解结果:">
              <el-radio-group v-model="mediaResult" @change="resultsMediation">
-                <el-radio :label="1">达成调解书</el-radio>
+                <el-radio :label="1">达成调解</el-radio>
                 <el-radio :label="2">未达成调解</el-radio>
                 <el-radio :label="3">未达成调解但不在争议</el-radio>
                 <el-radio :label="4">未达成调解但同意引入仲裁</el-radio>
             </div>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="调解书：" v-if="recordArrMediate.length > 0">
+            <div v-for="(item, index) in recordArrMediate" :key="index" style="color: blue">
+              <a href="#" @click="toFileMediate(item.annexPath)">{{ item.annexName }}</a>
+            </div>
+          </el-form-item>
+        </el-col>
         <el-col :span="24" v-if="mediationType">
           <el-form-item label="预约会议房间号：">
             <div>{{ formData.roomId }}</div>
             <div>{{ formData.hearDate }}</div>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="!mediationType">
+        <!-- v-if="!mediationType" -->
+        <el-col :span="24">
           <el-form-item label="上传调解书">
-            <el-upload class="upload-demo" ref="upload" :action="UploadUrl()" :headers="headers" :data="filedata"
-              :on-preview="handlePreview" :on-remove="handleRemove" :on-change="beforeUpload" :on-success="handlSuccess"
+            <el-upload class="upload-demo" accept=".png,.jpg,.doc,.docx,.txt,.pdf" ref="upload" :action="UploadUrl()" :headers="headers" :data="filedata"
+              :on-preview="handlePreview" :on-remove="handleRemove" :limit="1" :on-change="beforeUpload" :on-success="handlSuccess"
               :file-list="fileList">
               <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
               <!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> -->
-              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+              <div slot="tip" class="el-upload__tip">只能上传.jpg，png，.doc，docx，.txt，.pdf文件</div>
             </el-upload>
           </el-form-item>
         </el-col>
         <!-- </el-form> -->
       </el-form>
       <el-button @click="openmeeting" type="primary" v-if="mediationType">发起会议</el-button>
+      <!-- v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'" -->
       <el-button @click="openArbitrationresults" type="primary"
-        v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'">确认会议结果</el-button>
+     v-if="this.recordArr.length <= 0 && mediationData.mediationMethod == '1'"
+        >确认会议结果</el-button>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel" class="endbutton1" round>
           <span>取 消</span>
 <script>
 import {
   caseApplicationSelectById,
-  mediation
+  mediation,
+  confirmMeetingResult
 } from "@/api/caseManagement/caseManagement.js";
 import { getUserProfile } from "@/api/system/user";
 import { reserveConferenceList } from "@/api/metting/metting.js";
   data() {
     return {
       loanStartDate: "",
+      codes:null,
       title: "线上调解",
       applicateArr: [],
       quiltArr: [],
       recordArr: [],
+      recordArrMediate:[],
       roomId: null,
       startTime: null,
       mediaResult:1,
   watch: {
     mediationVisable(val) {
       this.recordArr = [];
+      this.recordArrMediate = [];
       if (this.mediationData.mediationMethod == "1") {
         this.title = "线上调解";
         this.mediationType = true;
       this.fileList = fileList;
     },
     handlSuccess(res, file) {
+      this.codes = res.code
       this.attachList = [{annexId:res.annexId}];
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
     },
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
             this.recordArr.push(item);
+          }else if(item.annexType == 7){
+            this.recordArrMediate.push(item);
           }
         });
       });
       caseApplicationSelectById({
         id: this.mediationData.id
       }).then(res => {
+        console.log(res)
         res.data.caseAttachList.forEach(item => {
           if (item.annexType == 6) {
             this.recordArr.push(item);
           }
         });
       });
+      confirmMeetingResult({
+        id: this.mediationData.id,
+        caseFlowId: this.mediationData.caseFlowId,
+        batchNumber: "",
+        mediaResult:this.mediaResult,
+      }).then(res =>{
+        caseApplicationSelectById({
+        id: this.mediationData.id
+        }).then(res => {
+          res.data.caseAttachList.forEach(item => {
+            if (item.annexType == 7) {
+              this.recordArrMediate.push(item);
+            }
+          });
+        });
+      })
     },
     /** 庭审笔录附件 */
     toFile2(annexPath) {
       window.open(window.location.origin + "/API" + annexPath, "_black");
     },
+    toFileMediate(annexPath) {
+      window.open(window.location.origin + "/API" + annexPath, "_black");
+    },
     /** 生成调解书 */
     mediationFn(data) {
       mediation(data).then(res => {
       this.$emit("cancelMediation");
     },
     submitMediation() {
-      if (this.fileList.length < 1 && !this.mediationType) {
+      if (this.fileList.length < 1 && !this.mediationType && this.mediationData.mediationMethod == "2") {
         this.$modal.msgError("请上传调解书");
         return
       }
-      this.mediationFn({
+      let mediationVal ={}
+      if (this.codes == 200){
+        mediationVal = {
         id: this.mediationData.id,
         caseFlowId: this.mediationData.caseFlowId,
         attachList: this.attachList,
         // isReconci:this.isReconci,
         mediaResult:this.mediaResult,
-      });
+        }
+      }else{
+        mediationVal = {
+        id: this.mediationData.id,
+        caseFlowId: this.mediationData.caseFlowId,
+        mediaResult:this.mediaResult,
+        }
+      }
+      this.mediationFn(mediationVal);
     },
     resultsMediation(){