Merge branch 'hcb' of SH-Arbitrate/Arbitrate-FrontendH5 into master

src/api/home.js

@@ -48,5 +48,10 @@ export function fileList(caseAppliId) {
   }
 // 确定会议结果
 export function confirmMeetingResult(data) {
-    return axios.post(`tjformal/caseApplication/confirmMeetingResult`, data);
+    let appType = sessionStorage.getItem('type');
+    if (appType == 'tiaojie') {
+        return axios.post(`tjformal/caseApplication/confirmMeetingResult`, data);
+    } else {
+        return axios.post(`zhongcai/caseApplication/confirmMeetingResult`, data);
+    }
 }

src/views/components/footerPhone.vue

@@ -16,7 +16,7 @@
 
         </div> -->
         <div class="mediationPop">
-            <el-button type="warning" @click="mediationPop">调解</el-button>
+            <el-button type="warning" @click="mediationPop">{{ appType == "tiaojie" ? "调解" : "仲裁" }}</el-button>
         </div>
         <div class="outRoom">
             <el-button type="danger" @click="exitRoom" v-if="!roleFlag">退出</el-button>
@@ -38,7 +38,8 @@ export default {
             roomId: null,
             taskId: null,
             roleFlag: false,
-            caseId:""
+            caseId:"",
+            appType:"tiaojie"
         };
     },
     methods: {
@@ -102,6 +103,7 @@ export default {
         },
     },
     async mounted() {
+        this.appType = sessionStorage.getItem('type');
         this.roomId = this.$route.query.roomId;
         let roleFlag = this.$route.query.flag;
         this.caseId = this.$route.query.caseId;

src/views/components/roomFooter.vue

@@ -19,7 +19,7 @@
 
       </div>
       <div class="mediationPop">
-        <el-button type="warning" @click="mediationPop">调解</el-button>
+        <el-button type="warning" @click="mediationPop">{{ appType == "tiaojie" ? "调解" : "仲裁" }}</el-button>
       </div>
     </div>
   </div>
@@ -37,6 +37,7 @@ export default {
       taskId: null,
       roleFlag: true,
       caseId: "",
+      appType:"tiaojie"
     };
   },
   methods: {
@@ -100,6 +101,7 @@ export default {
     },
   },
   async mounted() {
+    this.appType = sessionStorage.getItem('type');
     this.roomId = this.$route.query.roomId;
     this.caseId = this.$route.query.caseId;
     let roleFlag = this.$route.query.flag;

src/views/room.vue

@@ -67,14 +67,16 @@
           :on-change="beforeUpload" :on-success="handlSuccess" :file-list="fileList" v-if="appFlag">
           <el-button slot="trigger" size="small" type="primary">申请人上传证据</el-button>
         </el-upload>
-        <el-upload ref="upload1" :limit="1" :action="UploadUrl()" :headers="headers1" :data="filedata1"
-          :on-change="beforeUpload1" :on-success="handlSuccess1" :file-list="fileList1" v-if="resFlag">
+        <el-upload ref="upload1" :limit="1" :action="UploadUrl()" :headers="headers1"
+          :data="appType == 'tiaojie' ? filedata1 : filedataz1" :on-change="beforeUpload1" :on-success="handlSuccess1"
+          :file-list="fileList1" v-if="resFlag">
           <el-button slot="trigger" size="small" type="primary">被申请人上传证据</el-button>
         </el-upload>
-        <el-upload ref="upload3" :limit="1" :action="UploadUrl()" :headers="headers3" :data="filedata3"
-          :on-change="beforeUpload3" :on-success="handlSuccess3" :file-list="fileList3" accept=".doc,.docx"
-          v-if="updataFlag">
-          <el-button slot="trigger" size="small" type="primary">上传调解书</el-button>
+        <el-upload ref="upload3" :limit="1" :action="UploadUrl()" :headers="headers3"
+          :data="appType == 'tiaojie' ? filedata3 : filedataz3" :on-change="beforeUpload3" :on-success="handlSuccess3"
+          :file-list="fileList3" accept=".doc,.docx" v-if="updataFlag">
+          <!-- <el-button slot="trigger" size="small" type="primary">上传调解书</el-button> -->
+          <el-button slot="trigger" size="small" type="primary">{{ appType == "tiaojie" ? "上传调解书" : "上传裁决书" }}</el-button>
         </el-upload>
       </div>
       <div class="list">
@@ -93,7 +95,7 @@
           </div>
         </div>
         <div class="mediate" v-if="mediateFile.length > 0">
-          <div style="font-size: 20px;margin-bottom: 10PX;">调解书:</div>
+          <div style="font-size: 20px;margin-bottom: 10PX;">{{ appType == "tiaojie" ? "调解书" : "裁决书" }}</div>
           <div style="color: #104fad; cursor: pointer" v-for="(item, index) in mediateFile" :key="index"
             @click="preview(item, 1)">
             {{ item.annexName }}
@@ -101,7 +103,7 @@
         </div>
       </div>
       <div v-if="modileFlag && updataFlag">
-        <el-form label-width="100px">
+        <el-form label-width="100px" v-if="appType == 'tiaojie'">
           <el-col :span="24">
             <el-form-item label="调解结果:">
               <el-radio-group v-model="formData.mediaResult">
@@ -113,7 +115,7 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="formData.mediaResult == 1"> 
+          <el-col :span="24" v-if="formData.mediaResult == 1">
             <el-form-item label="是否用印申请:">
               <el-radio-group v-model="formData.sealFlag">
                 <el-radio :label="1">是</el-radio>
@@ -122,6 +124,34 @@
             </el-form-item>
           </el-col>
         </el-form>
+        <el-form v-if="appType == 'zhongcai'">
+          <el-col :span="24">
+            <el-form-item label="被申请人是否缺席：">
+              <el-radio-group v-model="formData1.appliIsAbsen">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="申请人是否缺席：">
+              <el-radio-group v-model="formData1.isAbsence">
+                <el-radio :label="1">是</el-radio>
+                <el-radio :label="0">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="被申请人对上述材料的质证意见">
+              <el-input type="textarea" v-model="formData1.respondentOpinion" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="申请人对上述材料的质证意见">
+              <el-input type="textarea" v-model="formData1.applicantOpinion" placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-form>
       </div>
       <div v-if="modileFlag && updataFlag">
         <el-button style="width:100%;" type="primary" @click="determineMeeting" :disabled="!updataFlag">确定</el-button>
@@ -194,7 +224,11 @@ export default {
       mediateFile: [],
       formData: {
         mediaResult: 1,
-        sealFlag: 1
+        sealFlag: 1,
+      },
+      formData1: {
+        appliIsAbsen: 0,
+        isAbsence: 0,
       },
       caseFlowId: null,
       headers: {
@@ -216,6 +250,11 @@ export default {
         officeFlag: 0,
         caseId: null,
       },
+      filedataz1: {
+        annexType: 6,
+        officeFlag: 0,
+        caseId: null,
+      },
       fileList1: [],
       headers3: {
         // Authorization: "Bearer " + token,
@@ -227,16 +266,28 @@ export default {
         isMediaBook: 1,
         caseId: null,
       },
+      filedataz3: {
+        annexType: 3,
+        officeFlag: 0,
+        isMediaBook: 1,
+        caseId: null,
+      },
       fileList3: [],
       editFlag: false,
       micFlag: true,
       videoFlag: true,
       sharFlag: true,
+      appType: "tiaojie",
+      timer: null
     };
   },
   methods: {
     UploadUrl() {
-      return window.location.origin + "/tjformal/video/upload";
+      if (this.appType == "tiaojie") {
+        return window.location.origin + "/tjformal/video/upload";
+      } else if (this.appType == "zhongcai") {
+        return window.location.origin + "/zhongcai/video/upload";
+      }
     },
     /**移动端点击换出/隐藏视频列表 */
     checkList(data) {
@@ -350,8 +401,10 @@ export default {
       this.fileList1 = fileList;
       if (file.name.indexOf("docx") == -1) {
         this.filedata1.officeFlag = 0;
+        this.filedataz1.officeFlag = 0;
       } else {
         this.filedata1.officeFlag = 1;
+        this.filedataz1.officeFlag = 1;
       }
     },
     // 文件上传成功
@@ -366,6 +419,7 @@ export default {
     beforeUpload3(file, fileList) {
       this.fileList3 = fileList;
       this.filedata3.officeFlag = 1;
+      this.filedataz3.officeFlag = 1;
     },
     // 文件上传成功
     handlSuccess3(res, file) {
@@ -377,29 +431,31 @@ export default {
       this.selectByIdFn(this.caseId);
     },
     preview(item, type) {
-      if (this.modileFlag) {
-        if (item.onlyOfficeFileId) {
-          // this.$router.push({
-          //   path: "/onlyoffice",
-          //   query: { id: item.onlyOfficeFileId, flag: flag },
-          // });
-          let flag = 1;
-          if (this.editFlag && type != 0) {
-            flag = 1;
-          } else {
-            flag = 0;
-          }
-          let token = sessionStorage.getItem("token");
+      if (this.modileFlag && item.onlyOfficeFileId) {
+        let flag = 1;
+        if (this.editFlag && type != 0) {
+          flag = 1;
+        } else {
+          flag = 0;
+        }
+        let token = sessionStorage.getItem("token");
+        if (this.appType == "tiaojie") {
           window.open(
             `http://121.40.189.20:9002/onlyoffice?id=${item.onlyOfficeFileId}&flag=${flag}&token=${token}`,
             "_black"
             // `http://localhost:81/onlyoffice?id=${item.onlyOfficeFileId}&flag=${flag}&token=${token}`,
             // "_black"
           );
-        } else {
-          window.open(window.location.origin + '/tjformal' + item.annexPath, "_black");
+        }else if(this.appType == "zhongcai"){
+          window.open(
+            `http://121.40.189.20:8000/onlyoffice?id=${item.onlyOfficeFileId}&flag=${flag}&token=${token}`,
+            "_black"
+            // `http://localhost:81/onlyoffice?id=${item.onlyOfficeFileId}&flag=${flag}&token=${token}`,
+            // "_black"
+          );
         }
-      }else{
+
+      } else {
         window.open(window.location.origin + '/tjformal' + item.annexPath, "_black");
       }
 
@@ -461,12 +517,22 @@ export default {
         this.mediateFile = [];
         let fileList = res.data.caseAttachList;
         fileList.forEach((item) => {
-          if (item.annexType == 2) {
-            this.applicantFile.push(item);
-          } else if (item.annexType == 12) {
-            this.resFile.push(item);
-          } else if (item.annexType == 7) {
-            this.mediateFile.push(item);
+          if (this.appType == "tiaojie") {
+            if (item.annexType == 2) {
+              this.applicantFile.push(item);
+            } else if (item.annexType == 12) {
+              this.resFile.push(item);
+            } else if (item.annexType == 7) {
+              this.mediateFile.push(item);
+            }
+          } else if (this.appType == "zhongcai") {
+            if (item.annexType == 2) {
+              this.applicantFile.push(item);
+            } else if (item.annexType == 6) {
+              this.resFile.push(item);
+            } else if (item.annexType == 3) {
+              this.mediateFile.push(item);
+            }
           }
         });
       });
@@ -480,6 +546,7 @@ export default {
     },
     async exitRoom() {
       // // 关闭识别
+      clearInterval(this.timer)
       Object.keys(this.asrList).forEach((key) => {
         this.asrList[key].stop();
       });
@@ -629,7 +696,7 @@ export default {
     mediationPop() {
       this.drawerMediatio = true;
       this.selectByIdFn(this.caseId);
-      setInterval(() => {
+      this.timer = setInterval(() => {
         this.selectByIdFn(this.caseId);
       }, 8000);
       this.selectRoleMenuByCaseIdFn(this.caseId);
@@ -637,11 +704,17 @@ export default {
     },
     // 确定会议结果
     determineMeeting() {
-      let valueMeeting = {
-        id: this.caseId,
-        mediaResult: this.formData.mediaResult,
-        sealFlag: this.formData.sealFlag,
-        caseFlowId: this.caseFlowId
+      let valueMeeting = {};
+      if (this.appType == "tiaojie") {
+        valueMeeting = {
+          id: this.caseId,
+          mediaResult: this.formData.mediaResult,
+          sealFlag: this.formData.sealFlag,
+          caseFlowId: this.caseFlowId
+        }
+      } else if (this.appType == "zhongcai") {
+        this.formData1.caseAppliId = this.caseId;
+        valueMeeting = this.formData1;
       }
       confirmMeetingResult(valueMeeting).then(res => {
         if (res.code == 200) {
@@ -685,7 +758,7 @@ export default {
           this.drawerSize = "75%"
         }
       }
-    }
+    },
   },
   async mounted() {
     if (this.userList.length == 1) {
@@ -712,7 +785,9 @@ export default {
     this.headers3.Authorization = "Bearer " + this.token;
     this.filedata.caseId = this.caseId;
     this.filedata1.caseId = this.caseId;
+    this.filedataz1.caseId = this.caseId;
     this.filedata3.caseId = this.caseId;
+    this.filedataz3.caseId = this.caseId;
     window.sessionStorage.setItem("token", this.token);
     window.sessionStorage.setItem("userId", this.id);
     this.secretaryRoleByUserIdFn(this.id, this.caseId);
@@ -781,6 +856,7 @@ export default {
     };
   },
   created() {
+    this.appType = sessionStorage.getItem('type');
     trtc = TRTC.create();
   },
 };

vue.config.js

@@ -29,7 +29,7 @@ module.exports = defineConfig({
           '^/zhongcai': '' // 将/api前缀重写为空字符串
         },
       },
-      '/zhongcaiz': {
+      '/zhongcaiprod': {
         target: 'https://api.xayunmei.com/zhongcaiapi', // 后端服务器地址
         changeOrigin: true, // 是否改变Origin头信息
         secure : false,