起卸分配

app.json

@@ -94,12 +94,13 @@
     "color": "#999999",
     "selectedColor": "#4B70EA",
     "custom": false,
-    "list": [{
-      "pagePath": "pages/workstand/index",
-      "iconPath": "/images/tabbar1.png",
-      "selectedIconPath": "/images/tabbar_active1.png",
-      "text": "首页"
-    },
+    "list": [
+      {
+        "pagePath": "pages/workstand/index",
+        "iconPath": "/images/tabbar1.png",
+        "selectedIconPath": "/images/tabbar_active1.png",
+        "text": "首页"
+      },
       {
         "pagePath": "pages/mine/index",
         "iconPath": "/images/tabbar3.png",

otherPages/loadAppoint/allocation.js

@@ -1,28 +1,120 @@
-// pages/loadAppoint/allocation.js
-const app = getApp()
+// pages/loadAppoint/allocationIndex.js
+const app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    orderId:'',
-
+    showModal: false,
     defaultText: '请选择',
     isSubmitting: false,
 
-    loadPointArray:[],//生产工序
+    str:' ',
+    loginStatus: wx.getStorageSync('loginStatus') ? wx.getStorageSync('loginStatus') : false,
+    roleCodeList: wx.getStorageSync('roleCodeList') ? wx.getStorageSync('roleCodeList') : '',
+    searchVal: '',
+    
+    //分页
+    limit: 10,
+    requestStatu: '加载中...',
+    page: 1,
+    totalPages: 1,
+    more: false,
+    nomore: '',
+    resData:[],
+
+    show: false,
+    loadPointId:'',//起卸地点
+    loadTimeId:'',//起卸时段
+
+    loadPointArray:[],//装卸点位
     loadPointIndex:null,
 
-    statTime:'',
-    endTime:'',
+    loadTimeArray:[], //装卸时间
+    loadTimeIndex:null,
+
+    loadUserArray:[], //执行员
+    loadUserIndex:null,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    
+  onLoad(options) {
+    this.setData({
+      appointId  : options.appointId,
+    })
+    //起卸点位
+    this.getAllocationListFun()
+  },
+
+  //列表
+  getAllocationListFun: function () {
+    this.setData({
+      page: 1
+    })
+    let params = {
+      current   : this.data.page,
+      size      : this.data.limit,
+      appointId : this.data.appointId,
+      appointType  : '1'
+    }
+    app.request.pageFirst({
+      url: app.API.bizloaddispatchPage,
+      page: this,
+      params: params,
+    })
+  },  
+
+  //装卸点位
+  loadPointData:function(){
+    app.request.GET({
+      url: app.API.loadPoint,
+      params: {'appointType' : '1'},
+      page: this,
+      successFun: true
+    }).then(res => {
+      this.setData({
+        loadPointArray:res.data.data
+      })
+    })
+  },
+
+  //装卸时间
+  loadTimeData:function(){
+    app.request.GET({
+      url: app.API.loadTimeNow,
+      params: {
+        pointId     : this.data.loadPointArray[this.data.loadPointIndex].id,
+      },
+      page: this,
+      successFun: true
+    }).then(res => {
+      let timeList = res.data.data
+      timeList.forEach((element,index) => {
+        timeList[index].time = element.beginTime + '~' + element.endTime
+      });
+      this.setData({
+        loadTimeArray : timeList
+      })
+    })
+  },
+
+  //装卸时间
+  loadUserData:function(){
+    app.request.GET({
+      url: app.API.roleUser,
+      params: {
+        roleName : '起卸员',
+      },
+      page: this,
+      successFun: true
+    }).then(res => {
+      this.setData({
+        loadUserArray:res.data.data
+      })
+    })
   },
 
   //下拉选择
@@ -30,36 +122,73 @@ Page({
     let { pickername } = e.target.dataset
     let getIndex = pickername + 'Index'
     app.util.getPickerIndex(this, getIndex, e);
-  },
+    switch (pickername) {
+      case 'loadPoint': //客户
+        this.loadTimeData() //获取起卸时段
+        break;
+    }
+  }, 
 
-  //日期选择
-  bindDateChange(e){
-    console.log(e.detail.value)
+  // 添加S
+  showPopup(e) {
+    let { id, loadPoint, loadTime, userId } = e.currentTarget.dataset
     this.setData({
-      [e.target.dataset.pickertype]: e.detail.value
-    })
+      show: true,
+      id: id,
+      loadPointId:loadPoint,//起卸地点
+      loadTimeId:loadTime,//起卸时段
+      userId:userId
+    });
+    this.loadPointData()
+    this.loadUserData()
+  },
+  onClose() {
+    this.setData({
+      show: false,
+      id: '',
+      loadPointId:'',//起卸地点
+      loadTimeId:'',//起卸时段
+      userId:'',//执行员
+    });
   },
 
   /**
-   * 页面上拉触底事件的处理函数
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
    */
-  bindscrolltolowerFun() {
+  onShow() {
     
   },
 
+  //页面跳转
+  toLink: function (e) {
+    let { url } = e.currentTarget.dataset
+    wx.navigateTo({
+      url: url
+    })
+  },
+  
   //表单提交 carTaskAdd
-  formSubmit: function ({detail:{value}}) {
+  formSubmitAllocation: function ({detail:{value}}) {
     var warn = ""; //弹框时提示的内容
     if (value.loadPointId == '') {
       warn = "请选择装卸点位！";
     } else if(value.loadTimeId == ''){
       warn = "请选择装卸时间！";
+    } else if(value.userId == ''){
+      warn = "请选择执行员！";
     }
     if (warn != '') {
       app.util.checkForm(warn);
     } else {
       app.request.POST({
-        url: app.API.orderloadAdd,
+        url: app.API.appointAdd,
         params: value,
         page: this,
         isLoadingTxt: '提交中...',
@@ -82,31 +211,17 @@ Page({
     }
   },
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload() {
 
   },
 
@@ -114,20 +229,39 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    this.setData({
+      searchVal: ''
+    })
+    if (wx.getStorageSync('loginStatus')) {
+      this.getAllocationListFun();
+    } else {
+      wx.stopPullDownRefresh();
+    }
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    
+    this.data.page++;
+    let params = {
+      current   : this.data.page,
+      size      : this.data.limit,
+      appointId : this.data.appointId,
+      appointType  : '1'
+    }
+    app.request.pageFirst({
+      url: app.API.bizloaddispatchPage,
+      page: this,
+      params: params,
+      loadType: true //加载类型，是否是下拉加载
+    });
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage() {
 
   }
 })

otherPages/loadAppoint/allocation.json

@@ -1,19 +1,28 @@
 {
   "navigationBarTitleText": "起卸分配",
+  "backgroundTextStyle": "dark",
+  "enablePullDownRefresh": true,
   "usingComponents": {
+    "van-notice-bar": "@vant/weapp/notice-bar/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "van-tag": "@vant/weapp/tag/index",
+    "van-sticky": "@vant/weapp/sticky/index",
+    "van-search": "@vant/weapp/search/index",
+    "van-icon": "@vant/weapp/icon/index",
+    "van-empty": "@vant/weapp/empty/index",
+    "van-popup": "@vant/weapp/popup/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-button": "@vant/weapp/button/index",
+    "van-loading": "@vant/weapp/loading/index",
+    "van-dropdown-menu": "@vant/weapp/dropdown-menu/index",
+    "van-dropdown-item": "@vant/weapp/dropdown-item/index",
+    "van-skeleton": "@vant/weapp/skeleton/index",
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
     "van-uploader": "@vant/weapp/uploader/index",
     "car-num-input": "/components/CarNumInput/index",
-    "van-icon": "@vant/weapp/icon/index",
-    "van-cell": "@vant/weapp/cell/index",
     "van-cell-group": "@vant/weapp/cell-group/index",
-    "van-field": "@vant/weapp/field/index",
-    "van-button": "@vant/weapp/button/index",
-    "van-popup": "@vant/weapp/popup/index",
-    "van-datetime-picker": "@vant/weapp/datetime-picker/index",
-    "van-radio": "@vant/weapp/radio/index",
-    "van-radio-group": "@vant/weapp/radio-group/index",
-    "van-search": "@vant/weapp/search/index"
+    "van-image": "@vant/weapp/image/index"
   }
 }

otherPages/loadAppoint/allocation.less

@@ -1,9 +1,22 @@
-/* pages/loadAppoint/allocation.wxss */
-.dateBox{
-  display: flex;
-  background-color: #fff;
-  align-items: center;
-  .contactInput{
-    flex: 1;
-  }
+/* pages/loadAppoint/index.wxss */
+.container{
+  padding-bottom: 120rpx;
+}
+.bottomBtn{
+  padding-top: 20rpx;
+  text-align: right;
+}
+.bottomBtn button {
+  margin-left: 0 !important;
+}
+
+.user{
+  margin-top: 15rpx;
+  color: #666;
+  font-size: 24rpx;
+}
+.time{
+  margin-top: 15rpx;
+  color: #666;
+  font-size: 24rpx;
 }

otherPages/loadAppoint/allocation.wxml

@@ -1,108 +1,100 @@
-<!--pages/loadAppoint/allocation.wxml-->
-<view class="container" style="padding-bottom:100px;">
-  <view class="height20"></view>
-  <view>
-    <form bindsubmit="formSubmit">
-      <input name="orderId" value='{{ orderId }}' hidden='true' />
-      <!-- <van-field label="订单编号" value="{{ orderNumber }}" input-align="right" readonly></van-field> -->
-      <view class="part">
-        <!-- 负责人 -->
-        <van-field label="负责人" required input-align="right" bindtap="hideKeybord" is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
-              <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
-            </picker>
-          </view>
-        </van-field>
-
-        <!-- 开始时间 -->
-        <van-field label="时间" required readonly input-align="right" title-width="80rpx">
-          <input name="timeSlot" value="{{statTime+'～'+endTime}}" hidden='true' />
-          <view class="dateBox" slot="input" style="flex:1">
-            <view class="contactInput">
-              <van-field label="" name="statTime" placeholder="请选择" value="" input-align="center">
-                <view slot="input" style="width: 100%;">
-                  <picker mode="date" fields="day" name="statTime" value="{{statTime}}" bindchange="bindDateChange" data-pickertype='statTime'>
-                    <view class="selectPlaceholder"> {{statTime?statTime:'选择开始时间'}}</view>
-                  </picker>
-                </view>
-              </van-field>
-            </view>
-            <view>-</view>
-            <view class="contactInput">
-              <van-field label="" name="endTime" placeholder="请选择" value="" input-align="center">
-                <view slot="input" style="width: 100%;">
-                  <picker mode="date" fields="day" name="endTime" value="{{endTime}}" bindchange="bindDateChange" data-pickertype='endTime'>
-                    <view class="selectPlaceholder"> {{endTime?endTime:'选择结束时间'}}</view>
-                  </picker>
-                </view>
-              </van-field>
-            </view>
-          </view>
-        </van-field>
-
-        <!-- 吊机员 -->
-        <van-field label="吊机员" required input-align="right" bindtap="hideKeybord" is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
-              <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
-            </picker>
-          </view>
-        </van-field>
-
-        <!-- 操作员 -->
-        <van-field label="操作员" required input-align="right" bindtap="hideKeybord" is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
-              <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
-            </picker>
-          </view>
-        </van-field>
+<!--pages/loadAppoint/allocationIndex.wxml-->
+<!--pages/loadAppoint/index.wxml-->
+<view class="container listMain">
+  <block wx:if="{{loginStatus}}">
+    <view url="" class="addBtn" catch:tap="showPopup" hover-class="none" catchtouchmove="buttonMove" 
+    bindtouchstart="buttonStart" bindtouchend="buttonEnd" style="top:{{buttonTop}}px;left:{{buttonLeft}}px;" wx:if="{{roleCodeList == 'dispatcher' || roleCodeList == 'bizAdmin'}}">
+      <van-icon name="plus" size="30px" />
+    </view>
 
-        <!-- 巡检员 -->
-        <van-field label="巡检员" required input-align="right" bindtap="hideKeybord" is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
-              <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
-            </picker>
+    <view class="width710">
+      <block wx:if="{{!requestStatu}}">
+        <block wx:if="{{resData.length>0}}">
+          <block wx:for="{{resData}}" wx:key="index">
+            <navigator url="info?id={{item.id}}&name={{item.name}}&account={{item.account}}&index={{index}}" class="listItem">
+              <view class="title van-ellipsis">
+                <van-icon class='iconfont' name='/images/menuImg1.png' size="36rpx"></van-icon>
+                <text>{{item.loadPoint}}</text>
+              </view>
+              <view class="user"><van-icon name="user-o" size="18"/><text> {{ item.userName }}</text></view>
+              <view class="time"><van-icon name="clock-o" size="18"/><text> {{ item.beginTime }} ~ {{item.endTime}}</text></view>
+              
+              <view class="bottomBtn">
+                <!-- <van-button type="info" size="small" data-id="{{ item.id }}" data-load-point="{{ item.loadPointId }}"  data-load-time="{{ item.loadTimeId }}" data-user-id="{{ item.userId }}" catchtap="toUpdate" style="margin-right: 20rpx;">修改</van-button> -->
+                <van-button type="danger" size="small" data-id="{{item.id}}" data-load-point="{{item.loadPoint}}" catchtap="delFun">删除</van-button>
+              </view>
+            </navigator>
+          </block>
+          <!-- 底部加载动画 -->
+          <view class='more'>
+            <block wx:if="{{more}}">
+              <van-loading size="24px" color="#1989fa">加载中...</van-loading>
+            </block>
+            <block wx:else>{{nomore}}</block>
           </view>
-        </van-field>
-
-        <!-- 起卸点 -->
-        <van-field label="起卸点" required input-align="right" bindtap="hideKeybord" is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
-              <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
-            </picker>
-          </view>
-        </van-field>
-
-        <!-- 起卸时段 -->
-        <van-field label="起卸时段" required input-align="right" bindtap="hideKeybord" wx:if="{{loadTimeArray.length>0}}" type="textarea" autosize  is-link>
-          <view slot="input" style="width: 100%;">
-            <input name="loadTimeId" value='{{loadTimeArray[loadTimeIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{loadTimeIndex}}" range="{{loadTimeArray}}" range-key="time" data-pickername='loadTime'>
-              <view class="selectPlaceholder">{{loadTimeArray[loadTimeIndex].time?loadTimeArray[loadTimeIndex].time:defaultText}}</view>
-            </picker>
-          </view>
-        </van-field>
-        <van-field required wx:else label="起卸时段" name="deliveryTimeId" value="" readonly input-align="right" placeholder="请先选择起卸点" placeholder-style="color:red;" />
-
+          <view style="height: 180rpx;"> </view>
+        </block>
+        <block wx:else>
+          <van-empty description="未搜索到起卸分配记录" image="/images/null1.png" />
+        </block>
+      </block>
+    </view>
+  </block>
+  <block wx:else>
+    <view>
+      <van-empty image="/images/loginNull.png">
+        <view slot="description" style="text-align: center;">
+          <text style="display:block;margin-bottom: 20rpx;">您还未登录，登录后查看更多～</text>
+          <van-button type="info" bindtap="toLogin">立即登录</van-button>
+        </view>
+      </van-empty>
+    </view>
+  </block>
+</view>
 
-      </view>
+<!-- 添加弹窗 -->
+<van-popup show="{{ show }}" position="bottom" round closeable custom-style="width:100%;padding:0rpx 30rpx 280rpx;" bind:close="onClose">
+  <view style="height: 90rpx;line-height: 90rpx;text-align: center;">添加起卸分配</view>
+  <form bindsubmit="formSubmitAllocation">
+    <input name="appointId" value='{{ appointId }}' hidden='true' />
+    <view class="part">
+      <!-- 起卸点位 -->
+      <van-field label="起卸点位" required input-align="right" bindtap="hideKeybord" is-link>
+        <view slot="input" style="width: 100%;">
+          <input name="loadPointId" value='{{loadPointArray[loadPointIndex].id}}' hidden='true' />
+          <picker bindchange="bindPickerChange" value="{{loadPointIndex}}" range="{{loadPointArray}}" range-key="loadPoint" data-pickername='loadPoint'>
+            <view class="selectPlaceholder"> {{loadPointArray[loadPointIndex].loadPoint?loadPointArray[loadPointIndex].loadPoint:defaultText}}</view>
+          </picker>
+        </view>
+      </van-field>
 
-      <view class="fixedBtn submitBtn">
-        <van-button loading="{{isSubmitting}}" round block disabled="{{isSubmitting}}" loading-text="{{isSubmitting?'提交中...':''}}" type="info" form-type="submit">确定
-        </van-button>
-      </view>
+      <!-- 起卸时段 -->
+      <van-field label="起卸时段" required input-align="right" bindtap="hideKeybord" wx:if="{{loadTimeArray.length>0}}" type="textarea" autosize  is-link>
+        <view slot="input" style="width: 100%;">
+          <input name="loadTimeId" value='{{loadTimeArray[loadTimeIndex].id}}' hidden='true' />
+          <picker bindchange="bindPickerChange" value="{{loadTimeIndex}}" range="{{loadTimeArray}}" range-key="time" data-pickername='loadTime'>
+            <view class="selectPlaceholder">{{loadTimeArray[loadTimeIndex].time?loadTimeArray[loadTimeIndex].time:defaultText}}</view>
+          </picker>
+        </view>
+      </van-field>
+      <van-field required wx:else label="起卸时段" name="loadTimeId" value="" readonly input-align="right" placeholder="请先选择起卸点位" placeholder-style="color:red;" />
+      
+      <!-- 执行员 -->
+      <van-field label="执行员" required input-align="right" bindtap="hideKeybord" is-link>
+        <view slot="input" style="width: 100%;">
+          <input name="userId" value='{{loadUserArray[loadUserIndex].id}}' hidden='true' />
+          <picker bindchange="bindPickerChange" value="{{loadUserIndex}}" range="{{loadUserArray}}" range-key="name" data-pickername='loadUser'>
+            <view class="selectPlaceholder"> {{loadUserArray[loadUserIndex].name?loadUserArray[loadUserIndex].name:defaultText}}</view>
+          </picker>
+        </view>
+      </van-field>
+    </view>
 
-    </form>
-  </view>
-</view>
+    <view class="fixedBtn submitBtn">
+      <van-button loading="{{isSubmitting}}" round block disabled="{{isSubmitting}}" loading-text="{{isSubmitting?'提交中...':''}}" type="info" form-type="submit">确定
+      </van-button>
+    </view>
+  </form>
+</van-popup>
 
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>
+<wxs module="filters" src="../../utils/filter.wxs"></wxs>

otherPages/loadAppoint/allocation.wxss

@@ -1,9 +1,11 @@
-/* pages/loadAppoint/allocation.wxss */
-.dateBox {
-  display: flex;
-  background-color: #fff;
-  align-items: center;
+/* pages/loadAppoint/index.wxss */
+.container {
+  padding-bottom: 120rpx;
 }
-.dateBox .contactInput {
-  flex: 1;
+.bottomBtn {
+  padding-top: 20rpx;
+  text-align: right;
+}
+.bottomBtn button {
+  margin-left: 0 !important;
 }

otherPages/loadAppoint/index.js

@@ -19,6 +19,10 @@ Page({
     more: false,
     nomore: '',
     resData:[],
+    
+    allocationLoadShow:false, //起卸调度列表弹窗
+    dispatchLoadShow:false, //装载车调度列表弹窗
+
   },
 
   /**

otherPages/loadAppoint/index.wxml

@@ -5,7 +5,7 @@
       <view class="topFilter">
         <view class="topSeach">
           <view class="rightBox" style="position: relative;">
-            <van-search value="{{ searchVal }}" shape="round" placeholder="请输入车牌号码" bind:change="onChange" bind:search="onSearch" bind:cancel="onCancel" use-action-slot>
+            <van-search value="{{ searchVal }}" shape="round" placeholder="查询预约单号" bind:change="onChange" bind:search="onSearch" bind:cancel="onCancel" use-action-slot>
             </van-search>
           </view>
         </view>
@@ -32,9 +32,9 @@
               <view class="info"><text>单价：{{item.orderPrice + ' 元/吨'}}</text> / <text>总价：{{item.orderAmount + ' 元'}}</text></view>
              
               <view class="bottomBtn" wx:if="{{ roleCodeList == 'dispatcher' && (item.status == '4' || item.status == '5' || item.status == '6') && item.arriveStatus == '2' }}">
-                <van-button type="info" size="small" data-id="{{item.id}}" data-type="{{item.appointmentType}}" data-url="allocation?id={{item.id}}" bind:tap="toLink" style="margin-right: 20rpx;">起卸调度</van-button>
+                <van-button type="primary" size="small" data-url="allocation?appointId={{item.id}}" catchtap="toLink" style="margin-right: 20rpx;">起卸调度</van-button>
 
-                <van-button type="primary" size="small" data-id="{{item.id}}" data-type="{{item.appointmentType}}" data-url="dispatch?id={{item.id}}" bind:tap="toLink" style="margin-right: 20rpx;">装卸调度</van-button>
+                <van-button type="info" size="small" data-url="dispatch?appointId={{item.id}}" catchtap="toLink" style="margin-right: 20rpx;">装卸调度</van-button>
               </view>
             </navigator>
           </block>

otherPages/loadAppoint/info.less

@@ -1 +1,32 @@
-/* pages/loadAppoint/info.wxss */
+/* pages/loadAppoint/info.wxss */
+.orderLoadBox{
+  > .title{
+    height: 100rpx;
+    line-height: 100rpx;
+    font-weight: bold;
+    font-size: 40rpx;
+    color: #14284A;
+    text-align: center;
+    background: linear-gradient( 180deg, #D4E1F6 0%, #FFFFFF 100%);
+  }
+  .dialogUser{
+    height: 50vh;
+    padding-top: 30rpx;
+    .saleItem{
+      width: 700rpx;
+      margin:0 auto 30rpx;
+      padding-bottom: 20rpx;
+      border-bottom: 1px solid #eee;
+      .title{
+        font-size: 36rpx;
+        display: flex;
+        justify-content: space-between;
+      }
+      .time{
+        margin-top: 15rpx;
+        color: #666;
+        font-size: 24rpx;
+      }
+    }
+  }
+}

otherPages/loadAppoint/info.wxml

@@ -33,18 +33,26 @@
   </view>
   <view style="height: 30px;"></view>
 
-  <view class="part">
+  <view class="orderLoadBox">
     <block wx:if="{{supplierData.length>0}}">
-      <block wx:for="{{supplierData}}" wx:key="index">
-        <van-field label="汽运供应商{{index+1}}" readonly></van-field>
-        <van-field label="供应商名称" input-align="right" model:value="{{item.supplierName}}" readonly><text></text></van-field>
-        <van-field label="过磅重量" input-align="right" model:value="{{item.netWeight + ' 吨'}}" readonly></van-field>
-        <van-field label="卸货重量" input-align="right" model:value="{{item.shippingWeight + ' 吨'}}" readonly></van-field>
-        <view style="height: 30px;"></view>
-      </block>
+      <view class="title">汽运供应商列表</view>
+      <scroll-view class="dialogUser" scroll-y bindscrolltolower="bindscrolltolowerFun">
+        <block wx:for="{{ supplierData }}" wx:key="index">
+          <view class="saleItem">
+            <view class="title">
+              <view><van-icon name="manager-o" size="18"/> {{ item.supplierName }} </view> 
+            </view>
+            <view class="time"><van-icon name="bars" size="18"/> 过磅重量：{{item.netWeight + ' 吨'}} / 卸货重量：{{ item.shippingWeight + ' 吨' }}</view>
+          </view>
+        </block>
+      </scroll-view>
     </block>
   </view>
+  <view style="height: 30px;"></view>
 
 </view>
 
+
+  
+
 <wxs module="filters" src="../../utils/filter.wxs"></wxs>

otherPages/loadArrive/add.js

@@ -95,7 +95,6 @@ Page({
     }).then(res => {
       let appointList = res.data.data
       appointList.forEach((element,index) => {
-        // appointList[index].name = element.loadNumber + '-' + element.orderPrice
         appointList[index].name = element.loadNumber
       });
       this.setData({
@@ -105,15 +104,29 @@ Page({
   },
 
   //下拉选择
-  bindPickerChange: function (e) { //下拉菜单
+  bindPickerChange: function (e) { 
     let { pickername } = e.target.dataset
     let getIndex = pickername + 'Index'
     app.util.getPickerIndex(this, getIndex, e);
-    // switch (pickername) {
-    //   case 'appointId': //报港预约
-    //     this.getSaleOrderData()
-    //     break;
-    // }
+    switch (pickername) {
+      case 'loadappoint': //报港预约
+        app.request.GET({
+          url: app.API.bizloadappointDetail,
+          params: {'id' : this.data.loadappointArray[this.data.loadappointIndex].id},
+          page: this,
+          successFun: true
+        }).then(res => {
+          let getInfo = res.data.data;
+          this.setData({
+            customerName    : getInfo.customerName?getInfo.customerName:"",
+            customerContact : getInfo.customerContact?getInfo.customerContact:"",
+            customerPhone   : getInfo.customerPhone?getInfo.customerPhone:"",
+            goodsName       : getInfo.goodsName?getInfo.goodsName:"",
+            goodsCode       : getInfo.goodsCode?getInfo.goodsCode:"",
+          })
+        })
+        break;
+    }
   },
 
   //图片上传

otherPages/loadArrive/add.wxml

@@ -17,7 +17,17 @@
             <van-icon name="arrow" />
           </view>
         </van-field>
-
+        <van-field label="客户名称" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerName" readonly value="{{ customerName }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="联系人" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerContact" readonly value="{{ customerContact }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="联系电话" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerPhone" readonly value="{{ customerPhone }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="货品名称" wx:if="{{loadappointArray[loadappointIndex].id}}" name="goodsName" readonly value="{{ goodsName }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="货品编码" wx:if="{{loadappointArray[loadappointIndex].id}}" name="goodsCode" readonly value="{{ goodsCode }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        
         <van-field label="船号" required name="shipNo" value="{{ shipNo }}" placeholder="请填写船号" input-align="right" ></van-field>
 
         <van-field label="报港数量" type="digit" required name="arriveNumber" value="{{ arriveNumber }}" placeholder="请输入报港数量" input-align="right" border="{{ false }}">

otherPages/loadArrive/edit.js

@@ -89,6 +89,21 @@ Page({
     })
     //获取起卸预约信息
     this.getLoadappointData()
+    app.request.GET({
+      url: app.API.bizloadappointDetail,
+      params: {'id' : getInfo.appointId},
+      page: this,
+      successFun: true
+    }).then(res => {
+      let getInfo = res.data.data;
+      this.setData({
+        customerName    : getInfo.customerName?getInfo.customerName:"",
+        customerContact : getInfo.customerContact?getInfo.customerContact:"",
+        customerPhone   : getInfo.customerPhone?getInfo.customerPhone:"",
+        goodsName       : getInfo.goodsName?getInfo.goodsName:"",
+        goodsCode       : getInfo.goodsCode?getInfo.goodsCode:"",
+      })
+    })
   },
 
   //选择起卸预约
@@ -101,7 +116,6 @@ Page({
     }).then(res => {
       let appointList = res.data.data
       appointList.forEach((element,index) => {
-        // appointList[index].name = element.loadNumber + '-' + element.orderPrice
         appointList[index].name = element.loadNumber
       });
       this.setData({
@@ -112,15 +126,29 @@ Page({
   },
 
   //下拉选择
-  bindPickerChange: function (e) { //下拉菜单
+  bindPickerChange: function (e) { 
     let { pickername } = e.target.dataset
     let getIndex = pickername + 'Index'
     app.util.getPickerIndex(this, getIndex, e);
-    // switch (pickername) {
-    //   case 'appointId': //报港预约
-    //     this.getSaleOrderData()
-    //     break;
-    // }
+    switch (pickername) {
+      case 'loadappoint': //报港预约
+        app.request.GET({
+          url: app.API.bizloadappointDetail,
+          params: {'id' : this.data.loadappointArray[this.data.loadappointIndex].id},
+          page: this,
+          successFun: true
+        }).then(res => {
+          let getInfo = res.data.data;
+          this.setData({
+            customerName    : getInfo.customerName?getInfo.customerName:"",
+            customerContact : getInfo.customerContact?getInfo.customerContact:"",
+            customerPhone   : getInfo.customerPhone?getInfo.customerPhone:"",
+            goodsName       : getInfo.goodsName?getInfo.goodsName:"",
+            goodsCode       : getInfo.goodsCode?getInfo.goodsCode:"",
+          })
+        })
+        break;
+    }
   },
 
   //图片上传

otherPages/loadArrive/edit.wxml

@@ -18,6 +18,16 @@
             <van-icon name="arrow" />
           </view>
         </van-field>
+        <van-field label="客户名称" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerName" readonly value="{{ customerName }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="联系人" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerContact" readonly value="{{ customerContact }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="联系电话" wx:if="{{loadappointArray[loadappointIndex].id}}" name="customerPhone" readonly value="{{ customerPhone }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="货品名称" wx:if="{{loadappointArray[loadappointIndex].id}}" name="goodsName" readonly value="{{ goodsName }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
+        <van-field label="货品编码" wx:if="{{loadappointArray[loadappointIndex].id}}" name="goodsCode" readonly value="{{ goodsCode }}" placeholder="选择起卸预约订单自动填入" input-align="right">
+        </van-field>
         
         <van-field label="船号" required name="shipNo" value="{{ info.shipNo }}" placeholder="请填写船号" input-align="right" ></van-field>
 

pages/salesOrderMan/orderloadReplace.js

@@ -32,7 +32,7 @@ Page({
       goodsConfId   : options.deliveryTimeId,
       orderNumber   : options.orderNumber,
       confStartTime : options.confStartTime,
-      confEndTime   :options.confEndTime,
+      confEndTime   : options.confEndTime,
     })
     //装卸点位
     this.loadPointData()

utils/api.js

@@ -8,6 +8,8 @@ const api = {
   'getTree':'/biz/dict/tree',//字典
   'bindingWX':'/wx/bindingWX',//绑定微信
   'supplierPage':'/biz/bizsupplier/getList',//供应商
+  'roleUser' : '/biz/user/userListByRole', //获取人员  roleName=起卸员
+
 
   //销售业务
   //物流订单
@@ -73,6 +75,7 @@ const api = {
   //装载车调度列表
   'loadPoint':'/biz/bizloadpoint/getList',//装卸点位下拉列表
   'loadTime':'/biz/bizloadtime/search',//装卸时间下拉列表
+  'loadTimeNow':'/biz/bizloadtime/searchNow',//装卸时间下拉列表
   'orderloadAdd':'/biz/bizorderload/add',//装载车调度
   'orderloadDelete':'/biz/bizorderload/delete',//删除装载车调度
   'bizorderloadList':'/biz/bizorderload/page',//装载车调度列表
@@ -90,7 +93,17 @@ const api = {
   'bizloadappointDetail':'/biz/bizloadappoint/detail',//详情
   'bizloadappointAudit':'/biz/bizloadappoint/audit',//审核
   'bizloadappointSupplier':'/biz/bizloadappointsupplier/getList',//起卸获取供应商
+  'bizloaddispatchPage':'/biz/bizloaddispatch/getPageList',//获取起卸调度-分页列表   起卸调度loadType=1   装载车loadType=2
+  
+  'appointAdd':'/biz/bizloaddispatch/addLoad',//起卸添加
+  'appointDelete':'/biz/bizloaddispatch/delete',//起卸删除
+  'appointReplace':'/biz/bizloaddispatch/replaceLoad',//起卸更换
+
+  'dispatchAdd':'/biz/bizloaddispatch/addDispatch',//装卸添加
+  'dispatchDelete':'/biz/bizloaddispatch/deleteDispatch',//装卸删除
+  'dispatchReplace':'/biz/bizloaddispatch/replaceDispatch',//装卸更换
   
+
   //报港预约
   'bizloadarrivePage':'/biz/bizloadarrive/page',//分页列表
   'bizloadarriveDetail':'/biz/bizloadarrive/detail',//详情
@@ -99,10 +112,6 @@ const api = {
   'bizloadarriveDelete':'/biz/bizloadarrive/delete',//删除
   'bizloadarriveAudit':'/biz/bizloadarrive/auditArrive',//审核
 
-  
-  
-  
-  
 
   
 }

utils/env.js

@@ -2,7 +2,7 @@ const accountInfo = wx.getAccountInfoSync();
 const envVersion = accountInfo.miniProgram.envVersion; //'develop' | 'trial' | 'release'
 const URLMap = {
   develop: { // 开发版
-    BASE_URL: 'http://192.168.0.127:83', //接口地址
+    BASE_URL: 'http://192.168.0.148:83', //接口地址
     BASEIMG_URL: 'https://wx.js-whzl.com:8055/preview/', //图片预览上传地址
   },
   trial: { // 体验版