Merge remote-tracking branch 'origin/master'

rk

2025-09-24 f3c59a17062fb0a89b5f89b7845341386952a6b1

 h5/pages/waybill/list.vue

@@ -1,5 +1,9 @@
<template>

   <view class="main_app">

   <view class="main_app">
      <view class="title_wrap">
         <view class="name">{{ waybillInfo.realname || waybillInfo.username || waybillInfo.mobile }}，欢迎登录～</view>
         <view class="btn" @click="loginOut">账号解绑</view>
      </view>

      <view class="head_wrap" @click="openModal">

         <view class="search_box">

            <image src="@/static/ic_search@2x.png" class="search" mode=""></image>

@@ -9,14 +13,16 @@
            <image src="@/static/ic_shaixuan@2x.png" mode=""></image>

            <text>筛选</text>

         </view>

      </view>

      </view>
      <view @click="diaodu" class="head_title">分中心调度联系方式</view>

      <!--  -->

      <scroll-view scroll-y="true" class="scroll_Y" @scrolltolower="scrolltolower">

         <view class="main_list">

            <view class="item" v-for="item,index in list" :key="index">

               <view class="head">

               <view class="head"

               :style="{ backgroundColor: item.orderStatus === 9 ? 'linear-gradient(270deg, #FEFEFF 0%, #FEE1E1 100%)' : 'linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%)' }">

                  <view class="code">{{item.contractNumber}}</view>

                  <view class="status">{{item.orderStatusDesc }}</view>

                  <view :class="item.orderStatus === 9 ? 'error' : 'status'">{{item.orderStatusDesc }}</view>

               </view>

               <view class="content">

                  <view class="line">

@@ -97,9 +103,9 @@
         </view>

      </u-popup>

      <!--  -->

      <u-datetime-picker :show="showStarttime" v-model="form.starttime" mode="date" @confirm="confirmStart"

      <u-datetime-picker :show="showStarttime" v-model="defaultDate" mode="date" @confirm="confirmStart"

         @cancel="showStarttime = false"></u-datetime-picker>

      <u-datetime-picker :show="showEndtime" v-model="form.endtime" mode="date" @confirm="confirmEnd"

      <u-datetime-picker :show="showEndtime" v-model="defaultDate2" mode="date" :minDate="defaultDate" @confirm="confirmEnd"

         @cancel="showEndtime = false"></u-datetime-picker>

      <u-picker :show="showPri" :columns="provinceList" @cancel="showPri = false" @confirm="confirmPro"></u-picker>



@@ -108,7 +114,8 @@


<script>

   import {

      orderListTms

      orderListTms,
      logoutPost

   } from '@/api'

   import dayjs from 'dayjs';

   export default {

@@ -118,35 +125,51 @@
            list: [],

            page: 1,

            total: 0,



				
            waybillInfo: uni.getStorageSync('waybillInfo'),

            showModal: false,

            showStarttime: false,

            showEndtime: false,

            showEndtime: false,
            defaultDate: Number(new Date()),
            defaultDate2: Number(new Date()),

            showPri: false,

            form: {},

            provinceList: [

               [

                  '安徽省', '江苏省', '浙江省', '河北省', '山西省', '北京', '天津', '上海', '重庆', '辽宁省', '吉林省', '黑龙江省', '福建省', '江西省', '山东省',

                  '河南省', '湖北省', '湖南省', '广东省', '海南省', '四川省', '贵州省', '云南省', '陕西省', '甘肃省', '青海省', '台湾省', '内蒙古自治区', '广西壮族自治区',

                  '安徽', '江苏', '浙江', '河北', '山西', '北京', '天津', '上海', '重庆', '辽宁', '吉林', '黑龙江', '福建', '江西', '山东',

                  '河南', '湖北', '湖南', '广东', '海南', '四川', '贵州', '云南', '陕西', '甘肃', '青海', '台湾', '内蒙古自治区', '广西壮族自治区',

                  '西藏自治区', '宁夏回族自治区', '新疆维吾尔自治区'

               ]

            ]

         };

      },

      onLoad(options) {

         this.$set(this.param, 'phoneNumber', options.phone)

         this.getList()

      },

      methods: {
         clear() {
            this.param = {
               phoneNumber: this.param.phoneNumber
            }
            this.param = {}
            this.form = {}
            this.page = 1
            this.list = []
            this.showModal = false
            this.getList()
         },
         diaodu() {
            uni.navigateTo({
               url: '/pages/staff/signin'
            })
         },
         loginOut() {
            let app_url = 'https://atwl.ahzyssl.com/zhyq_h5/#/pages/waybill/home'
            logoutPost({
               isH5: 1
            }).then(res => {
               this.$store.commit('empty')
               setTimeout(() => {
                  window.location.href = app_url
               }, 300)
            })
         },

         modalSub() {

            this.handleQuery()

@@ -165,7 +188,9 @@
         confirmStart(e) {

            this.$nextTick(() => {

               this.$set(this.form, 'ncCreateDateTimeStart', dayjs(e.value).format('YYYY-MM-DD'))

            })

            })
            this.defaultDate2 = Number(new Date())
            this.$set(this.form, 'ncCreateDateTimeEnd', '')

            this.showStarttime = false

         },

         confirmEnd(e) {

@@ -202,18 +227,13 @@
               form,

               page

            } = this

            // if (form.contract) {

            //    form.contractNumber = form.contract

            // } else {

            //    form.contractNumber = null

            // }

            orderListTms({

               parameters: {

                  ...param,

                  ...form

               },

               pager: {

                  rows: 10,

                  rows: 16,

                  page

               }

            }).then(res => {

@@ -230,8 +250,39 @@
<style lang="scss">

   page {

      background: #F7F7F7;

   }
   .title_wrap {
      display: flex;
      justify-content: space-between;
      // align-items: center;
      background-color: #fff;
      width: 750rpx;
      height: 90rpx;
      margin: -10rpx -30rpx 0;
      padding: 24rpx 30rpx 0;
      .name {
         font-weight: 600;
         font-size: 34rpx;
         color: #222222;
      }
	
      .btn {
         width: 144rpx;
         height: 56rpx;
         border-radius: 36rpx;
         border: 1rpx solid #B2B2B2;
         font-size: 26rpx;
         color: #666666;
         display: flex;
         justify-content: center;
         align-items: center;
      }
   }



   .head_title{
      color: $uni-color-primary;
      text-decoration-line: underline;
      margin-top: 20rpx;
   }

   .head_wrap {

      display: flex;

      align-items: center;

@@ -276,9 +327,8 @@


   .scroll_Y {

      background-color: #f7f7f7;



      height: calc(100vh - 130rpx);



      height: calc(100vh - 250rpx);
      margin-top: 10rpx;

      .main_list {

         width: 750rpx;

         margin: 0 -30rpx;

@@ -298,7 +348,7 @@
               width: 690rpx;

               height: 84rpx;

               margin: 0 -30rpx;

               background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);

               // background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);



               .code {

                  font-weight: 500;

@@ -309,6 +359,10 @@
               .status {

                  color: $uni-color-primary;

               }

					
               .error {

                  color: #EE3821;

               }

            }



            .content {