From de4610cb46012af4e255a9c89c4de3774be2c725 Mon Sep 17 00:00:00 2001
From: YXQ <yukfeng@163.com>
Date: Sat, 8 Jul 2023 09:20:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=BB=BA=E7=89=A9=E6=B5=81?=
 =?UTF-8?q?=E5=85=A8=E6=B5=81=E7=A8=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/addPoto.png                 | Bin 0 -> 21819 bytes
 pages/about/about.js               |   5 +-
 pages/details/details.js           |  29 +-
 pages/details/details.wxml         |  22 +-
 pages/feedback/feedback.js         |   7 +-
 pages/feedback/feedback.wxml       |   5 +-
 pages/index/index.js               |  34 ++-
 pages/index/index.wxml             |  10 +-
 pages/login/login.wxml             |   8 +-
 pages/login/login.wxss             |  39 ++-
 pages/meLogistics/meLogistics.js   | 409 ++++++++++++++++++++++-------
 pages/meLogistics/meLogistics.wxml |  75 +++---
 pages/meLogistics/meLogistics.wxss |   9 +-
 utils/dateUtils.js                 |  46 ++++
 utils/http.js                      |  23 --
 15 files changed, 527 insertions(+), 194 deletions(-)
 create mode 100644 images/addPoto.png
 create mode 100644 utils/dateUtils.js

diff --git a/images/addPoto.png b/images/addPoto.png
new file mode 100644
index 0000000000000000000000000000000000000000..01f08748b177213cf8e37ccce908d8b9eb46b282
GIT binary patch
literal 21819
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

literal 0
HcmV?d00001

