From a2cf1755880cf858d25c669ade281cc91e35b150 Mon Sep 17 00:00:00 2001
From: xuziying <1620990577@qq.com>
Date: Wed, 2 Aug 2023 14:20:21 +0800
Subject: [PATCH] =?UTF-8?q?'=E4=BC=98=E5=8C=96'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yyt-mall-wl/app.js                            |   3 +-
 yyt-mall-wl/pages/details/details.js          | 122 ++++++++-
 yyt-mall-wl/pages/details/details.wxml        |  28 +-
 yyt-mall-wl/pages/details/details.wxss        |   4 +
 .../pages/freiLogistics/freiLogistics.js      | 181 +++++++------
 .../pages/freiLogistics/freiLogistics.wxml    |  31 ++-
 yyt-mall-wl/pages/handover/handover.js        | 123 ++++++++-
 yyt-mall-wl/pages/handover/handover.wxml      |  30 ++-
 yyt-mall-wl/pages/handover/handover.wxss      |   5 +-
 yyt-mall-wl/pages/login/login.js              |   1 -
 yyt-mall-wl/pages/meLogistics/meLogistics.js  | 176 ++++++------
 .../pages/meLogistics/meLogistics.wxml        | 251 +++++++++---------
 .../pages/meLogistics/meLogistics.wxss        |  13 +
 yyt-mall-wl/pages/queryfrei/queryfrei.js      | 101 ++++---
 yyt-mall-wl/pages/queryfrei/queryfrei.wxml    |  85 ++----
 yyt-mall-wl/pages/queryfrei/queryfrei.wxss    |   5 +-
 .../pages/queryhandover/queryhandover.js      |  47 +++-
 .../pages/queryhandover/queryhandover.wxml    |  26 +-
 .../pages/queryhandover/queryhandover.wxss    |  18 ++
 yyt-mall-wl/pages/queryme/queryme.js          | 119 ++++++---
 yyt-mall-wl/pages/queryme/queryme.wxml        | 103 +++----
 yyt-mall-wl/pages/queryme/queryme.wxss        |   6 +-
 yyt-mall-wl/pages/querythree/querythree.js    | 113 +++++---
 yyt-mall-wl/pages/querythree/querythree.wxml  |  44 +--
 yyt-mall-wl/pages/querythree/querythree.wxss  |   5 +-
 .../pages/threeLogistics/threeLogistics.js    | 176 ++++++------
 .../pages/threeLogistics/threeLogistics.wxml  |  45 +++-
 .../pages/threeLogistics/threeLogistics.wxss  |   8 +-
 yyt-mall-wl/utils/dateSetting.js              |   4 +-
 29 files changed, 1152 insertions(+), 721 deletions(-)

