Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remot...

xuxueyang

2024-09-11 e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a

 sub_pages/partner/delivery/delivery-supplier-detail-list.vue

@@ -7,7 +7,7 @@
               stationId: '',
               stationName: '',
               statusStr: '',
               status: '',
               status: 'ARRIVED,PENDING',
               warehouseLocationCode: '',
            },
            show_select_station: false,
@@ -45,6 +45,16 @@
               }
            ],
            target_levels: [],
            tabs: [{
                  name: '待质检',
                  status: 'ARRIVED,PENDING',
               },
               {
                  name: '已质检',
                  status: 'CHECKED',
               },
            ],
            flg: '0',
         }
      },
      onLoad(options) {
@@ -62,19 +72,19 @@

         this.getList()

         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)
         // })
         this.$http.request('get', '/api/code/value', {
            params: {
               type: 'FLOWER_LEVEL'
@@ -94,7 +104,7 @@
         uni.stopPullDownRefresh()
      },
      methods: {

		
         callTel(tel) {
            if (tel) {
               uni.makePhoneCall({
@@ -298,7 +308,11 @@

            }
         },

         changeTab(flg) {
            this.flg = '' + flg
            this.query.status = this.tabs[flg].status
            this.refreshList()
         },
      }
   }
</script>
@@ -306,9 +320,19 @@
   <!-- 列表页面 -->
   <view class="page-delivery">
      <view class="p15" style="min-height: calc(100vh - 260rpx);">
         <view class="search-container m-t-12 flex" v-if="!query.supplierId">
            <view class="flex1 input">
         <top-tabs :tabs="tabs" :flg="flg" @change="changeTab" type="coupon">

         </top-tabs>
         <view class="search-container m-t-15 flex" v-if="!query.supplierId">
            <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>
@@ -316,21 +340,15 @@
            </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> -->
         <!-- </view> -->


         <no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>