diff --git a/pages/about/about.js b/pages/about/about.js
index 0502dda..3e2bf6e 100644
--- a/pages/about/about.js
+++ b/pages/about/about.js
@@ -6,9 +6,9 @@ Page({
    */
   data: {
     username:'立即登录'
-
   },
 
+  //绑定微信
   bindWx(){
     wx.showModal({
       title: '绑定微信',
@@ -29,18 +29,21 @@ Page({
     })
   },
 
+  //自建物流查询
   goQueryme(){
     wx.navigateTo({
       url: '../queryme/queryme',
     })
   },
 
+  //第三方物流查询
   goQuerythree(){
     wx.navigateTo({
       url: '../querythree/querythree',
     })
   },
 
+  //货运物流查询
   goQueryfrei(){
     wx.navigateTo({
       url: '../queryfrei/queryfrei',
diff --git a/pages/details/details.js b/pages/details/details.js
index 0b9417a..812d14c 100644
--- a/pages/details/details.js
+++ b/pages/details/details.js
@@ -5,14 +5,39 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    barCode:'', //样本条码
+    receiveTime:'', //接收时间
+    status:'', //样本状态
+    logisticsNo:'', //物流编号
+    unitType:'', //物流单位
+    entryDate:'', //日期
+    cost:'', //物流费用
+    expectedEndTime:'', //到达日期
+    boxNum:'', //转运箱号
+    numberplate:'', //物流车号
+    logisticsMen:'', //物流员
+    notes:'',//备注
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    console.log(options.sample);
+    var item = JSON.parse(options.sample)
+    this.setData({
+      barCode:item.barCode,
+      receiveTime:item.receiveTime,
+      status:item.status,
+      logisticsNo:item.logisticsNo,
+      unitType:item.unitType,
+      cost:item.cost,
+      expectedEndTime:item.expectedEndTime,
+      boxNum:item.boxNum,
+      numberplate:item.numberplate,
+      logisticsMen:item.logisticsMen,
+      notes:item.notes
+    })
   },
 
   /**
diff --git a/pages/details/details.wxml b/pages/details/details.wxml
index c0b707e..421a0e9 100644
--- a/pages/details/details.wxml
+++ b/pages/details/details.wxml
@@ -3,11 +3,11 @@
   <view class="back">
     <view class="cen">
       <label>样本条码：</label>
-      <view>2023050002</view>
+      <view>{{barCode}}</view>
     </view>
     <view class="cen">
       <label>接收时间：</label>
-      <view>2023-5-12 11:32</view>
+      <view>{{receiveTime}}</view>
     </view>
     <view class="cen">
       <label>样本状态：</label>
@@ -15,39 +15,39 @@
     </view>
     <view class="cen">
       <label>物流单号：</label>
-      <view>M2023055568</view>
+      <view>{{logisticsNo}}</view>
     </view>
     <view class="cen">
       <label>物流单位：</label>
-      <view>顺丰</view>
+      <view>{{unitType}}</view>
     </view>
     <view class="cen">
       <label>日 期：</label>
-      <view>2023-5-12 11:32</view>
+      <view>{{entryDate}}</view>
     </view>
     <view class="cen">
       <label>物流费用：</label>
-      <view>20.00</view>
+      <view>{{cost}}</view>
     </view>
     <view class="cen">
       <label>到达日期：</label>
-      <view>2023-5-12 16:00</view>
+      <view>{{expectedEndTime}}</view>
     </view>
     <view class="cen">
       <label>转运箱号：</label>
-      <view>Z564687</view>
+      <view>{{boxNum}}</view>
     </view>
     <view class="cen">
       <label>物流车号：</label>
-      <view>京B85D6S</view>
+      <view>{{numberplate}}</view>
     </view>
     <view class="cen">
       <label>物流员：</label>
-      <view>张三</view>
+      <view>{{logisticsMen}}</view>
     </view>
     <view class="cen">
       <label>备 注：</label>
-      <view>无</view>
+      <view>{{notes}}</view>
     </view>
   </view>
 </view>
diff --git a/pages/feedback/feedback.js b/pages/feedback/feedback.js
index 9dfe421..8c953af 100644
--- a/pages/feedback/feedback.js
+++ b/pages/feedback/feedback.js
@@ -139,6 +139,11 @@ Page({
       }
     })
   },
+  //删除照片
+  delImage(e){
+    console.log(e)
+    //TODO
+  },
 
   //显示回调图片
   addCallBackImage(imageSrc) {
@@ -146,7 +151,7 @@ Page({
       isBtn: false,
       imgUrl: imageSrc,
       text: imageSrc,
-      func: ""
+      func: "delImage"
     };
     this.data.imageArr.unshift(temp);
     this.setData({
diff --git a/pages/feedback/feedback.wxml b/pages/feedback/feedback.wxml
index bddf103..bf16c31 100644
--- a/pages/feedback/feedback.wxml
+++ b/pages/feedback/feedback.wxml
@@ -18,15 +18,12 @@
         <block wx:for="{{imageArr}}">
           <view wx:if="{{item.isBtn}}" bindtap="{{item.func}}">{{item.text}}</view>
           <view wx:else style="display: flex;">
-            <image src="{{item.text}}"></image>
+            <image bindlongtap="{{item.func}}" src="{{item.text}}" />
           </view>
         </block>
       </view>
 
-
     </view>
   </view>
-
   <button class="btn" bindtap="goMyorder">提 交</button>
-
 </view>
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index fb86a89..3e0c21b 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -60,6 +60,35 @@ Page({
     },
     msg:[], //首页中间消息列表
   },
+
+  //跳转对应界面
+  goLogisticsType(e){
+    console.log(JSON.stringify(e));
+    var tag = e.currentTarget.dataset.id
+    var url
+    //自建物流
+    if(tag === 'goMelogistics'){
+      url = '../meLogistics/meLogistics'
+    }
+
+    //第三方
+    if(tag === 'goThreelogistics'){
+      url = '../threeLogistics/threeLogistics'
+    }
+
+    //货运
+    if(tag === 'goLogistics'){
+      url = '../freiLogistics/freiLogistics'
+    }
+
+    //物流交接
+    if(tag === 'goHandover'){
+      url = '../handover/handover'
+    }
+    wx.navigateTo({
+      url: url,
+    })
+  },
   
   //自建物流
   goMelogistics(){
@@ -75,10 +104,11 @@ Page({
     })
   },
 
-  //货运物流
+  //物流交接
   goHandover(){
     wx.navigateTo({
-      url: '../handover/handover',
+      url: '../freiLogistics/freiLogistics',
+      // url: '../handover/handover',
     })
   },
 
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 19dcbd2..566e0de 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -12,16 +12,16 @@
 
 <view style="padding: 20rpx;">
   <view class="back">
-    <view class="produck-type" bindtap="goMelogistics">
-      <view class="item">
+    <view class="produck-type" >
+      <view class="item" bindtap="goLogisticsType" data-id="goMelogistics">
         <image src="../../images/自建物流.png"></image>
         <view>自建物流</view>
       </view>
-      <view class="item" bindtap="goThreelogistics">
+      <view class="item" bindtap="goLogisticsType" data-id="goThreelogistics">
         <image src="../../images/第三方物流.png"></image>
         <view>第三方物流</view>
       </view>
-      <view class="item">
+      <view class="item" bindtap="goLogisticsType" data-id="goLogistics">
         <image src="../../images/货运物流.png"></image>
         <view>货运物流</view>
       </view>
@@ -32,5 +32,5 @@
     <ec-canvas canvas-id="echart-pie" ec="{{ec}}"></ec-canvas>
   </view>
 
-  <button class="btn" bindtap="goHandover">物流交接</button>
+  <button class="btn" bindtap="goLogisticsType" data-id="goHandover">物流交接</button>
 </view>
\ No newline at end of file
diff --git a/pages/login/login.wxml b/pages/login/login.wxml
index a780c22..55f7232 100644
--- a/pages/login/login.wxml
+++ b/pages/login/login.wxml
@@ -1,17 +1,17 @@
 <!--pages/login/login.wxml-->
 
-<view style="padding: 40rpx 50rpx;font-size: 55rpx;color: #fff;font-weight: 600; font-family: 'Courier New', Courier, monospace;">欢迎回来！</view>
+<view class="title">欢迎登录</view>
 
-<view style="background-color: #fff; width: 650rpx; border-radius: 20rpx; margin: 0 auto; padding: 30rpx 0;">
+<view style="background-color: #fff; width: 650rpx; border-radius: 10rpx; margin: 0 auto; padding: 30rpx 0;">
 
   <view class="text">
     <label>账号：</label>
-    <input type="text" placeholder="请输入账号" value="{{username}}" bindinput="getUsername" data-value="username"/>
+    <input type="text" placeholder="请输入账号" value="{{username}}" bindinput="getUsername" data-value="username" />
   </view>
 
   <view class="text">
     <label>密码：</label>
-    <input type="password" placeholder="请输入密码" value="{{userpwd}}" bindinput="getUserpwd" data-value="userpwd"/>
+    <input type="password" placeholder="请输入密码" value="{{userpwd}}" bindinput="getUserpwd" data-value="userpwd" />
   </view>
 
   <button class="btn" bindtap="login">登 录</button>
diff --git a/pages/login/login.wxss b/pages/login/login.wxss
index 1aef6d1..a87f097 100644
--- a/pages/login/login.wxss
+++ b/pages/login/login.wxss
@@ -1,11 +1,28 @@
 /* pages/login/login.wxss */
 /* pages/login/login.wxss */
-page{
-  background: -webkit-linear-gradient(top,#27adb0,#b6f0f0,#f8f8f8);
+page {
+  background: -webkit-linear-gradient(top, #27adb0, #b6f0f0, #f8f8f8);
   padding-top: 250rpx;
 }
 
-.text{
+.title {
+  padding: 40rpx 50rpx;
+  font-size: 55rpx;
+  color: #fff;
+  font-weight: 600;
+  font-family: 'Courier New', Courier, monospace;
+}
+
+
+.box {
+  background-color: #fff;
+  width: 650rpx;
+  border-radius: 10rpx;
+  margin: 0 auto;
+  padding: 30rpx 0;
+}
+
+.text {
   display: flex;
   /* background-color: #f1f1f1; */
   border-radius: 20rpx;
@@ -14,23 +31,25 @@ page{
   padding: 20rpx;
   align-items: center;
 }
-.text label{
+
+.text label {
   font-weight: 900;
   font-size: 30rpx;
   color: #333;
 }
-.text input{
+
+.text input {
   font-size: 28rpx;
   background-color: #f5f5f5;
   width: 70%;
   height: 60rpx;
   padding: 0 20rpx;
-  border-radius: 20rpx;
+  border-radius: 10rpx;
 }
 
-.btn{
-  border-radius: 20rpx;
-  height: 60rpx;
+.btn {
+  border-radius: 10rpx;
+  height: 80rpx;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -38,6 +57,6 @@ page{
   font-weight: 500;
   background-color: #259c9e;
   color: #fff;
-  margin-top: 30rpx;
+  margin-top: 50rpx;
   width: 300rpx !important;
 }
\ No newline at end of file
diff --git a/pages/meLogistics/meLogistics.js b/pages/meLogistics/meLogistics.js
index c6b7ea2..12aae34 100644
--- a/pages/meLogistics/meLogistics.js
+++ b/pages/meLogistics/meLogistics.js
@@ -1,122 +1,187 @@
 // pages/meLogistics/meLogistics.js
-var datePicker = require('../../utils/dateSetting')
-const http = require('../../utils/http')
+const datePicker = require('../../utils/dateSetting')
+const request = require('../../utils/http')
+const dateUtils = require('../../utils/dateUtils')
 
 //设定当前的时间，将其设定为常量
-
-
-
 Page({
   data: {
-    list:[
-      {
-        'id':1,
-        'number':'2023050002',
-        'time':'2023-5-12 11:32',
-        'status':'已签收',
-        'name':'张三',
-        'num':'M2023055568'
-      },
-      {
-        'id':2,
-        'number':'2023050002',
-        'time':'2023-5-12 11:32',
-        'status':'已签收',
-        'name':'李四',
-        'num':'M2023055568'
-      }
-    ],
-    pipenum:'',
-    selfOrderCode:'',//物流单号
-    ins: ['xx卫生院','xx门诊',],
-    bushList:['私家车','大巴','顺丰','其他'],
-    bush:'',
-    date: '',
-    start:'2020-01-01',
-    end:'',
-    //开始
-    time: '',
+    pipenum: '',
+    selfOrderCode: '', //物流单号
+    ins: [], //送检机构 服务端获取
+    insName: [], //机构列表名称
+    insIdx: 0, //当前所选机构下标
+    bushList: ['私家车', '大巴', '顺丰', '其他'], //运输方式 服务端获取
+    bush: '', //运输方式下标
+    date: '', //当天日期
+    start: '2020-01-01',
+    end: '',
+
+    boxNum: '', //转运箱号
+
+    time: '', //出发时间
     multiArray: [],
     multiIndex: [0, 0, 0, 0, 0],
     choose_year: "",
-    //结束
-    time1: '',
+
+    time1: '', //到达时间
     multiArray1: [],
     multiIndex1: [0, 0, 0, 0, 0],
     choose_year1: "",
-
-    srcArray:[]
-
+    numberplate: '', //车牌号
+    logisticsMen: '', //物流员
+    number: '', //数量
+    notes: '', //备注
+    driverMen: '', //驾驶员
+    srcArray: [], //样本组？
+    potoSrc: '../../images/addPoto.png', //默认图片
+    poto: [], //车辆&转运箱照片 最大长度 4
+    tableArr: [], //扫码表数据
+    sampleCount: '0', //样本数量
+    //样本列表
+    sampleList: [{
+        'id': 1,
+        'number': '2023050002',
+        'time': '2023-5-12 11:32',
+        'status': '已签收',
+        'name': '张三',
+        'num': 'M2023055568'
+      },
+      {
+        'id': 2,
+        'number': '2023050002',
+        'time': '2023-5-12 11:32',
+        'status': '已签收',
+        'name': '李四',
+        'num': 'M2023055568'
+      },
+      {
+        'id': 3,
+        'number': '2023050002',
+        'time': '2023-5-12 11:32',
+        'status': '已签收',
+        'name': '李四',
+        'num': 'M2023055568'
+      }
+    ],
   },
 
-  scacode(){
+  //调用摄像头
+  scacode() {
     wx.scanCode({
-      success:(res)=>{
+      success: (res) => {
         console.log(res.result);
         this.setData({
-          pipenum:res.result
+          pipenum: res.result
         })
       }
     })
   },
 
   //样本拍照
-  phot(){
+  phot() {
     wx.chooseMedia({
       count: 1,
-      mediaType: ['image','video'],
+      mediaType: ['image', 'video'],
       sourceType: ['album', 'camera'],
       maxDuration: 30,
       camera: 'back',
-      success: res=>{
+      success: res => {
         console.log(this.data.srcI)
         console.log(res.tempFiles[0].tempFilePath)
         // this.up();
       }
     })
   },
-  //上传图片接口地址
-  // up(){
-  //   console.log(this.data.srcI)
-  //   wx.uploadFile({
-  //     filePath: this.data.srcI,
-  //     name: 'file',
-  //     url: '',
-  //   })
-  // },
 
   //物流车拍照
-  bushPhot(){
+  bushPhot() {
     wx.chooseMedia({
       count: 1,
-      mediaType: ['image','video'],
+      mediaType: ['image', 'video'],
       sourceType: ['album', 'camera'],
       maxDuration: 30,
       camera: 'back',
-      success: res=>{
+      success: res => {
         // this.up();
       }
     })
   },
 
   //转运箱拍照
-  boxPhot(){
+  boxPhot(e) {
+    console.log(e.target.dataset.id);
     wx.chooseMedia({
       count: 1,
-      mediaType: ['image','video'],
+      mediaType: ['image', 'video'],
       sourceType: ['album', 'camera'],
       maxDuration: 30,
       camera: 'back',
-      success: res=>{
+      success: res => {
         // this.up();
       }
     })
   },
 
+  //物流车、转运箱拍照
+  photograph(e) {
+    var potoIdx = 0;
+    console.log(e.target.dataset.id);
+    if (e.target.dataset.id === 'car_1') {
+      console.log(e.target.dataset.id);
+      potoIdx = 0
+    }
+    if (e.target.dataset.id === 'car_2') {
+      console.log(e.target.dataset.id);
+      potoIdx = 1
+    }
+    if (e.target.dataset.id === 'box_1') {
+      console.log(e.target.dataset.id);
+      potoIdx = 2
+    }
+    if (e.target.dataset.id === 'box_2') {
+      console.log(e.target.dataset.id);
+      potoIdx = 3
+    }
+
+    //回显所拍摄照片
+    var _this = this;
+    wx.chooseMedia({
+      count: 1,
+      mediaType: ['image', 'video'],
+      sourceType: ['camera'],
+      sizeType: ['compressed'],
+      camera: 'back',
+      success: res => {
+        console.log(res.tempFiles[0].tempFilePath)
+        _this.data.poto[potoIdx] = res.tempFiles[0].tempFilePath
+        _this.setData({
+          poto: _this.data.poto
+        })
+      }
+    })
+
+  },
+
+  //显示回调图片
+  addCallBackImage(imageSrc) {
+    var temp = {
+      isBtn: false,
+      imgUrl: imageSrc,
+      text: imageSrc,
+      func: "delImage"
+    };
+    this.data.imageArr.unshift(temp);
+    this.setData({
+      imageArr: this.data.imageArr
+    });
+  },
+
   //送检机构
   bindPickerChange(e) {
     this.setData({
-      index: e.detail.value
+      insIdx: e.detail.value,
+      insName: this.data.ins[e.detail.value]
     })
   },
 
@@ -128,10 +193,10 @@ Page({
   },
 
   //日期
-  bindDateChange(e){
+  bindDateChange(e) {
     // console.log(e.detail.value)
     this.setData({
-      date:e.detail.value
+      date: e.detail.value
     })
   },
 
@@ -143,10 +208,12 @@ Page({
       this.data.multiArray[2][this.data.multiIndex[2]] +
       this.data.multiArray[3][this.data.multiIndex[3]] +
       this.data.multiArray[4][this.data.multiIndex[4]];
+
     this.setData({
       time: dateStr
     })
-  },//开始
+  },
+
   bindMultiPickerChange1: function (e) {
     var dateStr = this.data.multiArray1[0][this.data.multiIndex1[0]] +
       this.data.multiArray1[1][this.data.multiIndex1[1]] +
@@ -156,7 +223,7 @@ Page({
     this.setData({
       time1: dateStr
     })
-  },//结束
+  },
 
   //当时间选择器呈现并进行滚动选择时间时调用该函数。开始
   bindMultiPickerColumnChange: function (e) {
@@ -214,10 +281,146 @@ Page({
     })
   },
 
-
-  goDetail(){
+  //样本详细信息
+  goDetail(e) {
+    console.log('goDetail=' + e.currentTarget.dataset.id);
+    var sample = this.data.sampleList[e.currentTarget.dataset.id]
     wx.navigateTo({
-      url: '../details/details',
+      url: '../details/details?sample=' + JSON.stringify(sample),
+    })
+  },
+
+  //文本输入信息
+  inputTextInfo(e) {
+    var data_id = e.target.dataset.id; //组件tag
+    var value = e.detail.value; //输入的文本
+    //样本编号
+    if (data_id === 'barCode') {
+      this.setData({
+        pipenum: value
+      })
+    }
+
+    //数量
+    if (data_id === 'number') {
+      this.setData({
+        number: value
+      })
+    }
+
+    //转运箱号
+    if (data_id === 'boxNum') {
+      this.setData({
+        boxNum: value
+      })
+    }
+
+    //车牌号
+    if (data_id === 'numberplate') {
+      this.setData({
+        numberplate: value
+      })
+    }
+
+    //物流员
+    if (data_id === 'logisticsMen') {
+      this.setData({
+        logisticsMen: value
+      })
+    }
+
+    //驾驶员
+    if (data_id === 'driverMen') {
+      this.setData({
+        driverMen: value
+      })
+    }
+
+    //备注
+    if (data_id === 'notes') {
+      this.setData({
+        notes: value
+      })
+    }
+  },
+
+  //保存样本信息
+  saveInfo() {
+    var temp = this.data;
+    //处理出发时间
+    var startTime = dateUtils.customizeDateFormat(temp.time);
+    //处理到达时间
+    var endTime = dateUtils.customizeDateFormat(temp.time1);
+
+    //处理物流车拍照
+    var carPoto = []
+    var boxPoto = []
+    var array = this.data.poto;
+    for (let index = 0; index < array.length; index++) {
+      if (index < 2 && array[index] != this.data.potoSrc) {
+        carPoto.push(array[index])
+      } else if (array[index] != this.data.potoSrc) {
+        boxPoto.push(array[index])
+      }
+    }
+
+    var tempData = {
+      "barCode": temp.pipenum, //样本条码
+      "barCodeImg": "", //物流拍照图
+      "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
+      "expectedEndTime": endTime, //预计到达时间 endTime
+      "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
+      "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
+      "logisticsMen": temp.logisticsMen, //物流员
+      "logisticsNo": temp.selfOrderCode, //物流编号
+      "logisticsWay": 1, //物流方式 1自建 2第三方 3货运
+      "notes": temp.notes, //	物流备注
+      "number": temp.number, //	数量
+      "numberplate": "", //	车牌号
+      "phone": "", //物流电话
+      "startTime": startTime, //出发时间
+      "tranType": "1", //物流方式
+      "unitType": "", //物流单位 1.顺丰 2.京东(自建物流没有该字段)
+      "updateBy": 0,
+      "updateTime": ""
+    }
+
+    console.log('saveInfo=' + JSON.stringify(tempData));
+    request.post(`/batch/addTranLogistics`, tempData).then(res => {
+      console.log(JSON.stringify(res.data));
+      if (res.data.code === 200) {
+        //保存成功后,查询底部列表
+
+      } else {
+        wx.showModal({
+          title: '错误',
+          content: res.data.message,
+          showCancel: false,
+          complete: (res) => {
+            if (res.confirm) {}
+          }
+        })
+      }
+    })
+  },
+
+  //查询底部列表数据
+  selSampleList() {
+    var reqData = {
+      'logisticsNo': this.data.selfOrderCode
+    }
+    request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
+      console.log(res.data);
+      this.setData({
+        sampleList: res.data.data,
+        sampleCount: res.data.data.length
+      })
     })
   },
 
@@ -229,32 +432,54 @@ Page({
     let year = now.getFullYear(); //获取当前年
     let month = now.getMonth() + 1; //获取当前月份
     this.setData({
-      end: '' + year + '-' + (Array(2).join(0) + month).slice(-2) + '-' + (Array(2).join(0) + now.getDate()).slice(-2),//当前的时间
-
-      //开始
-      multiArray:[[year + "年", year + 1 + "年", year + 2 + "年"],
-        datePicker.determineMonth(),
-        datePicker.determineDay(year, month),
-        datePicker.determineHour(),
-        datePicker.determineMinute()
-      ],
-      //结束
-      multiArray1:[[year + "年", year + 1 + "年", year + 2 + "年"],
-        datePicker.determineMonth(),
-        datePicker.determineDay(year, month),
-        datePicker.determineHour(),
-        datePicker.determineMinute()
-      ],
-    }),
-
-    //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
-    http.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
-      console.log('getBatchsNumber=' + JSON.stringify(res.data))
-      if(res.data.code === 200){
-        this.setData({
-          selfOrderCode:res.data.data
-        })
+        end: '' + year + '-' + (Array(2).join(0) + month).slice(-2) + '-' + (Array(2).join(0) + now.getDate()).slice(-2), //当前的时间
+        //开始
+        multiArray: [
+          [year + "年", year + 1 + "年", year + 2 + "年"],
+          datePicker.determineMonth(),
+          datePicker.determineDay(year, month),
+          datePicker.determineHour(),
+          datePicker.determineMinute()
+        ],
+        //结束
+        multiArray1: [
+          [year + "年", year + 1 + "年", year + 2 + "年"],
+          datePicker.determineMonth(),
+          datePicker.determineDay(year, month),
+          datePicker.determineHour(),
+          datePicker.determineMinute()
+        ],
+      }),
+
+      //获取物流单号 1.自建物流 2.第三方物流 3.货运物流
+      request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
+        console.log('getBatchsNumber=' + JSON.stringify(res.data))
+        if (res.data.code === 200) {
+          this.setData({
+            selfOrderCode: res.data.data
+          })
+        }
+      })
+
+    //获取送检机构列表
+    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
+      })
+
+      //查询物流批次列表
+      this.selSampleList();
+    })
+
+    //初始化照片按钮
+    var tempSrc = [this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc]
+    this.setData({
+      poto: tempSrc
     })
   },
 
diff --git a/pages/meLogistics/meLogistics.wxml b/pages/meLogistics/meLogistics.wxml
index aa3d4fc..ab5c6bd 100644
--- a/pages/meLogistics/meLogistics.wxml
+++ b/pages/meLogistics/meLogistics.wxml
@@ -1,92 +1,93 @@
 <!--pages/meLogistics/meLogistics.wxml 自建物流-->
 <view class="box">
-  
+
   <view class="back">
     <view class="top">
-      <input type="text" value="{{pipenum}}"/>
+      <input type="text" bindinput="inputTextInfo" data-id="barCode" value="{{pipenum}}" />
       <view style="background-color: #eee;" bindtap="scacode">扫 码</view>
       <view style="background-color: #23c559; color: #fff;" bindtap="phot">拍 照</view>
     </view>
-    
+
     <view class="form">
       <view class="from-con">
         <label>物流单号：</label>
-        <input type="text" placeholder="物流单号" disabled="false" placeholder-class="place" value="{{selfOrderCode}}"/>
+        <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="{{insIdx}}" range="{{ins}}">
         <label>送检机构：</label>
-        <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{ins[index]}}"/>
+        <input type="text" disabled="true" placeholder="请选择送检机构" placeholder-class="place" value="{{insName}}" />
       </picker>
       <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}}"/>
+        <input type="text" disabled="true" placeholder="请选择日期" placeholder-class="place" value="{{date}}" />
       </picker>
       <view class="from-con">
         <label>数量：</label>
-        <input type="text" placeholder="数量" placeholder-class="place"/>
+        <input type="number" bindinput="inputTextInfo" data-id="number" placeholder="数量" placeholder-class="place" />
       </view>
       <picker class="from-con" bindchange="bindbushChange" range="{{bushList}}">
         <label>运输方式：</label>
-        <input type="text" disabled="true" placeholder="请选择运输方式" placeholder-class="place" value="{{bushList[bush]}}"/>
+        <input type="text" disabled="true" placeholder="请选择运输方式" placeholder-class="place" value="{{bushList[bush]}}" />
       </picker>
       <view class="from-con">
         <label>转运箱号：</label>
-        <input type="text" placeholder="转运箱号" placeholder-class="place" value=""/>
+        <input type="text" bindinput="inputTextInfo" data-id="boxNum" placeholder="转运箱号" placeholder-class="place" value="" />
       </view>
       <picker class="from-con" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
         <label>出发时间：</label>
-        <input value='{{time}}' placeholder='请选择出发时间'  placeholder-class="place" disabled="true"/>
+        <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>
-        <input value='{{time1}}' placeholder='请选择到达时间'  placeholder-class="place" disabled="true"/>
+        <input value='{{time1}}' placeholder='请选择到达时间' placeholder-class="place" disabled="true" />
       </picker>
       <view class="from-con">
         <label>车牌号：</label>
-        <input type="text" placeholder="车牌号" placeholder-class="place" value=""/>
+        <input type="text" bindinput="inputTextInfo" data-id="numberplate" placeholder="车牌号" placeholder-class="place" value="{{carCode}}" />
       </view>
       <view class="from-con">
         <label>物流员：</label>
-        <input type="text" placeholder="物流员" placeholder-class="place" value=""/>
+        <input type="text" bindinput="inputTextInfo" data-id="logisticsMen" placeholder="物流员" placeholder-class="place" value="{{logistician}}" />
       </view>
       <view class="from-con">
-        <label>备注：</label>
-        <input type="text" placeholder="备注" placeholder-class="place" value=""/>
+        <label>驾驶员：</label>
+        <input type="text" bindinput="inputTextInfo" data-id="driverMen" placeholder="驾驶员" placeholder-class="place" value="{{driver}}" />
       </view>
       <view class="from-con">
-        <label>驾驶员：</label>
-        <input type="text" placeholder="驾驶员" placeholder-class="place" value=""/>
+        <label>备注：</label>
+        <input type="text" bindinput="inputTextInfo" data-id="notes" placeholder="备注" placeholder-class="place" value="{{notes}}" />
       </view>
+
     </view>
   </view>
 
   <view class="back">
     <view class="bush">
       <view style="flex: 1;">物流车拍照</view>
-      <button bindtap="bushPhot">拍 照</button>
+      <!-- <button bindtap="bushPhot">拍 照</button> -->
     </view>
     <view class="bush-img">
-      <image src="../../images/bush.png"></image>
-      <image src="../../images/bush.png"></image>
+      <image bindtap="photograph" src="{{poto[0]}}" data-id="car_1"></image>
+      <image bindtap="photograph" src="{{poto[1]}}" data-id="car_2"></image>
     </view>
   </view>
 
   <view class="back">
     <view class="bush">
       <view style="flex: 1;">转运箱拍照</view>
-      <button bindtap="boxPhot">拍 照</button>
+      <!-- <button bindtap="boxPhot">拍 照</button> -->
     </view>
     <view class="bush-img">
-      <image src="../../images/bush.png"></image>
-      <image src="../../images/bush.png"></image>
+      <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="back">
     <view class="con">
-      <view style="flex: 1;">总计：200/管数</view>
+      <view style="flex: 1;">总计：{{sampleCount}}/管数</view>
       <button style="background-color: #ddd;">修 改</button>
-      <button style="color: #fff;">保 存</button>
+      <button style="color: #fff;" bindtap="saveInfo">保 存</button>
     </view>
 
     <scroll-view scroll-x class="tabel">
@@ -98,15 +99,19 @@
         <view class="td">物流员</view>
         <view class="td">物流单号</view>
       </view>
-      <view class="tr" wx:for="{{list}}" wx:key="index" bindtap="goDetail">
-        <view class="td1">{{item.id}}</view>
-        <view class="td">{{item.number}}</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.receiveTime}}</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>
+</view>
\ No newline at end of file
diff --git a/pages/meLogistics/meLogistics.wxss b/pages/meLogistics/meLogistics.wxss
index 4c85cb3..8c0de8c 100644
--- a/pages/meLogistics/meLogistics.wxss
+++ b/pages/meLogistics/meLogistics.wxss
@@ -68,12 +68,13 @@
   display: flex;
   flex-wrap: wrap;
   justify-content:space-around;
-  padding: 20rpx 10rpx;
+  padding: 10rpx 10rpx;
+  width: 100%;
 }
 .bush-img image{
   width: 270rpx;
   height: 230rpx;
-  margin-top: 10rpx;
+  margin-top: 5rpx;
   border: 1rpx solid #999;
   border-radius: 15rpx;
 }
@@ -117,7 +118,7 @@
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 200rpx;
+  min-width: 250rpx;
 }
 .tab-top view{
   background-color: #51bdbe;
@@ -135,5 +136,5 @@
   align-items: center;
   flex-wrap: nowrap;
   white-space: nowrap;
-  min-width: 100rpx;
+  min-width: 70rpx;
 }
diff --git a/utils/dateUtils.js b/utils/dateUtils.js
new file mode 100644
index 0000000..3ed27b2
--- /dev/null
+++ b/utils/dateUtils.js
@@ -0,0 +1,46 @@
+//时间格式处理工具类 
+
+//将 "2023年7月5日17时5分" 转换为 "2023-07-05 17:05:00" 格式
+const customizeDateFormat = function(dateStr) {
+
+  if(dateStr === undefined || dateStr.length == 0){
+    return "";
+  }
+  
+  var tempDateStr = dateStr.replace('年','-').replace('月','-').replace('日',' ').replace('时',':').replace('分',':')+'00';
+  // 2023-7-5 17:5:00
+  var tempDateArr = tempDateStr.split(' ');
+  var ymd = tempDateArr[0].split('-'); //年月日
+  var hms = tempDateArr[1].split(':'); //时分秒
+
+  var year = ymd[0]; //年
+  var mot = ymd[1]; //月
+  var day = ymd[2]; //日
+  //判断月份是否小于10，则前边补 0
+  if(mot < 10) {
+    mot == '0' + mot;
+  }
+  //判断日期是否小于10号，则前边补 0
+  if(day < 10){
+    day == '0' + day;
+  }
+
+  var hour = hms[0]; //时
+  var minute = hms[1]; //分
+  var second = hms[2]; //秒
+
+  //判断小时是否小于10，则前边补 0
+  if(hour < 10) {
+    hour = '0' + hour;
+  }
+
+  //判断分钟是否小于10，则前边补 0
+  if(minute < 10) {
+    minute == '0' + minute;
+  }
+  var returnDate = year + '-' + mot + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+  return returnDate;
+}//暴露出去
+module.exports = {
+  customizeDateFormat
+};
\ No newline at end of file
diff --git a/utils/http.js b/utils/http.js
index a216d80..8da1414 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -71,7 +71,6 @@ const upImgFile = function(url, imgSrc) {
   //   header = Object.assign({}, header, options.header);
   // }
   return new Promise((resolve, reject) => {
-
     wx.uploadFile({
       url: app.globalData.baseUrl + url,
       name: "file",
@@ -93,28 +92,6 @@ const upImgFile = function(url, imgSrc) {
         }
       }
     });
-
-  //   wx.request({
-  //     url: app.globalData.baseUrl + url,
-  //     method: options.method,
-  //     data: options.data,
-  //     header: header,
-  //     success: (res) => {
-  //       if (res.data.code == 500) {
-  //         wx.showModal({
-  //           showCancel: false,
-  //           title: '提示',
-  //           content: res.data.message
-  //         });
-  //         reject(res.data.message);
-  //       } else {
-  //         resolve(res);
-  //       }
-  //     },
-  //     fail: (err) => {
-  //       reject(err);
-  //     }
-  //   });
   });
 };