bug调整

subpages/safetyinspection/pages/safetyinspection/safetyinspection.js

@@ -351,14 +351,7 @@ handelClickSave(){
     }
  
   });
-  // let checkbox = this.data.checkboxOptions.map(item => {
+ 
-  //   // item.hazardStatus = 0;
-  //   // return item;
-  //   if (item.hazardStatus = 0) {
-  //     return
-  //   }
-  // });
-  // console.log(checkbox)
 if(this.data.checkResultFlag == 0 && !hasHazardStatus1 && this.data.addHiddenDangeList.length<1){
   console.log("1111",hasHazardStatus1)
     wx.showToast({

subpages/securityCheck/pages/securityCheck.js

@@ -20,7 +20,6 @@ Page({
 
   },
     onLoad(options) {
-      this.getList()
 
     },
     handleTap() {
@@ -32,7 +31,6 @@ Page({
 
     
 onScrollToLower(e){
-  console.log('gundaodi')
   if (this.data.loadMoreType === 'more') {
       this.setData({
         loadMoreVisible: true,
@@ -41,47 +39,60 @@ onScrollToLower(e){
       this.getList()
     }
 },
-    getList() {
+getList() {
+  this.setData({
+    loadMoreVisible: true,
+    nodata: false,
+    loadMoreType: "more",
+  });
+
+  securityCheckk({
+    pageNo: this.data.pageNo,
+    pageSize: this.data.pageSize,
+    checkResultFlag: this.data.checkResultFlag
+  }).then(({ data }) => {
+    data.list.forEach(item => {
+      if (item.hiddenDangeList) {
+        if (item.hiddenDangeList.findIndex(itemC => itemC.hazardStatus === 2) === -1) {
+          item.status = true;
+          item.hiddenDangeList0 = item.hiddenDangeList.filter(itemC => itemC.hazardStatus === 0);
+          item.hiddenDangeList1 = item.hiddenDangeList.filter(itemC => itemC.hazardStatus === 1);
+        } else {
+          item.status = false;
+          item.hiddenDangeList0 = item.hiddenDangeList.filter(itemC => itemC.hazardStatus === 0);
+          item.hiddenDangeList2 = item.hiddenDangeList.filter(itemC => itemC.hazardStatus === 2);
+        }
+      }
+    });
+    console.log(data.list);
+   
+
+    if (this.data.flag0Array.length === 0) {
       this.setData({
-        loadMoreVisible: true,
+        loadMoreVisible: false,
-        nodata: false,
+        nodata: true
-        loadMoreType: "more",
+      });
-      })
+    }
-      securityCheckk({
+    if (this.data.flag1Array.length === 0) {
-          pageNo: this.data.pageNo,
+      this.setData({
-          pageSize: this.data.pageSize,
+        loadMoreVisible: false,
-          checkResultFlag:this.data.checkResultFlag
+        nodata: true
-      }).then(({data}) => {
+      });
-          // this.setData({
+    }
-          //   marsi: data.list,
+    this.setData({
-          //   total: data.total
+      loadMoreType: data.list.length === this.data.pageSize ? 'more' : 'none',
-          // })
+      flag0Array: this.data.flag0Array.concat(data.list.filter(item => item.checkResultFlag === 0 || item.checkResultFlag == null)),
-        //   this.memem();
+      flag1Array: this.data.flag1Array.concat(data.list.filter(item => item.checkResultFlag === 1)),
-        this.setData({
+    });
-          loadMoreType: data.list.length === this.data.pageSize ? 'more' : 'none',
+  }).catch(err => {
-          flag0Array: this.data.flag0Array.concat(data.list).filter(item => item.checkResultFlag === 0 || item.checkResultFlag == null),
+    console.log(err);
-          flag1Array: this.data.flag1Array.concat(data.list).filter(item => item.checkResultFlag === 1)
+    this.setData({
-        })
+      loadMoreVisible: false,
-        if (this.data.flag0Array.length == 0) {
+      nodata: true,
-              this.setData({
+    });
-                loadMoreVisible: false,
+  });
-                nodata: true
+},
-              })
+
-            }
-            if (this.data.flag1Array.length == 0) {
-              this.setData({
-                loadMoreVisible: false,
-                nodata: true
-              })
-            }
-      }).catch(err=>{
-        console.log(err);
-        this.setData({
-            loadMoreVisible: false,
-            nodata: true,
-          })
-    })
-  },
     memem() {
       this.setData({
         flag0Array: this.data.marsi.filter(item => item.checkResultFlag === 0 || item.checkResultFlag == null),
@@ -132,6 +143,10 @@ onScrollToLower(e){
      * 生命周期函数--监听页面显示
      */
     onShow() {
+      this.setData({
+        flag0Array:[],
+        flag1Array:[]
+      })
       this.getList()
     },
     

subpages/securityCheck/pages/securityCheck.wxml

@@ -17,9 +17,21 @@
         <view class="title">{{item.name}}</view>
         <view class="title_mall">检查时间: {{item.orderDate}}</view>
         <view  class="title_mall">检查人员:  {{item.checkPersons}}</view>
-        <view class="title_mall">隐患明细:</view>
+        <view class="title_mall">{{item.status?'未整改隐患':'隐患明细'}}：
-            <view class="title_mall" wx:for="{{item.hiddenDangeList}}" wx:key="index">{{item.hazardDesc}}</view>
+          <text  wx:for="{{item.hiddenDangeList0}}" wx:key="index">{{index+1}}.{{item.hazardDesc}}</text>
-            <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
+        </view>
+        <view wx:if="{{!item.status}}">
+                <view class="title_mall"   wx:for="{{item.hiddenDangeList2}}" wx:key="index">
+                 整改要求：{{item.hazardDesc}}
+                </view>
+        </view>
+        <view wx:if="{{item.status && item.hiddenDangeList1.length != 0}}">
+          <view class="title_mall"  >
+           已整改隐患：<text wx:for="{{item.hiddenDangeList1}}" wx:key="indexC" wx:for-index='indexC'>{{indexC+1}}.{{item.hazardDesc}} </text>
+        </view>
+        </view>
+        <text wx:else class="title_mall">已整改隐患：--</text>
+        <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
         </view>
     </view>
     <movable-area class="movable-area">
@@ -36,9 +48,9 @@
         <view class="title">{{item.name}}</view>
         <view class="title_mall">检查时间: {{item.orderDate}}</view>
         <view  class="title_mall">检查人员:  {{item.checkPersons}}</view>
-        <view class="title_mall">隐患明细:</view>
+        <view  class="title_mall">检查结论:  合格</view>
-            <view class="title_mall" wx:for="{{item.hiddenDangeList}}" wx:key="index">{{item.hazardDesc}}</view>
+       
-            <view class="title_mall">拟复查时间: {{item.reviewTime}}</view>
+            <view class="title_mall">合格时间: {{item.reviewTime}}</view>
         </view>
     </view>
       <movable-area class="movable-area">