Merge branch 'main' into 'stg'

修改bug

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

src/pages/event-tracing/dtraceDetail/officeWDialogDetail.vue

@@ -57,6 +57,11 @@
                     <el-table-column prop="signed" label="已签字当事人" show-overflow-tooltip ></el-table-column>
                     <el-table-column prop="unsign" label="未签字当事人" show-overflow-tooltip ></el-table-column>
                     <el-table-column prop="updateByName" label="发起人" show-overflow-tooltip ></el-table-column>
+                    <el-table-column label="状态" show-overflow-tooltip >
+                        <template slot-scope="scope">
+                            <span >{{ scope.row.signStatus.desc }}</span>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="操作时间" show-overflow-tooltip >
                         <template slot-scope="scope">
                             <span >{{ scope.row.updateAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</span>

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

@@ -161,7 +161,6 @@
         <el-scrollbar :style="'height:'+`${contentHeight}`+'px'">
 
           <el-card shadow="never" class="mt-8" v-for="(item, index) in WritRecord" :key="index">
-            <!-- <div class="f-weight600 pb-6">(2022)川092701民诉02号</div> -->
             <div class="pb-6 color-86909C f12">{{ item.createAt | formaDate("yyyy-MM-dd hh:mm:ss") }}</div>
             <div class="mb-8 flex-row align-items-center border-radius-4 agreement-pdf">
               <a class="case-img"><img :src="imgPdf"/></a>

src/utils/util.js

@@ -378,6 +378,13 @@ const util = {
         return timedate > new Date()
     },
 
+    // 和当前时间对比，判断是否小于当前时间
+    getTimeContrastLess(timeString) {
+        const timedate = moment(timeString);
+        console.log(timedate > new Date(),'timedate > new Date()')
+        return timedate < new Date()
+    },
+
     // {{scope.row.linkedSituation == 2 ?'':''}}
     // {{scope.row.linkedSituation == 3 ?'':''}}
     // {{scope.row.linkedSituation == 4 ?'':''}}