bug修复

解润东
20220517

src/views/danger/dangerPatrol/recordPatrol/index.vue

@@ -37,7 +37,7 @@
                      <van-col span="10">
                         <span class="record-time">{{util.timestampToTime(item.endTime,'DT2',true)}}</span>
                     </van-col>
-                    <van-col span="4" class="cont-end record-status"><span v-if="item.result==null">{{item.status|status}}</span><span v-else class="record-status2">已取消</span></van-col>
+                    <van-col span="4" class="cont-end record-status"><span v-if="item.result!=true">{{item.status|status}}</span><span v-else class="record-status2">已取消</span></van-col>
                 </van-row>
                 <!-- <van-row gutte>
                     <van-col span="12">开始时间: 09:30</van-col>
@@ -52,11 +52,11 @@
                 </van-row>
                 <van-row gutter>
                     <van-col span="24" v-if="item.result==null">上报隐患: {{item.hdReportCount?item.hdReportCount:0}}</van-col>
-                    <van-col span="24" v-else>审批结果: {{item.result}}</van-col>
+                   <van-col span="24" v-else>申请原因: {{item.approveContent?item.approveContent:''}}</van-col>
                 </van-row>
                 <van-row gutter>
                     <van-col span="24" v-if="item.result==null">确认隐患: {{item.hdConfirmCount?item.hdConfirmCount:0}}</van-col>
-                     <van-col span="24" v-else>审批内容: {{item.approveContent?item.approveContent:''}}</van-col>
+                      <van-col span="24" v-else>申请结果: {{item.result==true?'同意':'不同意'}}</van-col>
                 </van-row>
                 <!-- 长按显示遮罩层 -->
                 <!-- :show="showIndex == index" -->
@@ -222,6 +222,7 @@ export default {
             })
         },
         onSearch(val) {
+            this.page=1
             this.loading()
         },
         touchstart(item) {