预约管理列表显示优化调整

pages/index/index.wxml

@@ -58,6 +58,7 @@
               <navigator url="info?id={{item.id}}&name={{item.name}}&account={{item.account}}&index={{index}}" class="listItem">
                 <view class="title van-ellipsis">
                   <van-icon class='iconfont' name='/images/licensePlate.png' size="36rpx"></van-icon><text>{{item.licenseNumber}}</text><!--<text class="queueNumber">排队号：{{item.queueNumber}}</text>-->
+                  <text wx:if="{{item.appointmentType}}" class="status orderStatus{{item.appointmentType}}" style="float:none;font-size: 20rpx;padding: 0 5rpx;">{{ filters.codeAnalysis(appointmentTypeArray,item.appointmentType, 'dictValue', 'dictLabel') }}</text>
                   <text wx:if="{{item.status}}" class="status status{{item.status}}">{{item.statusName}}</text>
                 </view>
                 <view class="info" wx:if="{{ item.appointmentType =='1' }}">
@@ -70,20 +71,20 @@
                   <text>计划单号：{{item.planNumber?item.planNumber:'未填写'}}</text>
                 </view>
                 <view class="info" wx:if="{{ item.appointmentType =='5' }}">
-                  <text>开始时间：{{item.beginTime?item.beginTime:'未填写'}}</text>
+                  <text>开始时间：{{item.planBeginTime?item.planBeginTime:'未填写'}}</text>
                 </view>
                 <view class="info" wx:if="{{ item.appointmentType =='5' }}">
-                  <text>结束时间：{{item.endTime?item.endTime:'未填写'}}</text>
+                  <text>结束时间：{{item.planEndTime?item.planEndTime:'未填写'}}</text>
                 </view>
                 <view class="info">
                   <text decode="{{true}}">司{{str+str}}机：{{item.driverName?item.driverName:'未填写'}} {{item.driverMobile?item.driverMobile:'司机电话'}}</text>
                 </view>
-                <view class="time" wx:if="{{ item.appointmentType =='1' }}">
+                <view class="info" wx:if="{{ item.appointmentType =='1' }}">
                   <text>提货时间：{{item.beginTime?filters.tosubStr(item.beginTime,0,16):'提货开始时间'}} 至 {{item.endTime?filters.tosubStr(item.endTime,0,16):'提货结束时间'}}</text>
                 </view>
-                <view class="time">
+                <!-- <view class="info">
                   <text>预约类型：{{ filters.codeAnalysis(appointmentTypeArray,item.appointmentType, 'dictValue', 'dictLabel') }}</text>
-                </view>
+                </view> -->
 
                 <view class="bottomBtn" wx:if="{{ item.status == '2' || item.status == '4' || item.status == '8' || (item.status == '10' && item.orderType == '1') || (roleCodeList=='driver' && item.appointmentType == '4' && item.status == '5') || (roleCodeList=='driver' && (item.status == '5' || item.status == '6') && item.orderType == '1') }}">
                   <van-button type="primary" size="small" data-id="{{item.id}}" data-license-number="{{item.licenseNumber}}" catchtap="showQrcodePopup" wx:if="{{ item.appointmentType == '1' || item.appointmentType == '3' || (item.appointmentType == '6' && item.isWeigh == '1') }}" style="margin-right: 20rpx;">二维码</van-button>

pages/reservationMan/index.wxml

@@ -62,6 +62,7 @@
               
               <view class="title van-ellipsis">
                 <van-icon class='iconfont' name='/images/licensePlate.png' size="36rpx"></van-icon><text>{{item.licenseNumber}}</text><!--<text class="queueNumber">排队号：{{item.queueNumber}}</text>-->
