Merge branch 'main' into 'stg'

Main

See merge request cloud-mediate/mediate-manage-web!83

src/pages/case-management/index.vue

@@ -378,8 +378,7 @@ import { values } from "lodash";
                 //调解进度
                 MediateProgEnum:this.$util.getMediationprogress(),
                 //调解状态
-                MediateStatusEnum:[{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2},
+                MediateStatusEnum:this.$util.getMediationType(),
-                {label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}],
                 showSearch: true,
                 queryDate: '',
                 activeUsage: '',

src/pages/event-tracing/components/voideDialog.vue

@@ -89,7 +89,7 @@
               <template slot-scope="scope">
                 <div class="flex-row align-items-center" v-if="$util.getTimeContrast(scope.row.bookingEndTime)">
                   <!-- 只有进行中  快开始的时候才能进入视频间 -->
-                  <el-button size="mini" v-if="scope.row.status.code == 0 || scope.row.status.code == 1 " @click="handleDelete(scope.row)">进入视频间</el-button>
+                  <el-button size="mini" v-if="scope.row.status.code == 0 || scope.row.status.code == 1 " @click="handleGoToDetails(scope.row)">进入案件详情</el-button>
                   <el-button size="mini" v-if="scope.row.status.code == 0" @click="VideoDialog={id:scope.row.id, bookingTime:scope.row.bookingTime}">修改</el-button>
                   <el-button size="mini" v-if="scope.row.status.code == 0" @click="handleBackCase(scope.row)">取消</el-button>
                 </div>
@@ -197,7 +197,9 @@ export default {
         }
       })
     },
-    handleDelete() {},
+    handleGoToDetails(row) {
+      this.$router.push({path: '/mediation-page', query: {sourcePage: 'home', caseId: row.caseId}})
+    },
     handleBackCase(row) {
       this.$confirm("请确定是否取消?", "提示", {
         confirmButtonText: "确定",

src/pages/mediation-page/components/VideoInvitation.vue

@@ -82,6 +82,7 @@
                         <el-input
                             v-model="item.phone"
                             placeholder="请输入"
+                            maxlength="11"
                         ></el-input>
                       </el-form-item>
                     </el-col>

src/pages/mediation-page/components/VideoRoom.vue

@@ -6,7 +6,7 @@
         <div class="color-F53F3F" v-if="videoRecordingSts">{{ formattedTime }}</div>
       </div>
       <div class="flex-row">
-        <div v-if="remoteUsersViews.length == 1" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
+        <div v-if="remoteUsersViews.length == 0" class="room-top-btn background-color-fff flex-row align-items-center border-radius-4 cursor-pointer mr-8"
             @click="handleClose">
           <span class="mr-4">退出房间</span>
         </div>

src/pages/mediation-page/components/cassWrit.vue

@@ -49,6 +49,7 @@
                 <a class="case-status3" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 3">已签字</a>
                 <a class="result-status0" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 1">签字失败</a>
                 <a class="case-status3" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 3 && item.sealStatus != null && item.sealStatus.code == 2">已签章</a>
+                <a class="result-status0" v-if="item.documentStaus.code == 2 && item.signStatus != null && item.signStatus.code == 3 && item.sealStatus != null && item.sealStatus.code == 3">签章失败</a>
             </span>
           </a>
           <!-- sealStatus 签章状态

src/utils/util.js

@@ -434,7 +434,8 @@ const util = {
      */
     getMediationType() {
         return [{label:'未触达',value:0},{label:'调解中',value:1},{label:'已达成方案',value:2},
-            {label:'已签署协议',value:3},{label:'调解失败',value:4},{label:'调解成功',value:5}]
+            {label:'已签署协议',value:3},{label:'协议已签章',value:4},{label:'调解成功',value:5},
+            {label:'调解失败',value:6}]
     },
     /**
      * 根据不同的类型返回不同的调解状态 this.$util.getMediationprogressData
@@ -449,9 +450,10 @@ const util = {
             case 0:
                 // 预警
                 return {key:2,label:this.getMediationType().find(item => item.value == value).label};
-            case 4:
+            case 6:
                 // 高预警
                 return {key:1,label:this.getMediationType().find(item => item.value == value).label};  
+            case 4:
             case 5:
                 // 成功
                 return {key:3,label:this.getMediationType().find(item => item.value == value).label};