diff --git a/yyt-mall-wl/app.js b/yyt-mall-wl/app.js
index 1656be5..984d824 100644
--- a/yyt-mall-wl/app.js
+++ b/yyt-mall-wl/app.js
@@ -15,8 +15,9 @@ App({
   globalData: {
     // 本地环境
     // baseUrl: 'http://192.168.51.6:8201/mall-portal',
+    // baseUrl:'http://192.168.51.200:8201/mall-portal',
     // 线上环境
-    baseUrl:'http://192.168.51.66:8302/mall-portal',
+    baseUrl:'https://api.wx.bjyytsoft.com/api/mall-portal',
     token: '',
     userInfo: {},
     bindvx: false,
diff --git a/yyt-mall-wl/pages/details/details.js b/yyt-mall-wl/pages/details/details.js
index 1c5b673..1fb519c 100644
--- a/yyt-mall-wl/pages/details/details.js
+++ b/yyt-mall-wl/pages/details/details.js
@@ -1,4 +1,5 @@
 // pages/details/details.js
+var request=require('../../utils/http')
 Page({
 
   /**
@@ -17,11 +18,120 @@ Page({
     numberplate:'', //物流车号
     logisticsMen:'', //物流员
     notes:'',//备注
+    detailId:'',//详情id
+  },
+
+  //获取物流费用
+  getcost(e){
+    this.setData({
+      cost:e.detail.value
+    })
+  },
+
+  //获取转运箱号
+  getboxNum(e){
+    this.setData({
+      boxNum:e.detail.value
+    })
+  },
+
+  //获取物流车号
+  getnumberplate(e){
+    this.setData({
+      numberplate:e.detail.value
+    })
+  },
+
+  //物流员
+  getlogisticsMen(e){
+    this.setData({
+      logisticsMen:e.detail.value
+    })
+  },
+
+  //备注
+  getnotes(e){
+    this.setData({
+      notes:e.detail.value
+    })
   },
 
   goIndex(){
-    wx.switchTab({
-      url: '../index/index',
+    var params={
+      "cost":this.data.cost,
+      "boxNum":this.data.boxNum,
+      "numberplate":this.data.numberplate,
+      "logisticsMen":this.data.logisticsMen,
+      "notes":this.data.notes,
+      "id":this.data.detailId
+    }
+    request.post('/batch/editTranLogistics',params).then(res => {
+      if(res.data.code==200){
+        console.log(res);
+        if(res.data.data.logisticsWay == 1){
+          console.log('自建');
+          wx.reLaunch({
+            url:`../meLogistics/meLogistics?id=${res.data.data.logisticsWay}&logno=${res.data.data.logisticsNo}`
+          })
+        }else if(res.data.data.logisticsWay == 2){
+          console.log('第三方');
+          wx.reLaunch({
+            url: `../threeLogistics/threeLogistics?id=${res.data.data.logisticsWay}&logno=${res.data.data.logisticsNo}`,
+          })
+        }
+      }
+      
+      // wx.showModal({
+      //   showCancel:false,
+      //   title: '提示',
+      //   content: '修改成功',
+      //   complete: (res) => {
+      //     if (res.confirm) {
+      //       wx.switchTab({
+      //         url: '../index/index',
+      //       })
+      //     }
+      //   }
+      // })
+    })
+  },
+
+  Delete(){
+    var params={
+      "id":this.data.detailId
+    }
+    request.post(`/batch/deleteTranLogistics/${this.data.detailId}`).then(res=>{
+      if(res.data.code==200){
+        console.log(res);
+        if(res.data.data.logisticsWay == 1){
+          console.log('自建');
+          wx.reLaunch({
+            url:`../meLogistics/meLogistics?id=${res.data.data.logisticsWay}&logno=${res.data.data.logisticsNo}`
+          })
+        }else if(res.data.data.logisticsWay == 2){
+          console.log('第三方');
+          wx.reLaunch({
+            url: `../threeLogistics/threeLogistics?id=${res.data.data.logisticsWay}&logno=${res.data.data.logisticsNo}`,
+          })
+        }
+      }
+      // if(res.data.code==200){
+      //   wx.showModal({
+      //     showCancel:false,
+      //     title: '提示',
+      //     content: '删除成功',
+      //     complete: (res) => {
+      //       if (res.confirm) {
+      //         wx.switchTab({
+      //           url: '../index/index',
+      //         })
+      //       }
+      //     }
+      //   })
+      //   // wx.navigateBack({
+      //   //   data:1
+      //   // })       
+      // }
     })
   },
 
@@ -42,15 +152,19 @@ Page({
       boxNum:item.boxNum,
       numberplate:item.numberplate,
       logisticsMen:item.logisticsMen,
-      notes:item.notes
+      notes:item.notes,
+      detailId:item.id,
+      startTime:item.startTime
     })
+    
+    
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady() {
-
+    
   },
 
   /**
diff --git a/yyt-mall-wl/pages/details/details.wxml b/yyt-mall-wl/pages/details/details.wxml
index 1de758a..ad92b9b 100644
--- a/yyt-mall-wl/pages/details/details.wxml
+++ b/yyt-mall-wl/pages/details/details.wxml
@@ -3,56 +3,56 @@
   <view class="back">
     <view class="cen">
       <label>样本条码：</label>
-      <input type="text" value="{{barCode}}"/>
+      <input class="dis" type="text" disabled="false" value="{{barCode}}"/>
     </view>
     <view class="cen">
       <label>接收时间：</label>
-      <input type="text" value="{{receiveTime}}"/>
+      <input class="dis" type="text" disabled="false" value="{{startTime==''?receiveTime:startTime}}"/>
     </view>
     <view class="cen">
       <label>样本状态：</label>
-      <input type="text" value="已签收" disabled="true"/>
+      <input class="dis" type="text" disabled="false" value="{{status==1?'已发货':'已签收'}}"/>
     </view>
     <view class="cen">
       <label>物流单号：</label>
-      <input type="text" value="{{logisticsNo}}"/>
+      <input class="dis" type="text" disabled="false" value="{{logisticsNo}}"/>
     </view>
     <view class="cen">
       <label>物流单位：</label>
-      <input type="text" value="{{unitType}}"/>
+      <input class="dis" disabled="false" type="text" value="{{unitType==1?'顺丰':'' || unitType==2?'京东':'' || unitType==1?'自建':''}}"/>
     </view>
     <view class="cen">
-      <label style="letter-spacing: 13rpx;">日 期：</label>
-      <input type="text" value="{{entryDate}}"/>
+      <label>创建时间：</label>
+      <input class="dis" type="text" disabled="false" value="{{receiveTime}}"/>
     </view>
     <view class="cen">
       <label>物流费用：</label>
-      <input type="text" value="{{cost}}"/>
+      <input type="text" bindinput="getcost" value="{{cost}}"/>
     </view>
     <view class="cen">
       <label>到达日期：</label>
-      <input type="text" value="{{expectedEndTime}}"/>
+      <input class="dis" type="text" disabled="false" value="{{expectedEndTime}}"/>
     </view>
     <view class="cen">
       <label>转运箱号：</label>
-      <input type="text" value="{{boxNum}}"/>
+      <input type="text" bindinput="getboxNum" value="{{boxNum}}"/>
     </view>
     <view class="cen">
       <label>物流车号：</label>
-      <input type="text" value="{{numberplate}}"/>
+      <input type="text" bindinput="getnumberplate" value="{{numberplate}}"/>
     </view>
     <view class="cen">
       <label style="letter-spacing: 6rpx;">物流员：</label>
-      <input type="text" value="{{logisticsMen}}"/>
+      <input type="text" bindinput="getlogisticsMen" value="{{logisticsMen}}"/>
     </view>
     <view class="cen">
       <label style="letter-spacing: 12rpx;">备 注：</label>
-      <input type="text" value="{{notes}}"/>
+      <input type="text" bindinput="getnotes" value="{{notes}}"/>
     </view>
   </view>
 
   <view class="bottom">
-    <button class="btn1">删 除</button>
+    <button class="btn1" bindtap="Delete">删 除</button>
     <button class="btn2" bindtap="goIndex">保 存</button>
   </view> 
 </view>
diff --git a/yyt-mall-wl/pages/details/details.wxss b/yyt-mall-wl/pages/details/details.wxss
index c586384..073e431 100644
--- a/yyt-mall-wl/pages/details/details.wxss
+++ b/yyt-mall-wl/pages/details/details.wxss
@@ -44,4 +44,8 @@
   background-color: #ddd;
   color: #fff;
   background-color: #27adb0;
+}
+
+.dis{
+  background-color: #ddd !important;
 }
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/freiLogistics/freiLogistics.js b/yyt-mall-wl/pages/freiLogistics/freiLogistics.js
index 8fb8220..3b46b70 100644
--- a/yyt-mall-wl/pages/freiLogistics/freiLogistics.js
+++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.js
@@ -2,58 +2,53 @@
 var datePicker = require('../../utils/dateSetting')
 var request = require('../../utils/http')
 var dateUtils = require('../../utils/dateUtils')
+var app=getApp()
 
 Page({
   data: {
+    boxArr:[],//转运箱列表
+    // boxId:'',//转运箱id
+    boxNum: '', //转运箱号
+    numberplateArr:[],//车辆列表
+    numberplate:'',//车牌号
+    vehicleId:'',//车辆id
+    tranTypeArr:[],//转运方式列表
+    tranType:'',//转运方式id
+    tranType1:'',//转运方式
+    number:'',//数量
+    date: '',//日期
+    phone: '', //物流电话
+    cost: '', //物流费用
+    time: '',//到达时间
+    multiArray: [],
+    multiIndex: [0, 0, 0, 0, 0],
+    choose_year: "",
+    logisticsMen: '', //物流员
+    notes: '', //备注
+
     selfOrderCode: '', //物流单号
-    sampleList: [{
-        'id': 1,
-        'number': '2023050002',
-        'time': '2023-5-12 11:32',
-        'status': '已签收',
-        'name': '张三',
-        'num': 'M2023055568'
-      }
-    ],
+    sampleList: [],
     pipenum: '',
     ins: [], //转运方式
     insIdx: 0, //转运方式下标
-    date: '',
     start: '2023-07-01',
     end: '',
-
     potoSrc: '../../images/addPoto.png', //默认图片
     poto: [], //车辆&转运箱照片 最大长度 4
-
-    time: '',
-    multiArray: [],
-    multiIndex: [0, 0, 0, 0, 0],
-    choose_year: "",
     srcArray: [],
-    phone: '', //物流电话
-    boxNum: '', //转运箱号
-    cost: '', //物流费用
-    numberplate: '', //车牌号
-    logisticsMen: '', //物流员
-    notes: '', //备注
     sampleCount: '0', //样本数量
-    //样本列表
-    sampleList: [{
-      'id': 1,
-      'number': '2023050002',
-      'time': '2023-5-12 11:32',
-      'status': '已签收',
-      'name': '张三',
-      'num': 'M2023055568'
-    }],
   },
-
+  
   scacode() {
     wx.scanCode({
       success: (res) => {
-        console.log(res.result);
+        var result=res.result
+        if(result.length>20){
+          result=result.slice(5);
+          console.log(result);
+        }
         this.setData({
-          pipenum: res.result
+          pipenum:result
         })
       }
     })
@@ -100,10 +95,11 @@ Page({
     })
   },
 
-  //送检机构
-  bindPickerChange(e) {
+  //转运方式
+  bindPickerChangetranType(e) {
     this.setData({
-      index: e.detail.value
+      tranType:this.data.tranTypeArr[e.detail.value].dictValue,
+      tranType1:this.data.tranTypeArr[e.detail.value].dictLabel,
     })
   },
 
@@ -115,6 +111,23 @@ Page({
     })
   },
 
+  //转运箱
+  // bindPickerChangeBox(e){
+  //   this.setData({
+  //     boxNum:this.data.boxArr[e.detail.value].boxNum,
+  //     boxId:this.data.boxArr[e.detail.value].id
+  //   })
+  // },
+
+  //车辆下拉选择
+  bindNumberplate(e) {
+    // console.log(JSON.stringify(e.detail.value))
+    this.setData({
+      numberplate:this.data.numberplateArr[e.detail.value].numberplate,
+      vehicleId:this.data.numberplateArr[e.detail.value].id,
+    })
+  },
+
   //最后呈现时间的函数。
   bindMultiPickerChange: function (e) {
     var dateStr = this.data.multiArray[0][this.data.multiIndex[0]] +
@@ -286,25 +299,27 @@ Page({
     var tempData = {
       "barCode": temp.pipenum, //样本条码
       "barCodeImg": "", //物流拍照图
+      "boxId":'',//转运箱id
       "boxNum": temp.boxNum, //转运箱号
       "carPics": carPoto.toString(), //物流车图片 逗号分隔
       "boxPics": boxPoto.toString(), //	转运箱图片 逗号分隔
-      "cost": 0, //	物流费用 自建没有
-      "driverMen": temp.driverMen, //驾驶员
+      "cost": temp.cost, //	物流费用 自建没有
+      "driverMen": '', //驾驶员
       "entryDate": temp.date, //	录入日期
       "endDate": '', //startTime
       "expectedEndTime": endTime, //预计到达时间 endTime
-      "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
-      "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
+      "institutionName":'', //送检机构名称
+      "institutionNo": '', //送检机构编号
       "logisticsMen": temp.logisticsMen, //物流员
       "logisticsNo": temp.selfOrderCode, //物流编号
-      "logisticsWay": 1, //物流方式 1自建 2第三方 3货运
+      "logisticsWay": 3, //物流方式 1自建 2第三方 3货运
       "notes": temp.notes, //	物流备注
       "number": temp.number, //	数量
-      "numberplate": "", //	车牌号
-      "phone": "", //物流电话
+      "numberplate": temp.numberplate, //	车牌号
+      "vehicleId":'',//车辆id
+      "phone": temp.phone, //物流电话
       "startTime": '', //出发时间
-      "tranType": "1", //物流方式
+      "tranType": temp.tranType, //物流方式
       "unitType": "", //物流单位 1.顺丰 2.京东(自建物流没有该字段)
       "updateBy": 0,
       "updateTime": ""
@@ -313,9 +328,10 @@ Page({
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
       console.log(JSON.stringify(res.data));
       if (res.data.code == 200) {
-        this.data.selfOrderCode = res.data.data
         //保存成功后,查询底部列表
-        this.selSampleList();
+        wx.showToast({
+          title:res.data.message,
+        })
       } else {
         wx.showModal({
           title: '错误',
@@ -335,7 +351,7 @@ Page({
       'logisticsNo': this.data.selfOrderCode
     }
     request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
-      console.log(res.data);
+      // console.log(res.data);
       this.setData({
         sampleList: res.data.data,
         sampleCount: res.data.data.length
@@ -346,9 +362,10 @@ Page({
   //显示必选项为空提示
   showErrInfo(field, errInfo) {
     if (field === undefined || field.length == 0) {
-      wx.showToast({
-        icon: 'error',
-        title: errInfo,
+      wx.showModal({
+        showCancel:false,
+        title:'提示',
+        content:errInfo,
       })
       return true;
     }
@@ -372,13 +389,14 @@ Page({
       })
     }
 
-    //转运箱号
+    //转运箱
     if (data_id == 'boxNum') {
       this.setData({
         boxNum: value
       })
     }
 
+    
     //车牌号
     if (data_id == 'numberplate') {
       this.setData({
@@ -386,6 +404,7 @@ Page({
       })
     }
 
+    //物流电话
     if(data_id == 'phone'){
       this.setData({
         phone: value
@@ -406,13 +425,6 @@ Page({
       })
     }
 
-    //驾驶员
-    if (data_id == 'driverMen') {
-      this.setData({
-        driverMen: value
-      })
-    }
-
     //备注
     if (data_id == 'notes') {
       this.setData({
@@ -443,7 +455,7 @@ Page({
 
     //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
     request.get(`/batch/getBatchsNumber?logisticsWay=3`).then(res => {
-      console.log('getBatchsNumber=' + JSON.stringify(res.data))
+      // console.log('getBatchsNumber=' + JSON.stringify(res.data))
       if (res.data.code == 200) {
         this.setData({
           selfOrderCode: res.data.data
@@ -451,26 +463,47 @@ Page({
       }
     })
 
-    //获取送检机构列表
-    request.get(`/dict/type/tran_method`).then(res => {
-      var array = res.data.data
-      var tempArr = []
-      for (let index = 0; index < array.length; index++) {
-        tempArr.push(array[index].dictLabel)
-      }
-      this.setData({
-        ins: tempArr
-      })
-
-      //查询物流批次列表
-      this.selSampleList();
-    })
+    // //获取送检机构列表
+    // request.get(`/dict/type/tran_method`).then(res => {
+    //   var array = res.data.data
+    //   var tempArr = []
+    //   for (let index = 0; index < array.length; index++) {
+    //     tempArr.push(array[index].dictLabel)
+    //   }
+    //   this.setData({
+    //     ins: tempArr
+    //   })
+
+    //   //查询物流批次列表
+    //   this.selSampleList();
+    // })
 
     //初始化照片按钮
     var tempSrc = [this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc,this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc]
     this.setData({
       poto: tempSrc
     })
+    
+    //转运方式
+    request.get(`/dict/type/tran_method`).then(res => {
+      this.setData({
+        tranTypeArr:res.data.data
+      })
+    })
+
+    //转运箱
+    // request.post(`/box/selectTranBox`).then(res => {
+    //   this.setData({
+    //     boxArr:res.data.data
+    //   })
+    // })
+
+    //车牌号
+    request.post(`/vehicle/selectTranVehicle`).then(res => {
+      this.setData({
+        numberplateArr:res.data.data
+      })
+    })
   },
 
   /**
diff --git a/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml
index 4a3dcb9..8235ee2 100644
--- a/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml
+++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml
@@ -1,6 +1,6 @@
 <view class="box">
   <view class="top">
-    <input type="text" value="{{pipenum}}" />
+    <input type="text" bindinput="inputTextInfo" data-id="barCode" value="{{pipenum}}"   />
     <view bindtap="scacode">
       <image src="../../images/saoma.png" style="width: 70rpx; height: 70rpx;"></image>
     </view>
@@ -40,17 +40,26 @@
       <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
     </view> -->
 
-    <picker class="from-con" bindchange="bindPickerChange" value="{{index}}" range="{{ins}}">
+    <!-- <picker class="from-con" bindchange="bindPickerChange" value="{{index}}" range="{{ins}}">
       <label>转运方式：</label>
       <input type="text" disabled="true" placeholder="请选择转运方式" placeholder-class="place" value="{{ins[index]}}" />
+    </picker> -->
+    <picker class="from-con" bindchange="bindPickerChangetranType" range-key="dictLabel" value="{{index}}" range="{{tranTypeArr}}">
+      <label>转运方式：</label>
+      <input type="text" disabled="true" placeholder="请选择转运方式" placeholder-class="place" value="{{tranType1}}" />
     </picker>
+
+    <!-- <picker class="from-con" bindchange="bindPickerChangeBox" range-key="boxNum" value="{{index}}" range="{{boxArr}}">
+      <label>转运箱号：</label>
+      <input type="text" disabled="true" placeholder="请选择转运箱号" placeholder-class="place" value="{{boxNum}}" />
+    </picker> -->
     <view class="from-con">
       <label>转运箱号：</label>
-      <input type="text" placeholder="转运箱号" placeholder-class="place" value="" />
+      <input type="text" placeholder="转运箱号" placeholder-class="place" bindinput="inputTextInfo" data-id="boxNum" value="{{boxNum}}" />
     </view>
     <view class="from-con">
-      <label>数量：</label>
-      <input type="text" placeholder="数量" placeholder-class="place"/>
+      <label space="nbsp" style="letter-spacing: 14rpx;">数 量：</label>
+      <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" value="{{number}}" />
     </view>
     <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
       <label style="letter-spacing: 14rpx;">日 期：</label>
@@ -65,16 +74,20 @@
       <input type="number" placeholder="物流费用" placeholder-class="place" bindinput="inputTextInfo" data-id="cost" value="{{cost}}" />
     </view>
     <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
-      <label><text style="color: red;position: absolute; left:-20rpx;">*</text>到达时间：</label>
+      <label><text style="color: red;position: absolute; left:-20rpx;">*</text>预计到达时间：</label>
       <input value='{{time}}' placeholder='请选择到达时间' placeholder-class="place" disabled="true" />
     </picker>
+    <!-- <picker class="from-con" bindchange="bindNumberplate" range-key="numberplate" value="{{index}}" range="{{numberplateArr}}">
+      <label>车 牌 号：</label>
+      <input type="text" disabled="true" placeholder="请选择车牌号" placeholder-class="place" value="{{numberplate}}" />
+    </picker> -->
     <view class="from-con">
-      <label style="letter-spacing: 8rpx;">车牌号：</label>
+      <label>车 牌 号：</label>
       <input type="text" placeholder="车牌号" placeholder-class="place" bindinput="inputTextInfo" data-id="numberplate" value="{{numberplate}}" />
     </view>
     <view class="from-con">
       <label style="letter-spacing: 8rpx;">物流员：</label>
-      <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logistician}}" />
+      <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logisticsMen}}" />
     </view>
     <view class="from-con" style="border-bottom: none;">
       <label style="letter-spacing: 14rpx;">备 注：</label>
@@ -106,7 +119,7 @@
       <image bindtap="photograph" src="{{poto[7]}}" data-id="box_4"></image>
     </view>
   </view>
-
+  
   <button class="bottomButton" bindtap="saveInfo">保 存</button>
 
 </view>
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/handover/handover.js b/yyt-mall-wl/pages/handover/handover.js
index b063bed..34d9662 100644
--- a/yyt-mall-wl/pages/handover/handover.js
+++ b/yyt-mall-wl/pages/handover/handover.js
@@ -33,6 +33,17 @@ Page({
     ],
     date: '', //开始时间
     endDate: '',
+    institutionNoArr:[],//送检机构数组
+    orgName:'',//送检机构名称
+    institutionNo:'',//送检机构编号
+    logisticsMen: '', //物流员
+    statusArr:[],//状态列表
+    status:[],//状态
+    statusId:'',//状态id
+    rangeType:1,//日期类型
+    logisticsNo:'', //物流单号
+
+
 
     // date: '',
     start: '',
@@ -40,7 +51,7 @@ Page({
     logisticsCodeList: [], //物流单列表
     sampleList: [], //样本列表
     showDialog: false, //默认不显示物流列表弹窗
-    logisticsNo:'', //记录当前物流单号
+    
   },
 
   //筛选--------------------------
@@ -57,12 +68,17 @@ Page({
     for(var i in dateList){
       if(dateList[i].id==id){
         dateList[i].isShow=true
+        this.setData({
+          rangeType:dateList[i].id
+        })
       }else{
         dateList[i].isShow=false
       }
     }
     this.setData({
-      dateList:dateList
+      dateList:dateList,
+      date:'',
+      endDate:''
     })
   },
 
@@ -81,6 +97,7 @@ Page({
     }
     this.setData({
       dateList:dateList,
+      rangeType:'',
       date: '', 
       endDate: '',
     })
@@ -94,41 +111,103 @@ Page({
     })
   },
 
-  //刷新按钮
+  //查询按钮
   refresh() {
     this.selTranLogistics()
   },
 
+  //重置按钮
+  resetting(){
+    this.setData({
+    date: '', //开始时间
+    endDate: '',
+    orgName:'',//送检机构名称
+    institutionNo:'',//送检机构编号
+    logisticsMen: '', //物流员
+    status:[],//状态
+    statusId:'',//状态id
+    rangeType:'',//日期类型
+    logisticsNo:'', //物流单号
+    logisticsCodeList: [], //物流单列表
+    sampleList: [], //样本列表
+    })
+  },
+
   //开始时间
   bindDateChange(e) {
-    // console.log(e.detail.value)
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     this.setData({
-      date: e.detail.value
+      date: e.detail.value,
+      rangeType:5,
+      dateList:dateList
     })
   },
   //结束时间
   bindDateChangeend(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      endDate: e.detail.value
+      endDate: e.detail.value,
+      rangeType:5,
+      dateList:dateList
     })
   },
 
+  //送检机构
+  bindPickerChange(e) {
+    this.setData({
+      orgName:this.data.institutionNoArr[e.detail.value].orgName,
+      institutionNo:this.data.institutionNoArr[e.detail.value].id
+    })
+  },
+
+  //状态
+  bindPickerChangeStatus(e){
+    this.setData({
+      status:this.data.statusArr[e.detail.value].dictLabel,
+      statusId:this.data.statusArr[e.detail.value].dictValue
+    })
+  },
+
+  //物流员
+  bindLogisticsMen(e) {
+    this.setData({
+      logisticsMen: e.detail.value
+    })
+  },
+
+  //物流单号
+  getLogisticsNo(e){
+    this.setData({
+      logisticsNo:e.detail.value
+    })
+  },
+
+
   //查询物流单列表
   selTranLogistics() {
     var reqData = {
-      startTime: this.data.date,
-      pageNum: 1,
-      pageSize: 100
+      "logisticsNo":this.data.logisticsNo,//单号
+      "institutionNo":this.data.institutionNo, //机构,
+      "createName":this.data.logisticsMen, //物流员,
+      "status":this.data.statusId, //状态,
+      "startDate":this.data.date, //区间开始时间,
+      "endDate":this.data.endDate ,//区间结束时间,
+      "rangeType":this.data.rangeType, //日期类型(1.一个月 2.三个月 3.半年 4.一年 5.日期区间)
     }
-    request.post(`/batch/selectTranLogistics`, reqData).then(res => {
+    request.post(`/batch/selectTranLogistics?pageNum=1&pageSize=9999`,reqData).then(res => {
       if (res.data.data.length == 0) {
 
         this.setData({
           logisticsCodeList: [],
           sampleList:[]
         })
-
         wx.showToast({
           title: '无数据',
           icon: 'error'
@@ -160,6 +239,7 @@ Page({
     this.drawQrImg(e.target.dataset.id)
   },
 
+  //生成二维码
   drawQrImg(text) {
     var _this = this;
     const query = wx.createSelectorQuery()
@@ -236,6 +316,27 @@ Page({
     //   date: tempDate
     // })
     this.selTranLogistics()
+
+
+    //获取送检机构列表
+    request.post(`/institution/selectInstitution`).then(res => {
+      this.setData({
+        institutionNoArr: res.data.data
+      })
+    }),
+
+    //获取状态字典
+    request.get('/dict/type/tran_status').then(res => {
+      var statusArr=res.data.data
+      for(var i in statusArr){
+        if(statusArr[i].dictValue==3){
+          statusArr.splice(i,1)
+        }
+      }
+      this.setData({
+        statusArr:statusArr
+      })
+    })
   },
 
   /**
diff --git a/yyt-mall-wl/pages/handover/handover.wxml b/yyt-mall-wl/pages/handover/handover.wxml
index f8048eb..53dbdc5 100644
--- a/yyt-mall-wl/pages/handover/handover.wxml
+++ b/yyt-mall-wl/pages/handover/handover.wxml
@@ -22,7 +22,7 @@
   </view>
 </view>
 
-<view class="top">物流单号M2023020200012已签收。签收时间:2023年6月14日 14:36</view>
+<!-- <view class="top">物流单号M2023020200012已签收。签收时间:2023年6月14日 14:36</view> -->
 <view class="box">
   
   <view class="screen">
@@ -40,18 +40,22 @@
   </view> -->
 
   <view class="form">
-    <view class="from-con">
+    <picker class="from-con" bindchange="bindPickerChange" range-key="orgName" value="{{index}}" range="{{institutionNoArr}}">
       <label>送检机构：</label>
-      <input type="text" placeholder="送检机构" placeholder-class="place"/>
-    </view>
+      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{orgName}}" />
+    </picker>
+
     <view class="from-con">
       <label style="letter-spacing: 8rpx;">物流员：</label>
-      <input type="text" placeholder="物流员" placeholder-class="place" />
+      <input type="text" placeholder="物流员" placeholder-class="place" bindinput="bindLogisticsMen" value="{{logisticsMen}}" />
     </view>
-    <view class="from-con">
+
+
+    <picker class="from-con" bindchange="bindPickerChangeStatus" range-key="dictLabel" value="{{index}}" range="{{statusArr}}">
       <label style="letter-spacing: 14rpx;">状 态：</label>
-      <input type="text" placeholder="状态" placeholder-class="place" />
-    </view>
+      <input type="text" disabled="true" placeholder="请选择状态" placeholder-class="place" value="{{status}}" />
+    </picker>
+
     <view class="from-button" style="margin-top: 50rpx;">
       <button style="height: 65rpx;background-color: #eeeaea; border: 1rpx #f0eeee solid; border-radius: 50rpx;" bindtap="resetting">重 置</button>
       <button style="height: 65rpx;background-color: #63bec0; color: #fff; border-radius: 50rpx; border: 1rpx #f0eeee solid;" bindtap="refresh">查 询</button>
@@ -70,16 +74,16 @@
         
       </view>
     </scroll-view>
-    <view style="margin-top: 40rpx;text-align: right;">总管数：{{all}}管</view>
+    <view style="margin-top: 40rpx;text-align: right;">总单数：{{all}}单</view>
   </view>
 
-  <view class="back" style="padding: 20rpx;box-shadow: 0 0 10px #ddd;">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx;">
+  <view class="back" style="padding: 50rpx 20rpx 100rpx 20rpx;box-shadow: 0 0 10px #ddd;">
+    <scroll-view scroll-x scroll-y style="width: 100%; height: 400rpx; border: 1rpx #ddd solid;">
       <view class="tr top1">
         <view class="td td1">序号</view>
         <view class="td">样本号</view>
         <view class="td">送检机构</view>
-        <view class="td td2">日期</view>
+        <view class="td" style="width: 400rpx !important;">日期</view>
         <view class="td">转运箱号</view>
         <view class="td">交接人</view>
         <view class="td">状态</view>
@@ -89,7 +93,7 @@
           <view class="td td1">{{index+1}}</view>
           <view class="td">{{item.barCode}}</view>
           <view class="td">{{item.institutionName}}</view>
-          <view class="td td2">{{item.createTime}}</view>
+          <view class="td">{{item.createTime}}</view>
           <view class="td">{{item.boxNum}}</view>
           <view class="td">{{item.logisticsMen}}</view>
           <view class="td" wx:if="{{item.status == 0}}" class="td">未采样</view>
diff --git a/yyt-mall-wl/pages/handover/handover.wxss b/yyt-mall-wl/pages/handover/handover.wxss
index b217f54..ab21805 100644
--- a/yyt-mall-wl/pages/handover/handover.wxss
+++ b/yyt-mall-wl/pages/handover/handover.wxss
@@ -94,6 +94,7 @@
   /* border-right:#ddd solid 1rpx ;
   border-top: #ddd solid 1rpx; */
   border-right: 1rpx #ddd solid;
+  border-bottom: 1rpx #ddd solid;
   padding: 10rpx 0;
   font-size: 22rpx;
   display: flex;
@@ -101,7 +102,8 @@
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 200rpx;
+  min-width:250rpx ;
+  overflow: hidden;
 }
 
 .top1 view {
@@ -113,7 +115,6 @@
   min-width: 100rpx !important;
 }
 
-
 .zan-dialog__mask {
   position: fixed;
   top: 0;
diff --git a/yyt-mall-wl/pages/login/login.js b/yyt-mall-wl/pages/login/login.js
index 9f6e150..3095f4b 100644
--- a/yyt-mall-wl/pages/login/login.js
+++ b/yyt-mall-wl/pages/login/login.js
@@ -46,7 +46,6 @@ Page({
       })
     }else{
       request.post(`/sso/login?username=${this.data.username}&password=${this.data.userpwd}`).then(res => {
-        console.log(res);
         if (res.data.code == 200) {
           app.globalData.token = res.data.data.tokenHead + res.data.data.token;
           request.get('/sso/info').then(res2 => {
diff --git a/yyt-mall-wl/pages/meLogistics/meLogistics.js b/yyt-mall-wl/pages/meLogistics/meLogistics.js
index 1069d92..9db590a 100644
--- a/yyt-mall-wl/pages/meLogistics/meLogistics.js
+++ b/yyt-mall-wl/pages/meLogistics/meLogistics.js
@@ -3,45 +3,44 @@
 var datePicker = require('../../utils/dateSetting')
 var request = require('../../utils/http')
 var dateUtils = require('../../utils/dateUtils')
+var app=getApp()
 
 //设定当前的时间，将其设定为常量
 Page({
   data: {
-    pipenum: '',
-    selfOrderCode: '', //物流单号
-    ins: [], //送检机构 服务端获取
-    insName: '', //机构列表名称
-    insIdx: 0, //当前所选机构下标
-    bushList: ['自建物流'], //运输方式 服务端获取
-    bush: '0', //运输方式下标
-    date: '', //当天日期
-    start: '2020-01-01',
-    end: '',
+    logno:'',
 
+    boxArr:[],//转运箱列表
+    boxId:'',//转运箱id
     boxNum: '', //转运箱号
-    boxList: [], //查询回来的转运箱列表
-    boxIdx: '', //选择的下标
-
+    numberplateArr:[],//车辆列表
+    numberplate:'',//车牌号
+    vehicleId:'',//车辆id
+    driverMen: '', //驾驶员
+    selfOrderCode: '', //物流单号
+    number: '', //数量
+    bushList: ['自建物流'], //运输方式 服务端获取
     time: '', //出发时间
     multiArray: [],
     multiIndex: [0, 0, 0, 0, 0],
     choose_year: "",
-
     time1: '', //到达时间
     multiArray1: [],
     multiIndex1: [0, 0, 0, 0, 0],
     choose_year1: "",
-
-    numberplate: '', //车牌号
-    numberplateIdx:'', //牌照角标
-    numberplateArr:[], //牌照号组
-    numberplateList:[], //车辆集合
-
     logisticsMen: '', //物流员
-    number: '', //数量
     notes: '', //备注
-    driverMen: '', //驾驶员
-    // srcArray: [], //样本组？
+    pipenum: '',//样本条码
+
+
+    ins: [], //送检机构 服务端获取
+    insName: '', //机构列表名称
+    insIdx: 0, //当前所选机构下标
+    bush: '0', //运输方式下标
+    date: '', //当天日期
+    start: '2020-01-01',
+    end: '',
+    srcArray: [], //样本组？
     potoSrc: '../../images/addPoto.png', //默认图片
     poto: [], //车辆&转运箱照片&样本 最大长度 12
     tableArr: [], //扫码表数据
@@ -50,12 +49,18 @@ Page({
     sampleList: [],
   },
 
+
   //调用摄像头扫描样本码
   scacode() {
     wx.scanCode({
       success: (res) => {
+        var result=res.result
+        if(result.length>20){
+          result=result.slice(5);
+          console.log(result);
+        }
         this.setData({
-          pipenum: res.result
+          pipenum:result
         })
       }
     })
@@ -283,11 +288,20 @@ Page({
   goDetail(e) {
     console.log('goDetail=' + e.currentTarget.dataset.id);
     var sample = this.data.sampleList[e.currentTarget.dataset.id]
+    console.log('==========',sample);
     wx.navigateTo({
       url: '../details/details?sample=' + JSON.stringify(sample),
     })
   },
 
+  //转运箱
+  bindPickerChangeBox(e){
+    this.setData({
+      boxNum:this.data.boxArr[e.detail.value].boxNum,
+      boxId:this.data.boxArr[e.detail.value].id
+    })
+  },
+
   //文本输入信息
   inputTextInfo(e) {
     var data_id = e.target.dataset.id; //组件tag
@@ -306,13 +320,6 @@ Page({
       })
     }
 
-    //转运箱号
-    if (data_id == 'boxNum') {
-      this.setData({
-        boxNum: value
-      })
-    }
-
     //物流员
     if (data_id == 'logisticsMen') {
       this.setData({
@@ -335,30 +342,23 @@ Page({
     }
   },
 
-  //转运箱号下拉选择
-  bindBoxNumber(e) {
-    // console.log(JSON.stringify(e.detail.value))
-    this.setData({
-      boxIdx: e.detail.value,
-      boxNum: this.data.boxList[e.detail.value]
-    })
-  },
-
     //车辆下拉选择
     bindNumberplate(e) {
       // console.log(JSON.stringify(e.detail.value))
       this.setData({
-        numberplateIdx: e.detail.value,
-        numberplate: this.data.numberplateArr[e.detail.value]
+        numberplate:this.data.numberplateArr[e.detail.value].numberplate,
+        vehicleId:this.data.numberplateArr[e.detail.value].id,
+        driverMen:this.data.numberplateArr[e.detail.value].driverMen,
       })
     },
 
   //显示必选项为空提示
   showErrInfo(field, errInfo) {
     if (field === undefined || field.length == 0) {
-      wx.showToast({
-        icon: 'error',
-        title: errInfo,
+      wx.showModal({
+        showCancel:false,
+        title:'提示',
+        content:errInfo,
       })
       return true;
     }
@@ -373,7 +373,9 @@ Page({
     var endTime = dateUtils.customizeDateFormat(temp.time1);
 
     if (this.showErrInfo(startTime, '出发时间不可为空')) return
-    if (this.showErrInfo(endTime, '到过时间不可为空')) return
+    if (this.showErrInfo(endTime, '到达时间不可为空')) return
+    if (this.showErrInfo(this.data.numberplate, '车牌号不可为空')) return
+    
 
     //处理物流车拍照
     var carPoto = []
@@ -395,25 +397,27 @@ Page({
     var tempData = {
       "barCode": temp.pipenum, //样本条码
       "barCodeImg": "", //物流拍照图
+      "boxId":temp.boxId,//转运箱id
       "boxNum": temp.boxNum, //转运箱号
       "carPics": carPoto.toString(), //物流车图片 逗号分隔
       "boxPics": boxPoto.toString(), //	转运箱图片 逗号分隔
       "cost": 0, //	物流费用 自建没有
       "driverMen": temp.driverMen, //驾驶员
       "entryDate": temp.date, //	录入日期
-      "endDate": '2023-07-06 14:52:53', //startTime
+      "endDate": '', //startTime
       "expectedEndTime": endTime, //预计到达时间 endTime
-      "institutionName": temp.insName, //送检机构名称
-      "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
+      "institutionName": '', //送检机构名称
+      "institutionNo": '', //送检机构编号
       "logisticsMen": temp.logisticsMen, //物流员
       "logisticsNo": temp.selfOrderCode, //物流编号
       "logisticsWay": 1, //物流方式 1自建 2第三方 3货运
       "notes": temp.notes, //	物流备注
       "number": temp.number, //	数量
       "numberplate": temp.numberplate, //	车牌号
+      "vehicleId":temp.vehicleId,//车辆id
       "phone": "", //物流电话
       "startTime": startTime, //出发时间
-      "tranType": "1", //物流方式
+      "tranType": "", //物流方式
       "unitType": "", //物流单位 1.顺丰 2.京东(自建物流没有该字段)
       "updateBy": 0,
       "updateTime": ""
@@ -422,6 +426,9 @@ Page({
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
       console.log(JSON.stringify(res.data));
       if (res.data.code == 200) {
+        wx.showToast({
+          title: res.data.message,
+        })
         //保存成功后,查询底部列表
         this.selSampleList();
       } else {
@@ -450,10 +457,39 @@ Page({
     })
   },
 
+  //退出
+  out(){
+    wx.switchTab({
+      url: '../index/index',
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    if(options!==undefined){
+      console.log(options.logno);
+      this.setData({
+        logno:options.logno
+      })
+    }
+
+    if(this.data.logno===undefined){
+        //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
+      request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
+        if (res.data.code == 200) {
+          this.data.selfOrderCode = res.data.data
+          this.setData({
+            selfOrderCode: res.data.data
+          })
+
+          this.selSampleList(); //查询物流批次列表
+        }
+      })
+    }
+
+
     let now = new Date(); //获取时间
     let year = now.getFullYear(); //获取当前年
     let month = now.getMonth() + 1; //获取当前月份
@@ -477,18 +513,9 @@ Page({
         ],
       }),
 
-      //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
-      request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
-        if (res.data.code == 200) {
-          this.data.selfOrderCode = res.data.data
-          this.setData({
-            selfOrderCode: res.data.data
-          })
-
-          this.selSampleList(); //查询物流批次列表
-        }
-      })
+      
 
+      
 
     //获取送检机构列表
     request.post(`/institution/selectInstitution`).then(res => {
@@ -512,28 +539,17 @@ Page({
       poto: tempSrc
     })
 
-    //获取转运箱信息
+    //转运箱
     request.post(`/box/selectTranBox`).then(res => {
-      var array = res.data.data
-      var tempBoxList = []
-      for (let index = 0; index < array.length; index++) {
-        tempBoxList.push(array[index].boxNum)
-      }
       this.setData({
-        boxList: tempBoxList
+        boxArr:res.data.data
       })
-
     })
 
-    //获取车辆信息
+    //车牌号
     request.post(`/vehicle/selectTranVehicle`).then(res => {
-      var array = res.data.data
-      var tempNumberplatArr = []
-      for (let index = 0; index < array.length; index++) {
-        tempNumberplatArr.push(array[index].numberplate)
-      }
       this.setData({
-        numberplateArr :tempNumberplatArr
+        numberplateArr:res.data.data
       })
     })
   },
@@ -549,7 +565,13 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    if(this.data.logno!=undefined){
+      this.setData({
+        selfOrderCode:this.data.logno
+      })
+      this.selSampleList(); 
+      console.log(this.data.logno);
+    }
   },
 
   /**
diff --git a/yyt-mall-wl/pages/meLogistics/meLogistics.wxml b/yyt-mall-wl/pages/meLogistics/meLogistics.wxml
index 9180a79..254e0c6 100644
--- a/yyt-mall-wl/pages/meLogistics/meLogistics.wxml
+++ b/yyt-mall-wl/pages/meLogistics/meLogistics.wxml
@@ -1,4 +1,5 @@
 <!--pages/meLogistics/meLogistics.wxml 自建物流-->
+<!-- <button bindtap="ceshi">测试</button> -->
 <view class="box">
   <view class="top">
     <input type="text" bindinput="inputTextInfo" data-id="barCode" value="{{pipenum}}" />
@@ -8,154 +9,148 @@
   </view>
 
   <!-- <view class="back"> -->
-    <!--样本列表-->
-    <view class="back" style="padding: 10rpx 5;">
-      <view class="con">
-        <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
-      </view>
-      <scroll-view scroll-x scroll-y class="tabel" style="height: 400rpx;">
-        <view class="tr tab-top">
-          <view class="td1">序号</view>
-          <view class="td">样本条码号</view>
-          <view class="td">接收时间</view>
-          <view class="td">样本状态</view>
-          <view class="td">物流员</view>
-          <view class="td">物流单号</view>
-        </view>
-        <view class="tr" wx:for="{{sampleList}}" wx:key="index" data-id="{{index}}" bindtap="goDetail">
-          <view class="td1">{{index + 1}}</view>
-          <view class="td">{{item.barCode}}</view>
-          <view class="td">{{item.createTime}}</view>
-          <view wx:if="{{item.status == 0}}" class="td">未采样</view>
-          <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
-          <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
-          <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
-          <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
-          <view wx:else class="td">其它</view>
-          <view class="td">{{item.logisticsMen}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-        </view>
-      </scroll-view>
+  <!--样本列表-->
+  <view class="back" style="padding: 10rpx 5;">
+    <view class="con">
+      <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
     </view>
-
-
-    <view class="back_img_box">
-      <view class="bush">
-        <view style="flex: 1;">物流车拍照</view>
-        <!-- <button bindtap="bushPhot">拍 照</button> -->
+    <scroll-view scroll-x scroll-y class="tabel" style="height: 400rpx;">
+      <view class="tr tab-top">
+        <view class="td1">序号</view>
+        <view class="td">样本条码号</view>
+        <view class="td">接收时间</view>
+        <view class="td">样本状态</view>
+        <view class="td">物流员</view>
+        <view class="td">物流单号</view>
       </view>
-      <view class="bush-img">
-        <image bindtap="photograph" src="{{poto[0]}}" data-id="car_0"></image>
-        <image bindtap="photograph" src="{{poto[1]}}" data-id="car_1"></image>
-        <image bindtap="photograph" src="{{poto[2]}}" data-id="car_2"></image>
-        <image bindtap="photograph" src="{{poto[3]}}" data-id="car_3"></image>
+      <view class="tr" wx:for="{{sampleList}}" wx:key="index" data-id="{{index}}" bindtap="goDetail">
+        <view class="td1">{{index + 1}}</view>
+        <view class="td">{{item.barCode}}</view>
+        <view class="td">{{item.createTime}}</view>
+        <view wx:if="{{item.status == 0}}" class="td">未采样</view>
+        <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
+        <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
+        <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
+        <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
+        <view wx:else class="td">其它</view>
+        <view class="td">{{item.logisticsMen}}</view>
+        <view class="td">{{item.logisticsNo}}</view>
       </view>
+    </scroll-view>
+  </view>
 
-      <view class="bush">
-        <view style="flex: 1;">转运箱拍照</view>
-        <!-- <button bindtap="bushPhot">拍 照</button> -->
-      </view>
-      <view class="bush-img">
-        <image bindtap="photograph" src="{{poto[4]}}" data-id="box_0"></image>
-        <image bindtap="photograph" src="{{poto[5]}}" data-id="box_1"></image>
-        <image bindtap="photograph" src="{{poto[6]}}" data-id="box_2"></image>
-        <image bindtap="photograph" src="{{poto[7]}}" data-id="box_3"></image>
-      </view>
 
-      <view class="bush">
-        <view style="flex: 1;">样本拍照</view>
-        <!-- <button bindtap="bushPhot">拍 照</button> -->
-      </view>
-      <view class="bush-img">
-        <image bindtap="photograph" src="{{poto[8]}}" data-id="sam_0"></image>
-        <image bindtap="photograph" src="{{poto[9]}}" data-id="sam_1"></image>
-        <image bindtap="photograph" src="{{poto[10]}}" data-id="sam_2"></image>
-        <image bindtap="photograph" src="{{poto[11]}}" data-id="sam_3"></image>
-      </view>
+  <view class="back_img_box">
+    <view class="bush">
+      <view style="flex: 1;">物流车拍照</view>
+      <!-- <button bindtap="bushPhot">拍 照</button> -->
+    </view>
+    <view class="bush-img">
+      <image bindtap="photograph" src="{{poto[0]}}" data-id="car_0"></image>
+      <image bindtap="photograph" src="{{poto[1]}}" data-id="car_1"></image>
+      <image bindtap="photograph" src="{{poto[2]}}" data-id="car_2"></image>
+      <image bindtap="photograph" src="{{poto[3]}}" data-id="car_3"></image>
     </view>
 
-    <!-- <view class="back">
-      <view class="bush">
-        <view style="flex: 1;">转运箱拍照</view>
-      </view>
-      <view class="bush-img">
-        <image bindtap="photograph" src="{{poto[2]}}" data-id="box_1"></image>
-        <image bindtap="photograph" src="{{poto[3]}}" data-id="box_2"></image>
-      </view>
-    </view> -->
+    <view class="bush">
+      <view style="flex: 1;">转运箱拍照</view>
+      <!-- <button bindtap="bushPhot">拍 照</button> -->
+    </view>
+    <view class="bush-img">
+      <image bindtap="photograph" src="{{poto[4]}}" data-id="box_0"></image>
+      <image bindtap="photograph" src="{{poto[5]}}" data-id="box_1"></image>
+      <image bindtap="photograph" src="{{poto[6]}}" data-id="box_2"></image>
+      <image bindtap="photograph" src="{{poto[7]}}" data-id="box_3"></image>
+    </view>
 
-    <view class="form">
+    <view class="bush">
+      <view style="flex: 1;">样本拍照</view>
+      <!-- <button bindtap="bushPhot">拍 照</button> -->
+    </view>
+    <view class="bush-img">
+      <image bindtap="photograph" src="{{poto[8]}}" data-id="sam_0"></image>
+      <image bindtap="photograph" src="{{poto[9]}}" data-id="sam_1"></image>
+      <image bindtap="photograph" src="{{poto[10]}}" data-id="sam_2"></image>
+      <image bindtap="photograph" src="{{poto[11]}}" data-id="sam_3"></image>
+    </view>
+  </view>
 
-      <picker class="from-con" bindchange="bindPickerChange" value="{{insIdx}}" range="{{ins}}">
-        <text>送检机构：</text>
-        <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
-      </picker>
+  <view class="form">
 
-      <view class="from-con">
-        <text>物流单号：</text>
-        <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
-      </view>
+    <!-- <picker class="from-con" bindchange="bindPickerChange" value="{{insIdx}}" range="{{ins}}">
+      <text>送检机构：</text>
+      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
+    </picker> -->
+    <!-- <view class="from-con">
+      <text>送检机构：</text>
+      <input type="text" placeholder="送检机构" placeholder-class="place"  />
+    </view> -->
+
+    <view class="from-con">
+      <text>物流单号：</text>
+      <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
+    </view>
 
-      <!-- <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
+    <!-- <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
         <label>日期：</label>
         <input type="text" disabled="true" placeholder="请选择日期" placeholder-class="place" value="{{date}}" />
       </picker> -->
-      <view class="from-con">
-        <text space="nbsp" style="letter-spacing: 14rpx;">数 量：</text>
-        <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" />
-      </view>
-
-      <picker class="from-con" bindchange="bindbushChange" range="{{bushList}}">
-        <text>运输方式：</text>
-        <input type="text" disabled="true" placeholder="请选择运输方式" placeholder-class="place" value="{{bushList[bush]}}" />
-      </picker>
-
-      <!-- <text>转运箱号：</text> -->
-      <picker class="from-con" bindchange="bindBoxNumber" range="{{boxList}}">
-        <text>转运箱号：</text>
-        <input type="text" disabled="true" placeholder="转运箱号" placeholder-class="place" value="{{boxList[boxIdx]}}" />
-      </picker>
-
-      <!-- <input type="text" bindinput="inputTextInfo" data-id="boxNum" placeholder="转运箱号" placeholder-class="place" value="" /> -->
-
-      <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
-        <label>*</label>
-        <text>出发时间：</text>
-        <input value='{{time}}' placeholder='请选择出发时间' placeholder-class="place" disabled="true" />
-      </picker>
-
-      <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange1" bindcolumnchange="bindMultiPickerColumnChange1" value="{{multiIndex1}}" range="{{multiArray1}}">
-        <label>*</label>
-        <text>到达时间：</text>
-        <input value='{{time1}}' placeholder='请选择到达时间' placeholder-class="place" disabled="true" />
-      </picker>
-
-
-      <!-- 车牌照 -->
-      <picker class="from-con" bindchange="bindNumberplate" range="{{numberplateArr}}">
-        <text>车 牌 号：</text>
-        <input type="text" disabled="true" placeholder="车牌号" placeholder-class="place" value="{{numberplateArr[numberplateIdx]}}" />
-      </picker>
-
-      <view class="from-con">
-        <text space="nbsp">驾 驶 员：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="driverMen" placeholder="驾驶员" placeholder-class="place" value="{{driver}}" />
-      </view>
+    <view class="from-con">
+      <text space="nbsp" style="letter-spacing: 14rpx;">数 量：</text>
+      <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" value="{{number}}" />
+    </view>
 
-      <view class="from-con">
-        <text space="nbsp">物 流 员：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logistician}}" />
-      </view>
+    <picker class="from-con" bindchange="bindbushChange" range="{{bushList}}">
+      <text>运输方式：</text>
+      <input type="text" disabled="true" placeholder="请选择运输方式" placeholder-class="place" value="{{bushList[bush]}}" />
+    </picker>
+
+    <picker class="from-con" bindchange="bindPickerChangeBox" range-key="boxNum" value="{{index}}" range="{{boxArr}}">
+      <text>转运箱号：</text>
+      <input type="text" disabled="true" placeholder="请选择转运箱号" placeholder-class="place" value="{{boxNum}}" />
+    </picker>
+
+    <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
+      <label>*</label>
+      <text>出发时间：</text>
+      <input value='{{time}}' placeholder='请选择出发时间' placeholder-class="place" disabled="true" />
+    </picker>
+
+    <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange1" bindcolumnchange="bindMultiPickerColumnChange1" value="{{multiIndex1}}" range="{{multiArray1}}">
+      <label>*</label>
+      <text>预计到达时间：</text>
+      <input value='{{time1}}' placeholder='请选择到达时间' placeholder-class="place" disabled="true" />
+    </picker>
+
+    <picker class="from-con" bindchange="bindNumberplate" range-key="numberplate" value="{{index}}" range="{{numberplateArr}}">
+      <label>*</label>
+      <text>车 牌 号：</text>
+      <input type="text" disabled="true" placeholder="请选择车牌号" placeholder-class="place" value="{{numberplate}}" />
+    </picker>
+
+    <view class="from-con">
+      <text space="nbsp">驾 驶 员：</text>
+      <input type="text" bindinput="inputTextInfo" data-id="driverMen" placeholder="驾驶员" placeholder-class="place" value="{{driverMen}}" />
+    </view>
 
-      <view class="from-con">
-        <text space="nbsp" style="letter-spacing: 14rpx;">备 注：</text>
-        <input type="text" bindinput="inputTextInfo" data-id="notes" placeholder="备注" placeholder-class="place" value="{{notes}}" />
-      </view>
+    <view class="from-con">
+      <text space="nbsp">物 流 员：</text>
+      <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logisticsMen}}" />
+    </view>
 
+    <view class="from-con">
+      <text space="nbsp" style="letter-spacing: 14rpx;">备 注：</text>
+      <input type="text" bindinput="inputTextInfo" data-id="notes" placeholder="备注" placeholder-class="place" value="{{notes}}" />
     </view>
+
+  </view>
   <!-- </view> -->
 
+  <!-- <view style="display: flex; padding: 50rpx 10rpx;">
+    <button class="out" bindtap="out">退出</button>
+    <button class="save" bindtap="saveInfo">保 存</button>
+  </view> -->
 
-  <button class="bottomButton"bindtap="saveInfo">保 存</button>
+  <button class="bottomButton" bindtap="saveInfo">保 存</button>
 
 </view>
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/meLogistics/meLogistics.wxss b/yyt-mall-wl/pages/meLogistics/meLogistics.wxss
index 3ca6b85..509c3c8 100644
--- a/yyt-mall-wl/pages/meLogistics/meLogistics.wxss
+++ b/yyt-mall-wl/pages/meLogistics/meLogistics.wxss
@@ -204,4 +204,17 @@
   white-space: nowrap;
   padding: 0rpx 2rpx;
   min-width: 100rpx;
+}
+
+.out{
+  background-color: #ddd;
+  width: 300rpx !important;
+  border-radius: 50rpx;
+  border: 1rpx #dad7d7 solid;
+}
+.save{
+  background-color: #4eb8b9;
+  width: 300rpx !important;
+  color: #fff;
+  border-radius: 50rpx;
 }
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/queryfrei/queryfrei.js b/yyt-mall-wl/pages/queryfrei/queryfrei.js
index ee5b9f4..fdb7dbc 100644
--- a/yyt-mall-wl/pages/queryfrei/queryfrei.js
+++ b/yyt-mall-wl/pages/queryfrei/queryfrei.js
@@ -29,18 +29,21 @@ Page({
         isShow:false,
       },
     ],
-
+    institutionNoArr:[],//送检机构数组
+    orgName:'',//送检机构名称
+    institutionNo:'',//送检机构编号
+    boxNum: '', //转运箱号
+    logisticsMen: '', //物流员
+    logisticsNo: '', //物流单号
     date: '', //开始时间
-    endDate: '',
+    endDate: '',//结束时间
+    timeFarme:'',//时间范围
+    sampleList: [], //查询列表
+
+
+    
     start: '2023-01-01',
     end: '',
-    logisticsNo: '', //物流单号
-    ins: [],
-    insName: '', //机构名称
-    insIdx: '', //默认机构所选下标
-    logisticsMen: '', //物流员
-    boxNum: '', //转运箱号
-    sampleList: [], //查询列表
     sampleCount: '', //查询记录总数
   },
 
@@ -52,23 +55,28 @@ Page({
   },
 
   selectDate(e){
-    console.log(e.currentTarget.dataset.id);
     var id=e.currentTarget.dataset.id
     var dateList=this.data.dateList
     for(var i in dateList){
       if(dateList[i].id==id){
         dateList[i].isShow=true
+        this.setData({
+          timeFarme:dateList[i].id
+        })
       }else{
         dateList[i].isShow=false
       }
     }
     this.setData({
-      dateList:dateList
+      dateList:dateList,
+      date: '', 
+      endDate: '',
     })
   },
 
   //筛选确定
   okDate(){
+    this.selSampleList()
     this.setData({
       screenisshow:false
     })
@@ -84,6 +92,8 @@ Page({
       dateList:dateList,
       date: '', 
       endDate: '',
+      timeFarme:'',
+      sampleList:[]
     })
   },
 
@@ -97,16 +107,28 @@ Page({
 
   //开始时间
   bindDateChange(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      date: e.detail.value
+      date: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
     })
   },
   //结束时间
   bindDateChangeend(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      endDate: e.detail.value
+      endDate: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
     })
   },
 
@@ -127,8 +149,8 @@ Page({
   //送检机构
   bindPickerChange(e) {
     this.setData({
-      insName: this.data.ins[e.detail.value],
-      insIdx: e.detail.value
+      orgName:this.data.institutionNoArr[e.detail.value].orgName,
+      institutionNo:this.data.institutionNoArr[e.detail.value].id
     })
   },
 
@@ -141,17 +163,24 @@ Page({
 
   //查询底部列表数据
   selSampleList() {
-
+    console.log(this.data.logisticsNo);
     var reqData = {
-      'startDate': this.data.date,
-      'endDate': this.data.endDate,
-      'logisticsNo': this.data.logisticsNo,
-      'institutionNo': this.data.ins[this.data.insIdx],
-      'logisticsMen': this.data.logisticsMen,
-      'boxNum': this.data.boxNum
+      'logisticsWay':"3",//物流方式1自建2第三方3货运
+      'unitType':'',//物流单位
+      'institutionNo':this.data.institutionNo,//送检机构编号
+      'boxNum': this.data.boxNum, //转运箱号
+      'boxId':'',//转运箱id
+      'logisticsMen': this.data.logisticsMen, //物流员
+      'logisticsNo': this.data.logisticsNo, //物流单号
+      'startDate': this.data.date, //开始时间
+      'endDate': this.data.endDate,//结束时间
+      'rangeType':this.data.timeFarme,//时间范围
     }
-    request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
+    request.post(`/logistics/selectInfoLogistics?pageNum=1&pageSize=9999`, reqData).then(res => {
       if(res.data.data.length == 0){
+        this.setData({
+          sampleList:[]
+        })
         wx.showToast({
           title: '无查询结果',
           icon: 'error'
@@ -161,6 +190,7 @@ Page({
           sampleList: res.data.data,
           sampleCount: res.data.data.length
         })
+        console.log(this.data.sampleList);
       }
     })
   },
@@ -169,10 +199,15 @@ Page({
   resetting() {
     this.currentTime()
     this.setData({
-      logisticsNo: '',
-      insName: '',
-      logisticsMen: '',
-      boxNum: ''
+      sampleList:[],//查询结果列表
+      orgName:'',
+      institutionNo:'',//送检机构编号
+      boxNum: '', //转运箱号
+      logisticsMen: '', //物流员
+      logisticsNo: '', //物流单号
+      date: '', //开始时间
+      endDate: '',//结束时间
+      timeFarme:'',//时间范围
     })
   },
 
@@ -193,21 +228,13 @@ Page({
   onLoad(options) {
     // this.currentTime()
 
-
     //获取送检机构列表
     request.post(`/institution/selectInstitution`).then(res => {
-      var array = res.data.data
-      var tempArr = []
-      for (let index = 0; index < array.length; index++) {
-        tempArr.push(array[index].orgName)
-      }
       this.setData({
-        ins: tempArr
+        institutionNoArr: res.data.data
       })
-
-      //查询物流批次列表
-      // this.selSampleList();
     })
+    
   },
 
 
diff --git a/yyt-mall-wl/pages/queryfrei/queryfrei.wxml b/yyt-mall-wl/pages/queryfrei/queryfrei.wxml
index 74cf0dc..9655865 100644
--- a/yyt-mall-wl/pages/queryfrei/queryfrei.wxml
+++ b/yyt-mall-wl/pages/queryfrei/queryfrei.wxml
@@ -33,18 +33,21 @@
   </view>
 
   <view class="form">
-    <picker class="from-con" bindchange="bindPickerChange" value="{{insName}}" range="{{ins}}">
+    <picker class="from-con" bindchange="bindPickerChange" range-key="orgName" value="{{index}}" range="{{institutionNoArr}}">
       <label>送检机构：</label>
-      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
+      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{orgName}}" />
     </picker>
+
     <view class="from-con">
       <label>转运箱号：</label>
       <input type="text" placeholder="转运箱号" placeholder-class="place" bindinput="bindBoxNum" value="{{boxNum}}" />
     </view>
+
     <view class="from-con">
       <label style="letter-spacing: 8rpx;">物流员：</label>
       <input type="text" placeholder="物流员" placeholder-class="place" bindinput="bindLogisticsMen" value="{{logisticsMen}}" />
     </view>
+
     <view class="from-button">
       <button style="height: 65rpx;background-color: #eeeaea; border: 1rpx #f0eeee solid; border-radius: 50rpx;" bindtap="resetting">重 置</button>
       <button style="height: 65rpx;background-color: #63bec0; color: #fff; border-radius: 50rpx; border: 1rpx #f0eeee solid;" bindtap="selSampleList">查 询</button>
@@ -53,78 +56,36 @@
   </view>
 
   <view class="tabel">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx;">
+    <scroll-view scroll-x scroll-y style="width: 100%; height: 400rpx;  border: 1rpx #ddd solid;">
       <view class="tr top">
         <view class="td td1">序号</view>
         <view class="td">转运方式</view>
         <view class="td">转运箱号</view>
-        <view class="td td_date">数 量</view>
-        <view class="td">日 期</view>
-        <view class="td">物流电话</view>
+        <view class="td">数 量</view>
+        <view class="td td_date">日 期</view>
+        <view class="td td_date">物流电话</view>
         <view class="td">物流费用</view>
         <view class="td td_time">到达时间</view>
-        <view class="td td_time">车牌号</view>
+        <view class="td">车牌号</view>
         <view class="td">物流员</view>
         <view class="td">备注</view>
       </view>
 
-      <block wx:for="{{sampleList}}" wx:key="index">
-        <view class="tr">
-          <view class="td td1">{{index + 1}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-          <view class="td">{{item.institutionName}}</view>
-          <view class="td td_date">{{item.entryDate}}</view>
-          <view class="td">{{item.number}}</view>
-          <block>
-            <view class="td" wx:if="{{item.tranType == 1}}">私家车</view>
-            <view class="td" wx:else>其他</view>
-          </block>
-          <view class="td">{{item.boxNum}}</view>
-          <view class="td td_time">{{item.startTime}}</view>
-          <view class="td td_time">{{item.endTime}}</view>
-          <view class="td">{{itme.numberplate}}</view>
-          <view class="td">{{itme.notes}}</view>
-        </view>
-      </block>
-    </scroll-view>
-  </view>
-
-  <!-- <view class="tabel">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx;">
-      <view class="tr top">
-        <view class="td td1">序号</view>
-        <view class="td">物流单号</view>
-        <view class="td">送检机构</view>
-        <view class="td td_date">日期</view>
-        <view class="td">样本管数</view>
-        <view class="td">转运方式</view>
-        <view class="td">转运箱号</view>
-        <view class="td td_time">出发时间</view>
-        <view class="td td_time">到达时间</view>
-        <view class="td">车牌号</view>
-        <view class="td">备注</view>
+      <view class="tr" wx:for="{{sampleList}}" wx:key="index">
+        <view class="td td1"> {{index + 1}}</view>
+        <view class="td"> {{item.tranType==1?'私家车':'' || item.tranType==2?'大巴':'' || item.tranType==3?'顺丰':'' || item.tranType==1?'其他':''}}</view>
+        <view class="td"> {{item.boxPlateNumber}}</view>
+        <view class="td"> {{item.number}}</view>
+        <view class="td td_date"> {{item.entryDate}}</view>
+        <view class="td td_date"> {{item.phone}}</view>
+        <view class="td"> {{item.cost}}</view>
+        <view class="td td_time"> {{item.expectedEndTime}}</view>
+        <view class="td"> {{item.carPlateNumber}}</view>
+        <view class="td"> {{item.logisticsMen}}</view>
+        <view class="td"> {{item.notes}}</view>
       </view>
-
-      <block wx:for="{{sampleList}}" wx:key="index">
-        <view class="tr">
-          <view class="td td1">{{index + 1}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-          <view class="td">{{item.institutionName}}</view>
-          <view class="td td_date">{{item.entryDate}}</view>
-          <view class="td">{{item.number}}</view>
-          <block>
-            <view class="td" wx:if="{{item.tranType == 1}}">私家车</view>
-            <view class="td" wx:else>其他</view>
-          </block>
-          <view class="td">{{item.boxNum}}</view>
-          <view class="td td_time">{{item.startTime}}</view>
-          <view class="td td_time">{{item.endTime}}</view>
-          <view class="td">{{itme.numberplate}}</view>
-          <view class="td">{{itme.notes}}</view>
-        </view>
-      </block>
     </scroll-view>
-  </view> -->
+  </view>
 
   <button class="out" bindtap="out">退 出</button>
 </view>
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/queryfrei/queryfrei.wxss b/yyt-mall-wl/pages/queryfrei/queryfrei.wxss
index c093330..af20b95 100644
--- a/yyt-mall-wl/pages/queryfrei/queryfrei.wxss
+++ b/yyt-mall-wl/pages/queryfrei/queryfrei.wxss
@@ -51,9 +51,7 @@ page{
 .tabel{
   background-color: #fff;
   border-radius: 15rpx;margin-top: 15rpx; 
-  padding: 30rpx 10rpx 50rpx 10rpx;
-  padding: 20rpx;
-  /* border: 1rpx #ebeaea solid; */
+  padding: 50rpx 15rpx 100rpx 15rpx;
   box-shadow: 0 0 10px #ddd;
 }
 .tr{
@@ -75,6 +73,7 @@ page{
   flex-wrap: nowrap;
   white-space: nowrap;
   min-width: 150rpx;
+  overflow: hidden;
 }
 .top view{
   background-color: #6bc9ca;
diff --git a/yyt-mall-wl/pages/queryhandover/queryhandover.js b/yyt-mall-wl/pages/queryhandover/queryhandover.js
index ae145c1..b26ca46 100644
--- a/yyt-mall-wl/pages/queryhandover/queryhandover.js
+++ b/yyt-mall-wl/pages/queryhandover/queryhandover.js
@@ -1,4 +1,5 @@
 // pages/queryhandover/queryhandover.js
+var request=require('../../utils/http')
 Page({
 
   /**
@@ -31,6 +32,9 @@ Page({
 
     date: '', //开始时间
     endDate: '',
+    rangeType :'',//时间类型
+    listobj:'',
+    list:''
   },
 
   //筛选--------------------------
@@ -47,17 +51,23 @@ Page({
     for(var i in dateList){
       if(dateList[i].id==id){
         dateList[i].isShow=true
+        this.setData({
+          rangeType:dateList[i].id
+        })
       }else{
         dateList[i].isShow=false
       }
     }
     this.setData({
-      dateList:dateList
+      dateList:dateList,
+      date: '', 
+      endDate: '',
     })
   },
 
   //筛选确定
   okDate(){
+    this.getlist()
     this.setData({
       screenisshow:false
     })
@@ -72,7 +82,10 @@ Page({
     this.setData({
       dateList:dateList,
       date: '', 
+      rangeType:'',
       endDate: '',
+      list:'',
+      listobj:'',
     })
   },
   //-------------------------------
@@ -80,15 +93,27 @@ Page({
   //开始时间
   bindDateChange(e) {
     // console.log(e.detail.value)
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     this.setData({
-      date: e.detail.value
+      date: e.detail.value,
+      rangeType:5,
+      dateList:dateList
     })
   },
   //结束时间
   bindDateChangeend(e) {
     // console.log(e.detail.value)
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     this.setData({
-      endDate: e.detail.value
+      endDate: e.detail.value,
+      rangeType:5,
+      dateList:dateList
     })
   },
 
@@ -99,6 +124,22 @@ Page({
     })
   },
 
+  getlist(){
+    var params={
+      "startDate": this.data.date,
+      "endDate" :this.data.endDate,
+      "rangeType":this.data.rangeType
+    }
+    request.post('/batch/logisticsHandoverList?pageNum=1&pageSize=9999',params).then(res=>{
+      this.setData({
+        listobj:res.data.data,
+        list:res.data.data.maps
+      })
+      // console.log(JSON.stringify(this.data.list));
+      console.log(this.data.list);
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
diff --git a/yyt-mall-wl/pages/queryhandover/queryhandover.wxml b/yyt-mall-wl/pages/queryhandover/queryhandover.wxml
index c845c58..70cc658 100644
--- a/yyt-mall-wl/pages/queryhandover/queryhandover.wxml
+++ b/yyt-mall-wl/pages/queryhandover/queryhandover.wxml
@@ -34,30 +34,30 @@
 
   <view class="back">
     <view class="tabtop">
-      <text>物流单总数量：0</text>
-      <text>样本总数量：0</text>
-      <text>总费用：￥0</text>
+      <text>物流单总数量：{{listobj.logisticsCount}}</text>
+      <text>样本总数量：{{listobj.sampleCount}}</text>
+      <text>总费用：{{listobj.costSum}}</text>
     </view>
 
     <view class="tabel">
-      <scroll-view scroll-x style="width: 100%; height: 500rpx;">
+      <scroll-view scroll-x scroll-y style="width: 100%; height: 700rpx;">
         <view class="tr top">
           <!-- <view class="td  td_date">日 期</view> -->
-          <view class="td">物流单号</view>
+          <view class="td td3">物流单号</view>
           <view class="td">物流类型</view>
           <view class="td">转运方式</view>
           <view class="td">样本数量</view>
           <view class="td td1">费 用</view>
         </view>
 
-        <block>
-          <view class="tr">
-            <!-- <view class="td  td_date">2023-10-05</view> -->
-            <!-- <view class="td">1234567894</view>
-            <view class="td">自建物流</view>
-            <view class="td">车辆</view>
-            <view class="td">50</view>
-            <view class="td td1">￥100</view> -->
+        <block wx:for="{{list}}" wx:key="index">
+          <view class="datatop">{{item.date}}</view>
+          <view class="tr" wx:for="{{item.logisticsHandoverList}}" wx:for-item='item1' wx:for-index='index' wx:key="index">
+            <view class="td td3">{{item1.logisticsNo}}</view>
+            <view class="td">{{item1.logisticsWay==1?'自建物流':'' || item1.logisticsWay==2?'第三方物流':'' || item1.logisticsWay==1?'货运物流':''}}</view>
+            <view class="td">陆运</view>
+            <view class="td">{{item1.childTableCount}}</view>
+            <view class="td td1">{{item1.cost}}</view>
           </view>
         </block>
       </scroll-view>
diff --git a/yyt-mall-wl/pages/queryhandover/queryhandover.wxss b/yyt-mall-wl/pages/queryhandover/queryhandover.wxss
index ca68e4c..2856484 100644
--- a/yyt-mall-wl/pages/queryhandover/queryhandover.wxss
+++ b/yyt-mall-wl/pages/queryhandover/queryhandover.wxss
@@ -108,6 +108,7 @@
   margin-top: 10rpx;
   text-align: center;
   box-shadow: 0 0 10px #ddd;
+  padding-bottom:100rpx;
 
 }
 .tabtop{
@@ -147,6 +148,20 @@
   flex-wrap: nowrap;
   white-space: nowrap;
   min-width: 150rpx;
+  overflow: hidden;
+}
+.datatop{
+  box-shadow: inset 0 0 8px rgb(180, 178, 178,0.7);
+  border-right: 1rpx #ddd solid;
+  border-bottom: 1rpx #ddd solid;
+  padding: 15rpx 0;
+  font-size: 24rpx;
+  background-color: #eee;
+  color: #666;
+  font-weight: 700;
+  width: 110%;
+  text-align: left;
+  padding-left:10rpx ;
 }
 .top view{
   background-color: #6bc9ca;
@@ -157,6 +172,9 @@
 .td1{
   min-width: 100rpx !important;
 }
+.td3{
+  min-width: 220rpx !important;
+}
 .td_date{
   min-width: 200rpx !important;
 }
diff --git a/yyt-mall-wl/pages/queryme/queryme.js b/yyt-mall-wl/pages/queryme/queryme.js
index 18e6dfd..64a6d14 100644
--- a/yyt-mall-wl/pages/queryme/queryme.js
+++ b/yyt-mall-wl/pages/queryme/queryme.js
@@ -29,17 +29,22 @@ Page({
         isShow:false,
       },
     ],
+    institutionNoArr:[],//送检机构数组
+    orgName:'',//送检机构名称
+    institutionNo:'',//送检机构编号
+    boxArr:[],//转运箱列表
+    boxId:'',//转运箱id
+    boxNum: '', //转运箱号
+    logisticsMen: '', //物流员
+    logisticsNo: '', //物流单号
     date: '', //开始时间
-    endDate: '',
+    endDate: '',//结束时间
+    timeFarme:'',//时间范围
+    sampleList: [], //查询列表
+
+
     start: '2023-01-01',
     end: '',
-    logisticsNo: '', //物流单号
-    ins: [],
-    insName: '', //机构名称
-    insIdx: '', //默认机构所选下标
-    logisticsMen: '', //物流员
-    boxNum: '', //转运箱号
-    sampleList: [], //查询列表
     sampleCount: '', //查询记录总数
   },
 
@@ -51,23 +56,28 @@ Page({
   },
 
   selectDate(e){
-    console.log(e.currentTarget.dataset.id);
     var id=e.currentTarget.dataset.id
     var dateList=this.data.dateList
     for(var i in dateList){
       if(dateList[i].id==id){
         dateList[i].isShow=true
+        this.setData({
+          timeFarme:dateList[i].id
+        })
       }else{
         dateList[i].isShow=false
       }
     }
     this.setData({
-      dateList:dateList
+      dateList:dateList,
+      date: '', 
+      endDate: '',
     })
   },
 
   //筛选确定
   okDate(){
+    this.selSampleList()
     this.setData({
       screenisshow:false
     })
@@ -83,6 +93,8 @@ Page({
       dateList:dateList,
       date: '', 
       endDate: '',
+      timeFarme:'',
+      sampleList:[]
     })
   },
 
@@ -96,16 +108,28 @@ Page({
 
   //开始时间
   bindDateChange(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      date: e.detail.value
+      date: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
     })
   },
   //结束时间
   bindDateChangeend(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      endDate: e.detail.value
+      endDate: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
     })
   },
 
@@ -116,18 +140,25 @@ Page({
     })
   },
 
-  //转运箱号
-  bindBoxNum(e) {
+  // //转运箱号
+  // bindBoxNum(e) {
+  //   this.setData({
+  //     boxNum: e.detail.value
+  //   })
+  // },
+  //转运箱
+  bindPickerChangeBox(e){
     this.setData({
-      boxNum: e.detail.value
+      boxNum:this.data.boxArr[e.detail.value].boxNum,
+      boxId:this.data.boxArr[e.detail.value].id
     })
   },
 
   //送检机构
   bindPickerChange(e) {
     this.setData({
-      insName: this.data.ins[e.detail.value],
-      insIdx: e.detail.value
+      orgName:this.data.institutionNoArr[e.detail.value].orgName,
+      institutionNo:this.data.institutionNoArr[e.detail.value].id
     })
   },
 
@@ -140,17 +171,23 @@ Page({
 
   //查询底部列表数据
   selSampleList() {
-
     var reqData = {
-      'startDate': this.data.date,
-      'endDate': this.data.endDate,
-      'logisticsNo': this.data.logisticsNo,
-      'institutionNo': this.data.ins[this.data.insIdx],
-      'logisticsMen': this.data.logisticsMen,
-      'boxNum': this.data.boxNum
+      'logisticsWay':"1",//物流方式1自建2第三方3货运
+      'unitType':'',//物流单位
+      'institutionNo':this.data.institutionNo,//送检机构编号
+      'boxNum': '', //转运箱号
+      'boxId':this.data.boxId,//转运箱id
+      'logisticsMen': this.data.logisticsMen, //物流员
+      'logisticsNo': this.data.logisticsNo, //物流单号
+      'startDate': this.data.date, //开始时间
+      'endDate': this.data.endDate,//结束时间
+      'rangeType':this.data.timeFarme,//时间范围
     }
-    request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
+    request.post(`/logistics/selectInfoLogistics?pageNum=1&pageSize=9999`, reqData).then(res => {
       if(res.data.data.length == 0){
+        this.setData({
+          sampleList:[]
+        })
         wx.showToast({
           title: '无查询结果',
           icon: 'error'
@@ -160,6 +197,7 @@ Page({
           sampleList: res.data.data,
           sampleCount: res.data.data.length
         })
+        console.log(this.data.sampleList);
       }
     })
   },
@@ -168,10 +206,16 @@ Page({
   resetting() {
     this.currentTime()
     this.setData({
-      logisticsNo: '',
-      insName: '',
-      logisticsMen: '',
-      boxNum: ''
+      sampleList:[],//查询结果列表
+      orgName:'',
+      institutionNo:'',//送检机构编号
+      boxNum: '', //转运箱号
+      boxId:'',
+      logisticsMen: '', //物流员
+      logisticsNo: '', //物流单号
+      date: '', //开始时间
+      endDate: '',//结束时间
+      timeFarme:'',//时间范围
     })
   },
 
@@ -192,20 +236,17 @@ Page({
   onLoad(options) {
     // this.currentTime()
 
-
     //获取送检机构列表
     request.post(`/institution/selectInstitution`).then(res => {
-      var array = res.data.data
-      var tempArr = []
-      for (let index = 0; index < array.length; index++) {
-        tempArr.push(array[index].orgName)
-      }
       this.setData({
-        ins: tempArr
+        institutionNoArr: res.data.data
+      })
+    })
+    //转运箱
+    request.post(`/box/selectTranBox`).then(res => {
+      this.setData({
+        boxArr:res.data.data
       })
-
-      //查询物流批次列表
-      // this.selSampleList();
     })
   },
 
diff --git a/yyt-mall-wl/pages/queryme/queryme.wxml b/yyt-mall-wl/pages/queryme/queryme.wxml
index 599d1ad..6ad33c7 100644
--- a/yyt-mall-wl/pages/queryme/queryme.wxml
+++ b/yyt-mall-wl/pages/queryme/queryme.wxml
@@ -34,22 +34,22 @@
   </view>
 
   <view class="form">
-    <!-- <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChange" class="from-con">
-      <label>选择日期：</label>
-      <input type="text" disabled="true" placeholder="请选择开始日期" placeholder-class="place" value="{{date}}" />
-    </picker>
-    <picker mode="date" value="date" start="start" end="end" bindchange="bindDateChangeend" class="from-con">
-      <label> </label>
-      <input type="text" disabled="true" placeholder="请选择结束日期" placeholder-class="place" value="{{endDate}}" />
-    </picker> -->
-    <picker class="from-con" bindchange="bindPickerChange" value="{{insName}}" range="{{ins}}">
+  
+    <picker class="from-con" bindchange="bindPickerChange" range-key="orgName" value="{{index}}" range="{{institutionNoArr}}">
       <label>送检机构：</label>
-      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
+      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{orgName}}" />
     </picker>
-    <view class="from-con">
+
+
+    <!-- <view class="from-con">
       <label>转运箱号：</label>
       <input type="text" placeholder="转运箱号" placeholder-class="place" bindinput="bindBoxNum" value="{{boxNum}}" />
-    </view>
+    </view> -->
+    <picker class="from-con" bindchange="bindPickerChangeBox" range-key="boxNum" value="{{index}}" range="{{boxArr}}">
+      <label>转运箱号：</label>
+      <input type="text" disabled="true" placeholder="请选择转运箱号" placeholder-class="place" value="{{boxNum}}" />
+    </picker>
+
     <view class="from-con">
       <label style="letter-spacing: 8rpx;">物流员：</label>
       <input type="text" placeholder="物流员" placeholder-class="place" bindinput="bindLogisticsMen" value="{{logisticsMen}}" />
@@ -63,78 +63,37 @@
   </view>
 
   <view class="tabel">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx;">
+    <scroll-view scroll-x scroll-y style="width: 100%; height: 400rpx; border: 1rpx #ddd solid;">
       <view class="tr top">
         <view class="td td1">序 号</view>
         <view class="td">送检机构</view>
-        <view class="td">物流单号</view>
-        <view class="td td_date">数 量</view>
-        <view class="td td2">运输方式</view>
+        <view class="td td_date">物流单号</view>
+        <view class="td">数 量</view>
+        <view class="td">运输方式</view>
         <view class="td">转运箱号</view>
         <view class="td td_time">预计出发时间</view>
-        <view class="td td_time">到达时间</view>
+        <view class="td td_time">预计到达时间</view>
         <view class="td">车牌号</view>
         <view class="td">驾驶员</view>
         <view class="td">物流员</view>
         <view class="td" style="border-right: none;">备 注</view>
       </view>
-
-      <block wx:for="{{sampleList}}" wx:key="index">
-        <view class="tr">
-          <view class="td td1">{{index + 1}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-          <view class="td">{{item.institutionName}}</view>
-          <view class="td td_date">{{item.createTime}}</view>
-          <view class="td td2">{{item.number}}</view>
-          <block>
-            <view class="td" wx:if="{{item.tranType == 1}}">自建物流</view>
-            <view class="td" wx:else>其他</view>
-          </block>
-          <view class="td">{{item.boxNum}}</view>
-          <view class="td td_time">{{item.startTime}}</view>
-          <view class="td td_time">{{item.collTime == '' ? '未核收':item.collTime}}</view>
-          <view class="td">{{itme.numberplate}}</view>
-          <view class="td">{{itme.notes}}</view>
-        </view>
-      </block>
+      <view class="tr" wx:for="{{sampleList}}" wx:key="index">
+        <view class="td td1">{{index + 1}}</view>
+        <view class="td"> {{item.institutionName}}</view>
+        <view class="td td_date">{{item.logisticsNo}}</view>
+        <view class="td">{{item.number}}</view>
+        <view class="td">自建物流</view>
+        <view class="td">{{item.boxPlateNumber}}</view>
+        <view class="td td_time">{{item.startTime}}</view>
+        <view class="td td_time">{{item.expectedEndTime}}</view>
+        <view class="td">{{item.carPlateNumber}}</view>
+        <view class="td">{{item.driverMen}}</view>
+        <view class="td">{{item.logisticsMen}}</view>
+        <view class="td" style="border-right: none;">{{item.notes}}</view>
+      </view>
     </scroll-view>
   </view>
 
-  <!-- <view class="tabel">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx;">
-      <view class="tr top">
-        <view class="td td1">序号</view>
-        <view class="td">物流单号</view>
-        <view class="td">送检机构</view>
-        <view class="td td_date">创建日期</view>
-        <view class="td td2">样本管数</view>
-        <view class="td">转运方式</view>
-        <view class="td">转运箱号</view>
-        <view class="td td_time">预计出发时间</view>
-        <view class="td td_time">到达时间</view>
-        <view class="td">车牌号</view>
-        <view class="td" style="border-right: none;">备注</view>
-      </view>
-
-      <block wx:for="{{sampleList}}" wx:key="index">
-        <view class="tr">
-          <view class="td td1">{{index + 1}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-          <view class="td">{{item.institutionName}}</view>
-          <view class="td td_date">{{item.createTime}}</view>
-          <view class="td td2">{{item.number}}</view>
-          <block>
-            <view class="td" wx:if="{{item.tranType == 1}}">自建物流</view>
-            <view class="td" wx:else>其他</view>
-          </block>
-          <view class="td">{{item.boxNum}}</view>
-          <view class="td td_time">{{item.startTime}}</view>
-          <view class="td td_time">{{item.collTime == '' ? '未核收':item.collTime}}</view>
-          <view class="td">{{itme.numberplate}}</view>
-          <view class="td">{{itme.notes}}</view>
-        </view>
-      </block>
-    </scroll-view>
-  </view> -->
   <button class="out" bindtap="out">退 出</button>
 </view>
\ No newline at end of file
diff --git a/yyt-mall-wl/pages/queryme/queryme.wxss b/yyt-mall-wl/pages/queryme/queryme.wxss
index 9d50faf..1c9ddb7 100644
--- a/yyt-mall-wl/pages/queryme/queryme.wxss
+++ b/yyt-mall-wl/pages/queryme/queryme.wxss
@@ -51,9 +51,7 @@ page{
 .tabel{
   background-color: #fff;
   border-radius: 15rpx;margin-top: 15rpx; 
-  padding: 30rpx 10rpx 50rpx 10rpx;
-  padding: 20rpx;
-  /* border: 1rpx #ebeaea solid; */
+  padding: 50rpx 15rpx 100rpx 15rpx;
   box-shadow: 0 0 10px #ddd;
 }
 .tr{
@@ -75,9 +73,9 @@ page{
   flex-wrap: nowrap;
   white-space: nowrap;
   min-width: 200rpx;
+  overflow: hidden;
   
 }
-
 .top view{
   background-color: #6bc9ca;
   color: #fff;
diff --git a/yyt-mall-wl/pages/querythree/querythree.js b/yyt-mall-wl/pages/querythree/querythree.js
index 0537a85..5aa99db 100644
--- a/yyt-mall-wl/pages/querythree/querythree.js
+++ b/yyt-mall-wl/pages/querythree/querythree.js
@@ -29,18 +29,24 @@ Page({
         isShow:false,
       },
     ],
-
+    unitTypeArr:[],//物流单位列表
+    unitType:'',//物流单位id
+    unitType1:'',//物流单位
+    institutionNoArr:[],//送检机构数组
+    orgName:'',//送检机构名称
+    institutionNo:'',//送检机构编号
     date: '', //开始时间
     endDate: '',
-    start: '2023-01-01',
-    end: '',
+    timeFarme:'',//时间范围
     logisticsNo: '', //物流单号
-    ins: [],
-    insName: '', //机构名称
-    insIdx: '', //默认机构所选下标
     logisticsMen: '', //物流员
     boxNum: '', //转运箱号
     sampleList: [], //查询列表
+
+
+
+    start: '2023-01-01',
+    end: '',
     sampleCount: '', //查询记录总数
   },
 
@@ -52,23 +58,28 @@ Page({
   },
 
   selectDate(e){
-    console.log(e.currentTarget.dataset.id);
     var id=e.currentTarget.dataset.id
     var dateList=this.data.dateList
     for(var i in dateList){
       if(dateList[i].id==id){
         dateList[i].isShow=true
+        this.setData({
+          timeFarme:dateList[i].id
+        })
       }else{
         dateList[i].isShow=false
       }
     }
     this.setData({
-      dateList:dateList
+      dateList:dateList,
+      date: '', 
+      endDate: '',
     })
   },
 
   //筛选确定
   okDate(){
+    this.selSampleList()
     this.setData({
       screenisshow:false
     })
@@ -84,6 +95,8 @@ Page({
       dateList:dateList,
       date: '', 
       endDate: '',
+      timeFarme:'',
+      sampleList:[]
     })
   },
 
@@ -97,16 +110,36 @@ Page({
 
   //开始时间
   bindDateChange(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      date: e.detail.value
+      date: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
     })
   },
   //结束时间
   bindDateChangeend(e) {
+    var dateList=this.data.dateList
+    for(var i in dateList){
+      dateList[i].isShow=false
+    }
     // console.log(e.detail.value)
     this.setData({
-      endDate: e.detail.value
+      endDate: e.detail.value,
+      timeFarme:5,
+      dateList:dateList
+    })
+  },
+
+  //物流单位
+  bindPickerChangeunitType(e) {
+    this.setData({
+      unitType1:this.data.unitTypeArr[e.detail.value].dictLabel,
+      unitType:this.data.unitTypeArr[e.detail.value].dictValue
     })
   },
 
@@ -127,8 +160,8 @@ Page({
   //送检机构
   bindPickerChange(e) {
     this.setData({
-      insName: this.data.ins[e.detail.value],
-      insIdx: e.detail.value
+      orgName:this.data.institutionNoArr[e.detail.value].orgName,
+      institutionNo:this.data.institutionNoArr[e.detail.value].id
     })
   },
 
@@ -141,17 +174,23 @@ Page({
 
   //查询底部列表数据
   selSampleList() {
-
     var reqData = {
-      'startDate': this.data.date,
-      'endDate': this.data.endDate,
-      'logisticsNo': this.data.logisticsNo,
-      'institutionNo': this.data.ins[this.data.insIdx],
-      'logisticsMen': this.data.logisticsMen,
-      'boxNum': this.data.boxNum
+      'logisticsWay':"2",//物流方式1自建2第三方3货运
+      'unitType':this.data.unitType,//物流单位
+      'institutionNo':this.data.institutionNo,//送检机构编号
+      'boxNum': this.data.boxNum, //转运箱号
+      'boxId':'',//转运箱id
+      'logisticsMen': this.data.logisticsMen, //物流员
+      'logisticsNo': this.data.logisticsNo, //物流单号
+      'startDate': this.data.date, //开始时间
+      'endDate': this.data.endDate,//结束时间
+      'rangeType':this.data.timeFarme,//时间范围
     }
-    request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
+    request.post(`/logistics/selectInfoLogistics?pageNum=1&pageSize=9999`, reqData).then(res => {
       if(res.data.data.length == 0){
+        this.setData({
+          sampleList:[]
+        })
         wx.showToast({
           title: '无查询结果',
           icon: 'error'
@@ -161,6 +200,7 @@ Page({
           sampleList: res.data.data,
           sampleCount: res.data.data.length
         })
+        console.log(this.data.sampleList);
       }
     })
   },
@@ -169,10 +209,17 @@ Page({
   resetting() {
     this.currentTime()
     this.setData({
-      logisticsNo: '',
-      insName: '',
-      logisticsMen: '',
-      boxNum: ''
+      unitType:'',//物流单位id
+      unitType1:'',//物流单位
+      orgName:'',//送检机构名称
+      institutionNo:'',//送检机构编号
+      date: '', //开始时间
+      endDate: '',
+      timeFarme:'',//时间范围
+      logisticsNo: '', //物流单号
+      logisticsMen: '', //物流员
+      boxNum: '', //转运箱号
+      sampleList: [], //查询列表
     })
   },
 
@@ -194,19 +241,21 @@ Page({
     // this.currentTime()
 
 
+
+
+
     //获取送检机构列表
     request.post(`/institution/selectInstitution`).then(res => {
-      var array = res.data.data
-      var tempArr = []
-      for (let index = 0; index < array.length; index++) {
-        tempArr.push(array[index].orgName)
-      }
       this.setData({
-        ins: tempArr
+        institutionNoArr: res.data.data
       })
+    })
 
-      //查询物流批次列表
-      // this.selSampleList();
+    //物流单位
+    request.get(`/dict/type/unit_type`).then(res => {
+      this.setData({
+        unitTypeArr:res.data.data
+      })
     })
   },
 
diff --git a/yyt-mall-wl/pages/querythree/querythree.wxml b/yyt-mall-wl/pages/querythree/querythree.wxml
index 79ba26f..00d71c3 100644
--- a/yyt-mall-wl/pages/querythree/querythree.wxml
+++ b/yyt-mall-wl/pages/querythree/querythree.wxml
@@ -35,13 +35,14 @@
 
 
   <view class="form">
-    <picker class="from-con">
+    <picker class="from-con" bindchange="bindPickerChangeunitType" range-key="dictLabel" value="{{index}}" range="{{unitTypeArr}}">
       <label>物流单位：</label>
-      <input type="text" disabled="true" placeholder="请选择物流单位" placeholder-class="place" value="{{insName}}" />
+      <input type="text" disabled="true" placeholder="请选择物流单位" placeholder-class="place" value="{{unitType1}}"/>
     </picker>
-    <picker class="from-con" bindchange="bindPickerChange" value="{{insName}}" range="{{ins}}">
+
+    <picker class="from-con" bindchange="bindPickerChange" range-key="orgName" value="{{index}}" range="{{institutionNoArr}}">
       <label>送检机构：</label>
-      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
+      <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{orgName}}" />
     </picker>
     
     <view class="from-con">
@@ -60,32 +61,31 @@
   </view>
 
   <view class="tabel">
-    <scroll-view scroll-x style="width: 100%; height: 400rpx; ">
+    <scroll-view scroll-x scroll-y style="width: 100%; height: 400rpx; border: 1rpx solid #ddd;">
       <view class="tr top">
         <view class="td td1">序 号</view>
-        <view class="td">物流单号</view>
+        <view class="td td_time">物流单号</view>
         <view class="td">物流单位</view>
         <view class="td td_date">送检机构</view>
-        <view class="td">物流电话</view>
+        <view class="td td_date">物流电话</view>
         <view class="td">物流费用</view>
         <view class="td">转运箱号</view>
-        <view class="td">到达时间</view>
+        <view class="td td_time">预计到达时间</view>
         <view class="td">物流员</view>
-        <view class="td">备注</view>
+        <view class="td td_time">备注</view>
+      </view>
+      <view class="tr" wx:for="{{sampleList}}" wx:key="index">
+        <view class="td td1">{{index + 1}}</view>
+        <view class="td td_time">{{item.logisticsNo}}</view>
+        <view class="td">{{item.unitType==1?'顺丰':'' || item.unitType==2?'京东':'' || item.unitType==3?'自建':''}}</view>
+        <view class="td td_date">{{item.institutionName}}</view>
+        <view class="td td_date">{{item.phone}}</view>
+        <view class="td">{{item.cost}}</view>
+        <view class="td">{{item.boxPlateNumber}}</view>
+        <view class="td td_time">{{item.expectedEndTime}}</view>
+        <view class="td">{{item.logisticsMen}}</view>
+        <view class="td td_time">{{item.notes}}</view>
       </view>
-      <block wx:for="{{sampleList}}" wx:key="index">
-        <view class="tr">
-          <view class="td td1">{{index + 1}}</view>
-          <view class="td">{{item.logisticsNo}}</view>
-          <view class="td">{{item.institutionName}}</view>
-          <view class="td td_date">{{item.entryDate}}</view>
-          <view class="td">{{item.cost}}</view>
-          <block>
-            <view class="td" wx:if="{{item.tranType == 1}}">私家车</view>
-            <view class="td" wx:else>其他</view>
-          </block>
-        </view>
-      </block>
     </scroll-view>
   </view>
 
diff --git a/yyt-mall-wl/pages/querythree/querythree.wxss b/yyt-mall-wl/pages/querythree/querythree.wxss
index 40d32a4..fc02fbb 100644
--- a/yyt-mall-wl/pages/querythree/querythree.wxss
+++ b/yyt-mall-wl/pages/querythree/querythree.wxss
@@ -55,9 +55,7 @@ page{
 .tabel{
   background-color: #fff;
   border-radius: 15rpx;margin-top: 15rpx; 
-  padding: 30rpx 10rpx 50rpx 10rpx;
-  padding: 20rpx;
-  /* border: 1rpx #ebeaea solid; */
+  padding: 50rpx 15rpx 100rpx 15rpx;
   box-shadow: 0 0 10px #ddd;
 }
 .tr{
@@ -79,6 +77,7 @@ page{
   flex-wrap: nowrap;
   white-space: nowrap;
   min-width: 150rpx;
+  overflow: hidden;
 }
 .top view{
   background-color: #6bc9ca;
diff --git a/yyt-mall-wl/pages/threeLogistics/threeLogistics.js b/yyt-mall-wl/pages/threeLogistics/threeLogistics.js
index 54017bb..2943081 100644
--- a/yyt-mall-wl/pages/threeLogistics/threeLogistics.js
+++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.js
@@ -2,45 +2,37 @@
 var datePicker = require('../../utils/dateSetting')
 var request = require('../../utils/http')
 var dateUtils = require('../../utils/dateUtils')
+var app=getApp()
+
 Page({
   data: {
+    logno:'',
+
     boxArr:[],//转运箱列表
-    boxId:'',//转运箱id
+    // boxId:'',//转运箱id
     boxNum: '', //转运箱号
     unitTypeArr:[],//物流单位列表
     unitType:'',//物流单位id
     unitType1:'',//物流单位
-
     selfOrderCode: '', //物流单号
-    list: [{
-      'id': 1,
-      'number': '2023050002',
-      'time': '2023-5-12 11:32',
-      'status': '已签收',
-      'name': '张三',
-      'num': 'M2023055568'
-    }],
-    pipenum: '',
-    ins: [],
-    insIdx: 0, //物流所选下标
-    date: '',
-    start: '2023-07-01', // 时间选择器开始时间
-    end: '', // 时间选择器结束时间
-
-    potoSrc: '../../images/addPoto.png', //默认图片
-    poto: [], //车辆&转运箱照片 最大长度 4
-
     expectedEndTime: '', //预计到达时间
     multiArray: [],
     multiIndex: [0, 0, 0, 0, 0],
     choose_year: "",
     srcArray: [],
     phone: '', //物流电话
-    
     cost: '', //物流费用
     logisticsMen: '', //物流员
     notes: '', //备注
+    pipenum: '',
+    number: '', //数量
 
+    list: [],
+    date: '',
+    start: '2023-07-01', // 时间选择器开始时间
+    end: '', // 时间选择器结束时间
+    potoSrc: '../../images/addPoto.png', //默认图片
+    poto: [], //车辆&转运箱照片 最大长度 4
     sampleCount: '0', //样本数量
     //样本列表
     sampleList: [],
@@ -77,8 +69,8 @@ Page({
     var _this = this;
     request.upImgFile(`/feedBack/upload`, imageSrc).then(res => {
       var resObj = JSON.parse(res.data)
-      console.log('upImgFile data =' + resObj.data.url);
-      console.log('upImgFile res=' + JSON.stringify(res.data));
+      // console.log('upImgFile data =' + resObj.data.url);
+      // console.log('upImgFile res=' + JSON.stringify(res.data));
       if (resObj.code > 400) {
         wx.showModal({
           title: '提示',
@@ -125,6 +117,13 @@ Page({
       })
     }
 
+    //物流单号
+    if (data_id == 'selfOrderCode') {
+      this.setData({
+        selfOrderCode: value
+      })
+    }
+
     //物流电话
     if (data_id == 'phone') {
       this.setData({
@@ -146,6 +145,20 @@ Page({
       })
     }
 
+    //数量
+    if (data_id == 'number') {
+      this.setData({
+        number: value
+      })
+    }
+    
+    //转运箱
+    if (data_id == 'boxNum') {
+      this.setData({
+        boxNum: value
+      })
+    }
+
     //驾驶员
     if (data_id == 'driverMen') {
       this.setData({
@@ -164,9 +177,13 @@ Page({
   scacode() {
     wx.scanCode({
       success: (res) => {
-        console.log(res.result);
+        var result=res.result
+        if(result.length>20){
+          result=result.slice(5);
+          console.log(result);
+        }
         this.setData({
-          pipenum: res.result
+          pipenum:result
         })
       }
     })
@@ -180,8 +197,8 @@ Page({
       maxDuration: 30,
       camera: 'back',
       success: res => {
-        console.log(this.data.srcI)
-        console.log(res.tempFiles[0].tempFilePath)
+        // console.log(this.data.srcI)
+        // console.log(res.tempFiles[0].tempFilePath)
         // this.up();
       }
     })
@@ -222,12 +239,12 @@ Page({
   },
   
   //转运箱
-  bindPickerChangeBox(e){
-    this.setData({
-      boxNum:this.data.boxArr[e.detail.value].boxNum,
-      boxId:this.data.boxArr[e.detail.value].id
-    })
-  },
+  // bindPickerChangeBox(e){
+  //   this.setData({
+  //     boxNum:this.data.boxArr[e.detail.value].boxNum,
+  //     boxId:this.data.boxArr[e.detail.value].id
+  //   })
+  // },
 
   //日期
   bindDateChange(e) {
@@ -283,7 +300,7 @@ Page({
       'logisticsNo': this.data.selfOrderCode
     }
     request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
-      // console.log(res.data);
+      console.log(res.data.data);
       this.setData({
         sampleList: res.data.data,
         sampleCount: res.data.data.length
@@ -292,22 +309,24 @@ Page({
   },
 
 
-  goDetail() {
+  goDetail(e) {
+    console.log('goDetail=' + e.currentTarget.dataset.id);
+    var sample = this.data.sampleList[e.currentTarget.dataset.id]
+    console.log('==========',sample);
     wx.navigateTo({
-      url: '../details/details',
+      url: '../details/details?sample=' + JSON.stringify(sample),
     })
   },
 
   //保存样本信息
   saveInfo() {
     var temp = this.data;
-    //处理出发时间
-    // var startTime = dateUtils.customizeDateFormat(temp.time);
     //处理到达时间
     var endTime = dateUtils.customizeDateFormat(temp.expectedEndTime);
 
     // if (this.showErrInfo(startTime, '出发时间不可为空')) return
     if (this.showErrInfo(endTime, '到达时间不可为空')) return
+    if (this.showErrInfo(this.data.selfOrderCode, '物流单号不可为空')) return
 
     //处理物流车拍照
     var carPoto = []
@@ -320,18 +339,18 @@ Page({
         boxPoto.push(array[index])
       }
     }
-
+  
     var tempData = {
       "barCode": temp.pipenum, //样本条码
       "barCodeImg": "", //物流拍照图
-      "boxId":temp.boxId,//转运箱id
+      "boxId":'',//转运箱id
       "boxNum": temp.boxNum, //转运箱号
       "carPics": carPoto.toString(), //物流车图片 逗号分隔
       "boxPics": boxPoto.toString(), //	转运箱图片 逗号分隔
-      "cost": 0, //	物流费用
-      "driverMen": temp.driverMen, //驾驶员
+      "cost": temp.cost, //	物流费用
+      "driverMen": '', //驾驶员
       "entryDate": temp.date, //	录入日期
-      "endDate": '2023-07-06 14:52:53', //startTime
+      "endDate": '', //startTime
       "expectedEndTime": endTime, //预计到达时间 endTime
       "institutionName":'',//送检机构名称
       "institutionNo":'', //送检机构编号
@@ -348,12 +367,12 @@ Page({
       "updateBy": 0,
       "updateTime": ""
     }
-    console.log(endTime);
-
     request.post(`/batch/addTranLogistics`, tempData).then(res => {
-      console.log(JSON.stringify(res.data));
+      // console.log(JSON.stringify(res.data));
       if (res.data.code == 200) {
-        this.data.selfOrderCode = res.data.data
+        wx.showToast({
+          title: res.data.message,
+        })
         //保存成功后,查询底部列表
         this.selSampleList();
       } else {
@@ -372,9 +391,10 @@ Page({
   //显示必选项为空提示
   showErrInfo(field, errInfo) {
     if (field === undefined || field.length == 0) {
-      wx.showToast({
-        icon: 'error',
-        title: errInfo,
+      wx.showModal({
+        showCancel:false,
+        title:'提示',
+        content:errInfo,
       })
       return true;
     }
@@ -384,6 +404,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    if(options!==undefined){
+      console.log(options.logno);
+      this.setData({
+        logno:options.logno
+      })
+    }
+
     let now = new Date(); //获取时间
     let year = now.getFullYear(); //获取当前年
     let month = now.getMonth() + 1; //获取当前月份
@@ -402,31 +429,18 @@ Page({
 
 
     //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
-    request.get(`/batch/getBatchsNumber?logisticsWay=2`).then(res => {
-      console.log('getBatchsNumber=' + JSON.stringify(res.data))
-      if (res.data.code == 200) {
-        this.setData({
-          selfOrderCode: res.data.data
-        })
-      }
-    })
-
-    //获取物流机构列表 /dict/type/{dictType}
-    // request.get(`/dict/type/unit_type`).then(res => {
-    //   var array = res.data.data
-    //   var tempArr = []
-    //   for (let index = 0; index < array.length; index++) {
-    //     tempArr.push(array[index].dictLabel)
+    // request.get(`/batch/getBatchsNumber?logisticsWay=2`).then(res => {
+    //   if (res.data.code == 200) {
+    //     this.data.selfOrderCode = res.data.data
+    //     this.setData({
+    //       selfOrderCode: res.data.data
+    //     })
+
+    //     this.selSampleList(); //查询物流批次列表
     //   }
-
-    //   this.setData({
-    //     ins: tempArr
-    //   })
-
-    //   //查询物流批次列表
-    //   this.selSampleList()
     // })
 
+
     //初始化照片按钮
     var tempSrc = [this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc,this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc]
     this.setData({
@@ -441,11 +455,11 @@ Page({
     })
 
     //转运箱
-    request.post(`/box/selectTranBox`).then(res => {
-      this.setData({
-        boxArr:res.data.data
-      })
-    })
+    // request.post(`/box/selectTranBox`).then(res => {
+    //   this.setData({
+    //     boxArr:res.data.data
+    //   })
+    // })
 
   },
 
@@ -460,7 +474,13 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-
+    if(this.data.logno!=undefined){
+      this.setData({
+        selfOrderCode:this.data.logno
+      })
+      this.selSampleList(); 
+      console.log(this.data.logno);
+    }
   },
 
   /**
diff --git a/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml
index b2f0514..49f3232 100644
--- a/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml
+++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml
@@ -1,6 +1,6 @@
 <view class="box">
   <view class="top">
-    <input type="text" value="{{pipenum}}" />
+    <input type="text" bindinput="inputTextInfo" data-id="barCode" value="{{pipenum}}" />
     <view bindtap="scacode">
       <image src="../../images/saoma.png" style="width: 70rpx; height: 70rpx;"></image>
     </view>
@@ -24,13 +24,18 @@
         <view class="td">物流员</view>
         <view class="td">物流单号</view>
       </view>
-      <view class="tr" wx:for="{{sampleList}}" wx:key="index" bindtap="goDetail">
-        <view class="td1" bindtap="goDetail">{{item.id}}</view>
-        <view class="td">{{item.number}}123</view>
-        <view class="td">{{item.time}}</view>
-        <view class="td">{{item.status}}</view>
-        <view class="td">{{item.name}}</view>
-        <view class="td">{{item.num}}</view>
+      <view class="tr" wx:for="{{sampleList}}" wx:key="index" data-id="{{index}}" bindtap="goDetail">
+        <view class="td1">{{index + 1}}</view>
+        <view class="td">{{item.barCode}}</view>
+        <view class="td">{{item.createTime}}</view>
+        <view wx:if="{{item.status == 0}}" class="td">未采样</view>
+        <view wx:elif="{{item.status == 1}}" class="td">已采样</view>
+        <view wx:elif="{{item.status == 2}}" class="td">已发货</view>
+        <view wx:elif="{{item.status == 3}}" class="td">已接收</view>
+        <view wx:elif="{{item.status == 4}}" class="td">重新采样</view>
+        <view wx:else class="td">其它</view>
+        <view class="td">{{item.logisticsMen}}</view>
+        <view class="td">{{item.logisticsNo}}</view>
       </view>
     </scroll-view>
   </view>
@@ -61,9 +66,19 @@
   </view>
 
   <view class="form">
-    <view class="from-con">
+    <!-- <view class="from-con">
       <label>物流单号：</label>
       <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}" />
+    </view> -->
+
+    <view class="from-con">
+      <label><text style="color: red;position: absolute; left:-20rpx;">*</text>物流单号：</label>
+      <input type="text" bindinput="inputTextInfo" data-id="selfOrderCode" placeholder="物流单号" placeholder-class="place" value="{{selfOrderCode}}" />
+    </view>
+
+    <view class="from-con">
+      <label space="nbsp" style="letter-spacing: 14rpx;">数 量：</label>
+      <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" value="{{number}}" />
     </view>
 
     <picker class="from-con" bindchange="bindPickerChangeunitType" range-key="dictLabel" value="{{index}}" range="{{unitTypeArr}}">
@@ -72,10 +87,10 @@
     </picker>
 
 
-    <view class="from-con">
+    <!-- <view class="from-con">
       <label>送检机构</label>
       <input type="text" placeholder="送检机构" placeholder-class="place"/>
-    </view>
+    </view> -->
 
     <!-- <picker mode="date" value="date" start="{{start}}" end="{{end}}" bindchange="bindDateChange" class="from-con">
         <label>日期：</label>
@@ -90,10 +105,14 @@
       <label>物流费用：</label>
       <input type="text" placeholder="物流费用" placeholder-class="place" bindinput="inputTextInfo" data-id="cost" value="{{cost}}" />
     </view>
-    <picker class="from-con" bindchange="bindPickerChangeBox" range-key="boxNum" value="{{index}}" range="{{boxArr}}">
+    <view class="from-con">
+      <label>转运箱号：</label>
+      <input type="text" placeholder="转运箱号" placeholder-class="place" bindinput="inputTextInfo" data-id="boxNum" value="{{boxNum}}" />
+    </view>
+    <!-- <picker class="from-con" bindchange="bindPickerChangeBox" range-key="boxNum" value="{{index}}" range="{{boxArr}}">
       <label>转运箱号：</label>
       <input type="text" disabled="true" placeholder="请选择转运箱号" placeholder-class="place" value="{{boxNum}}"/>
-    </picker>
+    </picker> -->
 
     <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
       <label><text style="color: red;position: absolute; left:-20rpx;">*</text>预计到达时间：</label>
diff --git a/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss
index 6b4ba46..26d5c9d 100644
--- a/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss
+++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss
@@ -126,7 +126,7 @@
 }
 .tr .td{
   border-right:#ddd solid 1rpx ;
-  border-top: #ddd solid 1rpx;
+  border-bottom: #ddd solid 1rpx;
   padding: 15rpx 0;
   font-size: 22rpx;
   display: flex;
@@ -134,7 +134,7 @@
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 200rpx;
+  min-width: 250rpx;
 }
 .tab-top view{
   background-color: #51bdbe;
@@ -144,7 +144,7 @@
 }
 .td1{
   border-right:#ddd solid 1rpx ;
-  border-top: #ddd solid 1rpx;
+  border-bottom: #ddd solid 1rpx;
   padding: 15rpx 0;
   font-size: 22rpx;
   display: flex;
@@ -153,7 +153,7 @@
   flex-wrap: nowrap;
   white-space: nowrap;
   min-width: 100rpx;
-}
+} 
 
 .bottomButton {
   width: 100% !important;
diff --git a/yyt-mall-wl/utils/dateSetting.js b/yyt-mall-wl/utils/dateSetting.js
index a114488..ac3ac52 100644
--- a/yyt-mall-wl/utils/dateSetting.js
+++ b/yyt-mall-wl/utils/dateSetting.js
@@ -2,8 +2,8 @@
 // 测试
 const date = new Date();
 const year = date.getFullYear();
-const month = date.getMonth() + 1;
-const day = date.getDay() + 16; //不知道为什么 + 1 的话,时间不是当前日
+const month = date.getMonth()+1;
+const day = date.getDay() -1 ; //不知道为什么 + 1 的话,时间不是当前日
 const hour = date.getHours();
 const minute = date.getMinutes();
 //确定月份呈现