+                <text wx:if="{{item.appointmentType}}" class="status orderStatus{{item.appointmentType}}" style="float:none;font-size: 20rpx;padding: 0 5rpx;">{{ filters.codeAnalysis(appointmentTypeArray,item.appointmentType, 'dictValue', 'dictLabel') }}</text>
                 <text wx:if="{{item.status}}" class="status status{{item.status}}">{{item.statusName}}</text>
               </view>
               <view class="info" wx:if="{{ item.appointmentType =='1' }}">
@@ -74,20 +75,20 @@
                 <text>计划单号：{{item.planNumber?item.planNumber:'未填写'}}</text>
               </view>
               <view class="info" wx:if="{{ item.appointmentType =='5' }}">
-                <text>开始时间：{{item.beginTime?item.beginTime:'未填写'}}</text>
+                <text>开始时间：{{item.planBeginTime?item.planBeginTime:'未填写'}}</text>
               </view>
               <view class="info" wx:if="{{ item.appointmentType =='5' }}">
-                <text>结束时间：{{item.endTime?item.endTime:'未填写'}}</text>
+                <text>结束时间：{{item.planEndTime?item.planEndTime:'未填写'}}</text>
               </view>
               <view class="info">
                 <text decode="{{true}}">司{{str+str}}机：{{item.driverName?item.driverName:'未填写'}} {{item.driverMobile?item.driverMobile:'司机电话'}}</text>
               </view>
-              <view class="time" wx:if="{{ item.appointmentType =='1' }}">
+              <view class="info" wx:if="{{ item.appointmentType =='1' }}">
                 <text>提货时间：{{item.beginTime?filters.tosubStr(item.beginTime,0,16):'提货开始时间'}} 至 {{item.endTime?filters.tosubStr(item.endTime,0,16):'提货结束时间'}}</text>
               </view>
-              <view class="time">
+              <!-- <view class="time">
                 <text>预约类型：{{ filters.codeAnalysis(appointmentTypeArray, item.appointmentType, 'dictValue', 'dictLabel') }}</text>
-              </view>
+              </view> -->
               
               <view class="bottomBtn" wx:if="{{ item.status == '1' || item.status == '4'|| item.status == '5' || item.status == '6' || item.status == '7' || item.status == '8' || (item.appointmentType == '6' && (item.status == '2' || item.status == '4')) || (item.status == '5' && item.appointmentType == '5') || (item.status == '5' && item.appointmentType == '6' && item.isWeigh == '1') || (item.appointmentType == '6'  && (item.status=='5' || item.status=='6' || item.status=='7' || item.status=='8' || item.status=='9' || item.status=='16' || item.status=='17')) || (item.appointmentType != '6'  && (item.status == '5' || item.status == '6' || item.status == '7' || item.status == '8')) }} ">
                 <van-button type="info" size="small" data-id="{{item.id}}" data-index="{{ index }}" catchtap="toUpdate" wx:if="{{ item.appointmentType == '6' && (item.status == '2' || item.status == '4') }}" style="margin-right: 20rpx;">修改</van-button>

pages/reservationMan/info.js

@@ -58,6 +58,11 @@ Page({
       info:getInfo,
       fileList:fileList
     })
+    // 预约类型
+    if(getInfo.appointmentType == '5'){
+      // 管桩预约
+      this.getPipeplanData(getInfo.orderId)
+    }
   },
 
   //查询详情
@@ -79,6 +84,26 @@ Page({
     })
   },
 
+  // 管桩计划详情
+  getPipeplanData: function (id) {
+    app.request.GET({
+      url: app.API.bizpipeplanDetail,
+      params: {'id' : id},
+      page: this,
+      successFun: true
+    }).then(res => {
+      let getInfo = res.data.data;
+      this.setData({
+        planNumber      : getInfo.planNumber,
+        planName        : getInfo.planName,
+        planCount       : getInfo.planCount,
+        planAlreadyCount: getInfo.planAlreadyCount,
+        beginTime       : getInfo.beginTime,
+        endTime         : getInfo.endTime,
+      })
+    })
+  },
+
   /**
    * 生命周期函数--监听页面初次渲染完成
    */