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

陶杰

2024-09-10 dd2922d3facbfba5add501f35de5649b80b6cf05

 sub_pages/partner/delivery/delivery.vue

@@ -7,14 +7,27 @@
               stationId: '',
               stationName: '',
               statusStr: '',
               status: '',
               status: 'ARRIVED,PENDING',
               warehouseLocationCode: '',
               date: '',
            },
            show_select_station: false,
            show_select_status: false,
            selecttoday: true,
            columns_station: [],
            status_columns: [],
            show_time_picker_time: false,
            tmp_picker_time: new Date(),
            flg: '0',
            tabs: [{
                  name: '待质检',
                  status: 'ARRIVED,PENDING',
               },
               {
                  name: '已质检',
                  status: 'CHECKED',
               },
            ],
         }
      },
      onLoad(options) {
@@ -32,19 +45,19 @@
         //    var data = res.data
         //    this.columns_station = [data || []]
         // })
         this.$http.request('get', '/api/code/value', {
            params: {
               type: 'DELIVERY_ORDER_STATUS'
            }
         }).then(res => {
            var data = res.data || []
            this.status_columns = [data || []]
            this.status_columns[0].unshift({
               label: '全部',
               value: ''
            })
            console.log('status_columns', this.status_columns)
         })
         // this.$http.request('get', '/api/code/value', {
         //    params: {
         //       type: 'DELIVERY_ORDER_STATUS'
         //    }
         // }).then(res => {
         //    var data = res.data || []
         //    this.status_columns = [data || []]
         //    this.status_columns[0].unshift({
         //       label: '全部',
         //       value: ''
         //    })
         //    console.log('status_columns', this.status_columns)
         // })

      },
      onReachBottom() {
@@ -56,12 +69,23 @@
         uni.stopPullDownRefresh()
      },
      methods: {
         async select_time_picker_time(e) {
            console.log('select_time_picker_time', e)
            var vv = e.value && new Date(e.value) || new Date()
            // if (vv) {
            //    vv = vv.replace('aN:', '00:')
            // }
            // var time = new Date(`2023-8-21 ${vv}:00`)
            this.show_time_picker_time = false
            this.query.date = this.$util.toDate(vv) || ''
         },
         changeSelecrRange() {
            this.selecttoday = !this.selecttoday

            this.$nextTick(() => {
               if (this.selecttoday) {
                  this.listApi = '/api/delivery/check/list/today'
                  this.query.date = ''
               } else {
                  this.listApi = '/api/delivery/check/list'
               }
@@ -116,7 +140,12 @@
               //    tmp.$forceUpdate()
               // }, 500)
            }
         }
         },
         changeTab(flg) {
            this.flg = '' + flg
            this.query.status = this.tabs[flg].status
            this.refreshList()
         },
      }
   }
</script>
@@ -124,9 +153,19 @@
   <!-- 列表页面 -->
   <view class="page-delivery">
      <view class="p15" style="min-height: calc(100vh - 260rpx);">
         <view class="search-container m-t-12 flex">
            <view class="flex1 input">
         <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">

         </top-tabs>
         <view class="search-container m-t-15 flex">
            <view class="flex1 input m-r-5">
               <u-input placeholder="请输入供应商名称" v-model="query.supplierName">
                  <template slot="suffix">
                     <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                  </template>
               </u-input>
            </view>
            <view class="flex1 input m-l-5">
               <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                  <template slot="suffix">
                     <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                  </template>
@@ -134,22 +173,21 @@
            </view>
         </view>

         <view class="search-container m-t-12 flex">
            <view class="flex1 input">
               <u-input placeholder="请输入货位号" v-model="query.warehouseLocationCode">
                  <template slot="suffix">
                     <uni-icons color="#20613D" type="search" size="24" @tap="buttonSearchFlow"></uni-icons>
                  </template>
               </u-input>
            </view>
            <view class="component-filter-container p10 bg-white m-l-10">
         <!-- <view class="search-container m-t-12 flex"> -->

         <!--    <view class="component-filter-container p10 bg-white m-l-10">
               <view class="flex1" @click="show_select_status=true">
                  配送单状态:{{ query.statusStr || '全部' }}
                  <image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
               </view>
            </view> -->
         <!-- </view> -->
         <view class="m-t-12 m-b-12 flex">
            <view class="" v-if="!selecttoday" :class="[query.date?'':'desc-gray']"
               @click="show_time_picker_time=true">
               <!-- 选择日期 -->
               {{query.date || '请选择日期'}}
            </view>
         </view>
         <view class="m-t-12 m-b-12">
            <view class="m-l-a m-r-20 w-fit flex">
               <radio :checked="selecttoday" @click="changeSelecrRange"></radio>
               <view>只查看今日</view>
@@ -210,6 +248,10 @@
                  <view class="form-item-label">送达时间</view>
                  <view class="form-item-value">{{ item.arriveTime || '-' }}</view>
               </view> -->
               <view class="form-item flex1">
                  <view class="form-item-label">待质检数</view>
                  <view class="form-item-value">{{ item.uncheckedCount || '0' }}</view>
               </view>


               <view class="line-gray"></view>
@@ -233,6 +275,9 @@
      <u-picker @confirm="select_status" keyName="label" @cancel="show_select_status=false" :show="show_select_status"
         :columns="status_columns"></u-picker>

      <u-datetime-picker :show="show_time_picker_time" @cancel="show_time_picker_time=false"
         @confirm="select_time_picker_time" v-model="tmp_picker_time" mode="date"></u-datetime-picker>


   </view>
</template>