Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

13 小时以前 5841a771d4455d25adb185b8a0637c9ba498aab2

 pda/pages/index/queueup.vue

@@ -17,6 +17,7 @@
          type="text"
          placeholder="搜索车辆牌照"
          placeholder-class="placeholder9"
               confirm-type="search"
          @confirm="handleQuery"
        />
      </view>
@@ -26,7 +27,7 @@
    </view>
    <!--  -->
    <view class="dataList">
      <view class="item" v-for="item in platformLineUpList" :key="item.id">
      <view class="item" v-for="item,i in platformLineUpList" :key="i">
        <view class="head">
          <view v-if="item.carCodeFront" class="code">
            <text>{{ item.carCodeFront.slice(0, 1) }}</text>
@@ -34,9 +35,10 @@
            <text>·</text>
            <text>{{ item.carCodeFront.slice(2) }}</text>
          </view>
          <view class="status" v-if="item.signDate"
            >签到时间：{{ item.signDate.slice(11, 16) }}</view
          >
          <!-- <view class="status green" v-if="item.status == 2">月台等待</view > -->
          <view class="status green" v-if="item.status == 2">等待叫号</view >
          <view class="status" v-if="item.status == 3">入园等待</view >
          <view class="status" v-if="item.status == 7">转移中</view >
        </view>
        <view class="line" v-if="item.billCode">
          <text class="label">运输单号</text>
@@ -48,6 +50,10 @@
          <text class="value">{{ item.contractNum }}</text>
               <text class="primaryColor" @click="subDetail(item)">预约详情</text>
        </view>
            <view class="line line2" v-if="item.billCode && item.wmsContractNum">
               <text class="label">合同单号</text>
               <text class="value">{{ item.wmsContractNum }}</text>
            </view>
        <view class="line">
          <text class="label">驾驶员</text>
          <text class="value"
@@ -56,12 +62,16 @@
        </view>
        <view class="line">
          <text class="label">总运输量</text>
          <text class="value">{{ item.totalNum }}万支</text>
          <text class="value">{{ item.totalNum || item.ioQty }}万支</text>
        </view>
        <view class="line" v-if="item.carrierName">
          <text class="label">运输公司</text>
          <text class="value">{{ item.carrierName }}</text>
        </view>
            <view class="line">
              <text class="label primaryColor">签到时间</text>
              <text class="value primaryColor" v-if="item.signDate">{{ item.signDate.slice(5, 16) }}</text>
            </view>
        <!-- <view class="btns">
          <view class="btn active">入园</view>
        </view> -->
@@ -100,7 +110,7 @@
                  <view class="value">{{ wmsInfo.carrierName }}</view>
               </view>
            </view>
            <view class="separate"></view>
            <!-- <view class="separate"></view> -->
            <view class="contract_wrap">
               <view class="contract_list" v-for="item in wmsInfo.wmsJobContractVOList">
                  <view class="title">合同号：{{ item.contractCode }}</view>
@@ -154,7 +164,13 @@
  },
   onReachBottom() {
      if(this.total > this.platformLineUpList.length){
         this.page ++
         this.getList()
      }else{
         uni.showToast({
            title:'暂无更多数据',
            icon: 'none'
         })
      }
   },
  methods: {
@@ -188,6 +204,11 @@
      }).then(res => {
        if (res.data) {
          this.platformLineUpList = [...this.platformLineUpList, ...res.data.records || []]
               this.platformLineUpList.forEach(item => {
                  if(item.wmsContractNum){
                     item.wmsContractNum = item.wmsContractNum.split(',').join('，')
                  }
               })
          this.total = res.data.total || 0
        }
      })
@@ -292,12 +313,16 @@
          font-size: 30rpx;
          color: $uni-color-primary;
        }
            .green{
               color: #00BA67;
            }
      }
      .line {
        display: flex;
        margin-bottom: 20rpx;
        .label {
          width: 144rpx;
               flex-shrink: 0;
          color: #666666;
        }
        .value {
@@ -451,4 +476,8 @@
         }
      }
   }
   .line2{
      margin-right: -30rpx;
      padding-right: 0;
   }
</style>