update

pages/examine/index.vue

@@ -203,22 +203,22 @@
                       <view class="tab">
                         <view :class="popupTabSelect===item.value?'tabItem selectTabItem':'tabItem'" v-for="(item,index) in popupTab" :key="index" @click="handleChangePopupTab(item.value)">{{item.label}}</view>
                       </view>
-                      <view class="assessmentTable">
+                      <view class="assessmentTable" v-if="popupServiceShowList.DetailList && popupServiceShowList.DetailList.length>0">
                         <view class="bigBox" v-for="(item,index) in popupServiceShowList.DetailList" :key="index" >
-                          <view class="assessmentItem" @click="handleNoShow(item)">
+                          <view class="assessmentItem" @click="handleNoShow(item)" :style="{borderBottomWidth:!item.showChild?'0px':'1px'}">
                             <view class="left">{{item.PATROL_POSITION}}</view>
                             <view class="right">
                               <image :style="{transform:item.showChild?'':'rotate(-90deg)'}" class="more" src="https://eshangtech.com/ShopICO/ahyd-BID/newCommercial/arrow_bottom.svg"/>
                             </view>
                           </view>
                           <view v-if="item.showChild">
-                            <view class="smallItem" v-for="(subItem,subIndex) in item.PositionDetailList" :key="subIndex" :style="{borderBottomWidth:subIndex===item.PositionDetailList.length-1?'0px':'2px'}"  @click="handleShowImgDetail(subItem)">
+                            <view class="smallItem" v-for="(subItem,subIndex) in item.PositionDetailList" :key="subIndex" :style="{borderBottomWidth:subIndex===item.PositionDetailList.length-1 ?'0px':'2px'}"  @click="handleShowImgDetail(subItem)">
                               <view class="top">
                                 <view class="time">{{subItem.PATROL_DATE.split(' ')[1]}}</view>
                                 <view class="label">检查人: <span class="name">{{subItem.PATROL_PERSON}}</span></view>
                               </view>
                               <view class="itemBox" v-if="subItem.PATROL_SITUATION" @click="changeDetail(subItem)">
-                                <view class="detailItem" >
+                                <view class="detailItem">
                                   <view class="detailValue">
                                     <view class="detailText">{{ subItem.PATROL_SITUATION || "-"}}</view>
                                   </view>
@@ -253,6 +253,26 @@
                           </view>
                         </view>
                       </view>
+                      <view class="list" v-else>
+                        <view class="item" v-for="(item,index) in popupServiceShowList.SERVERPARTList" :key="index">
+                          <view class="person">
+                            <p class="value">{{item.PATROL_PERSON}}</p>
+                            <p class="label">检查人</p>
+                          </view>
+                          <view class="person">
+                            <p class="value">{{item.PATROL_DATE}}</p>
+                            <p class="label">检查日期</p>
+                          </view>
+                          <view class="person">
+                            <p class="value">{{item.PATROL_ROUTE}}</p>
+                            <p class="label">路线</p>
+                          </view>
+                          <view class="person">
+                            <image v-if="item.PATROL_IMG && item.PATROL_IMG.length>0" class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/haveImg.svg"></image>
+                            <p v-if="item.PATROL_IMG && item.PATROL_IMG.length>0" class="label">图片</p>
+                          </view>
+                        </view>
+                      </view>
                     </view>
                     <view class="meetList" v-if="popupShow===3">
                         <view class="message" style="margin-bottom: 8px">
@@ -425,6 +445,8 @@ export default {
               item.DetailList.forEach(subItem=>{
                 subItem.showChild = true
               })
+              // 反转给的考核列表 让时间从小到大
+              item.DetailList.reverse()
             })
             // 页面上展示的数组
             this.popupServiceShowList = this.popupServiceList[0]
@@ -476,9 +498,10 @@ export default {
         previewImage(event,subItem){
             console.log('event',event)
             console.log('subItem',subItem)
+          // 预览图片的方法
             wx.previewImage({
                 current: event.currentTarget.dataset.src, // 当前显示图片的http链接
-                urls: subItem.imgList // 需要预览的图片http链接列表
+                urls: subItem.imgList // 需要预览的图片http链接列表 数组形式
             })
         },
         // 整改的预览图片
@@ -552,7 +575,8 @@ export default {
             this.getMeetingDetail()
           }
         },
-        // 点击选项卡改变选项卡
+        // 点击选项卡改变选择的种类
+        // 根据点击的 去请求这个种类下面的列表
         handleChangeTab(value){
           this.selectTab = value
           uni.showLoading({
@@ -598,6 +622,9 @@ export default {
               duration:3000
             })
           }else{
+            uni.showLoading({
+              title: '正在加载...'
+            })
             this.selectDate = value
             // 切换日期日常巡检列表 选项卡为2的时候调用
             if (this.selectTab===2){
@@ -626,7 +653,6 @@ export default {
         },
         // 片区列表
         async getAreaList(){
-
           const total = await request.$webGet(`CommercialApi/BaseInfo/GetSPRegionList`,{Province_Code:Store.state.userData.ProvinceCode})
           uni.hideLoading()
           if (total.Result_Code===100){
@@ -639,7 +665,7 @@ export default {
             this.selectAreaValue = this.areaList[0].value
             this.selectAreaName = this.areaList[0].label
             // 只能先拿到 selectAreaValue 再去请求列表
-            // 获得考核管理列表
+            // 获得考核管理列表 第一次进度肯定是考核管理
             this.getManagerList()
           }
         },
@@ -667,6 +693,9 @@ export default {
         },
         // 考核管理列表
         async getManagerList(){
+          uni.showLoading({
+            title: '正在加载...'
+          })
           const date = new Date(this.searchTime)
           let y = date.getFullYear()
           let m = date.getMonth() + 1
@@ -1424,7 +1453,7 @@ export default {
                 .itemBox{
                   width: 100%;
                   display: flex;
-                  align-items: center;
+                  align-items: flex-end;
                   .detailItem{
                       width: 100%;
                       .detailValue{