Merge branch 'main' into 'stg'

Main

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

src/assets/style/common.scss

@@ -758,6 +758,10 @@ html{
 }
 
 //=================== start::提示框置顶 ===============================
+.el-message {
+    top: 100px !important;
+  }
+  
 .el-message.el-message--warning{z-index: 9999 !important;}
 .el-message.el-message--error,.el-message.el-message--error.is-closable{z-index: 9999 !important;}
 .el-message.el-message--warning,.is-closable{z-index: 9999 !important;}

src/pages/case-management/detail/index.vue

@@ -118,11 +118,18 @@
                   <!-- <el-table-column prop="E" label="预约回款情况" show-overflow-tooltip></el-table-column> -->
                   <el-table-column prop="mediator" label="添加人" show-overflow-tooltip></el-table-column>
                   <el-table-column prop="createAt" label="添加时间" show-overflow-tooltip></el-table-column>
-                  <el-table-column label="操作" width="200">
+                  <el-table-column label="操作" width="240">
                     <template slot-scope="scope">
                       <div class="flex-row align-items-center">
                         <div class="text-center cursor-pointer" v-for="(item,index) in scope.row.files" :key="index" @click="handleCaseShowFile(item)">
-                          查看文件 {{index > 0 ? index : ''}}
+                          
+                          <i v-if="$util.getFileType(item) != 'image' " class="f14 el-icon-video-play"></i> 
+                         
+                          <span class="mr-4">
+                            {{ $util.getFileType(item) === 'video' ? '播放录像':''}} 
+                            {{ $util.getFileType(item) === 'audio' ? '播放录音':''}}
+                            {{ $util.getFileType(item) === 'image' ? '查看文件':''}}
+                          </span>
                         </div>
                       </div>
                     </template>
@@ -615,9 +622,6 @@ export default {
       cmapi.getCaseFileList({caseId:this.caseId}).then(res => {
         if (!res.code) {
           this.fileList = res.records
-          
-          _that.fileList = res.caseFileEntityList
-
         }
       })
     },

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

@@ -71,15 +71,14 @@
                             </template>
                         </el-table-column>
                         <el-table-column prop="signatureFileCount" label="签字文书数" show-overflow-tooltip ></el-table-column>
-                        <el-table-column label="签字截止时间" show-overflow-tooltip >
+                        <el-table-column label="签字发起时间" show-overflow-tooltip >
                             <template slot-scope="scope">
-                                <span >{{ scope.row.deadline | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>
+                                <span >{{ scope.row.updateAt | formaDate("yyyy-MM-dd") }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column label="签字状态" show-overflow-tooltip>
                             <template slot-scope="scope">
-                                <span v-if="$util.getTimeContrast(scope.row.deadline)">{{ scope.row.status.desc }}</span>
-                                <span v-else>已过期</span>
+                                <span>{{ scope.row.status.desc }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="failureReason" label="失败原因" show-overflow-tooltip ></el-table-column>

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

@@ -33,6 +33,7 @@
 <script>
 import api from "@/services/caseManagement";
 import smapi from "@/services/systemManage";
+import { number } from "echarts";
     export default {
         components: {
         },
@@ -42,7 +43,7 @@ import smapi from "@/services/systemManage";
                 default: () => {},
             },
             assistMediatorId: {
-                type: String,
+                type: number,
                 default: () => {},
             },
             baseInfo: {
@@ -55,7 +56,7 @@ import smapi from "@/services/systemManage";
                 userInfo:this.$store.state.userinfo,
                 operateMethodOptions:[],
                 ObjectInfo:{
-                    assistMediatorId: '',
+                    assistMediatorId: null,
                     id:'',
                 },
                 rulesClient: {