报港预约

app.json

@@ -53,10 +53,6 @@
       "root": "otherPages",
       "name": "other",
       "pages": [
-        "upDownAllocation/index",
-        "upDownAllocation/allocation",
-        "upDownAllocation/info",
-
         "repairDispatch/index",
         "repairDispatch/dispatch",
         "repairDispatch/info",
@@ -76,7 +72,12 @@
         "loadArrive/index",
         "loadArrive/add",
         "loadArrive/edit",
-        "loadArrive/info"
+        "loadArrive/info",
+
+        "loadAppoint/index",
+        "loadAppoint/info",
+        "loadAppoint/allocation",
+        "loadAppoint/dispatch"
 
       ],
       "independent": false

app.wxss

@@ -57,7 +57,7 @@ page {
   padding-left: 30rpx;
 }
 /* 状态标签设置 */
-.status{
+.status,.arriveStatus1{
   float: right;
   display: inline-block;
   padding: 0 18rpx;
@@ -65,7 +65,7 @@ page {
   color: var(--default-color);
   background-color: var(--default-bg-color);
 }
-.status1,.status7,.orderStatus2,.carStatus1,.orderType2{
+.status1,.status7,.orderStatus2,.carStatus1,.orderType2,.arriveStatus2{
   color: var(--primary-color) !important;
   background-color: var(--primary-bg-color) !important;
 }
@@ -73,7 +73,7 @@ page {
   color: var(--warning-color) !important;
   background-color: var(--warning-bg-color) !important;
 }
-.status3,.status9,.orderStatus6,.carStatus2{
+.status3,.status9,.orderStatus6,.carStatus2,.arriveStatus3{
   color: var(--danger-color) !important;
   background-color: var(--danger-bg-color) !important;
 }

otherPages/loadArrive/add.js

@@ -89,7 +89,7 @@ Page({
   getLoadappointData:function(){
     app.request.GET({
       url: app.API.bizloadappointList,
-      params: {},
+      params: {'status' : '2'},
       page: this,
       successFun: true
     }).then(res => {

otherPages/loadArrive/edit.js

@@ -10,86 +10,103 @@ Page({
     defaultText: '请选择',
     isSubmitting: false,
 
-    orderTypeArray:[],//订单类型
-    saleOrderType:'',
+    loadappointArray:[], //起卸预约
+    loadappointIndex:null,
 
-    customerArray:[], //客户
-    customerIndex:null,
+    fileList:[],
 
-    saleOrderArray:[], //销售订单
-    saleOrderIndex:null,
-
-    confTimeArray:[], //提货时间
-    confTimeIndex:null,
-
-    supplierArray:[],//供应商
-    supplierIndex:null,
-
-    freightPrice:'',//运费单价
+    minHour: 0,
+    maxHour: 24,
+    minDate: new Date().getTime(),
+    maxDate: new Date(9999, 12, 31).getTime(),
+    currentDate: new Date().getTime(),
+    show: false,
+    currentChoose: ''
+  },
+  openPicker() {
+    this.setData({ show: true })
+  },
+  onConfirm(e) {
+    this.setData({ show: false, currentChoose: this.formatDate(new Date(e.detail)) })
+  },
+  onClose() {
+    this.setData({ show: false })
+  },
+  onCancel() {
+    this.setData({ show: false })
+  },
+  formatDate(date) {
+    let taskStartTime
+    if (date.getMonth() < 9) {
+      taskStartTime = date.getFullYear() + "-0" + (date.getMonth() + 1) + "-"
+    } else {
+      taskStartTime = date.getFullYear() + "-" + (date.getMonth() + 1) + "-"
+    }
+    if (date.getDate() < 10) {
+      taskStartTime += "0" + date.getDate()
+    } else {
+      taskStartTime += date.getDate()
+    }
+    if (date.getHours() < 10) {
+      taskStartTime += " " + "0" + date.getHours()
+    } else {
+      taskStartTime += " " + date.getHours()
+    }
+    if (date.getMinutes() < 10) {
+      taskStartTime += ":" + "0" + date.getMinutes()
+    } else {
+      taskStartTime += ":" + date.getMinutes()
+    }
+    this.setData({
+      taskStartTime: taskStartTime,
+    })
+    return taskStartTime;
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    //根据列表页面获取详情
     var pages = getCurrentPages();
     var prevPage = pages[pages.length - 2];
     let getInfo = prevPage.data.resData[options.index]
-    this.setData({
-      info: getInfo,
-      saleOrderWeight:getInfo.orderWeight,
-      saleOrderType:getInfo.orderType,
-      freightPrice:getInfo.freightPrice
-    })
-    //订单类型
-    let treeData = app.globalData.treeArr
-    for (const element of treeData) {
-      let arrStr;
-      switch (element.dictValue) {
-        case 'order_type':
-          arrStr = "orderTypeArray";
-          break;
-      }
-      this.setData({
-        [arrStr]: element.children
-      })
+    //司机回签图片
+    let fileList = []
+    if(getInfo.sailFilePath){
+      let unloadImgArr = getInfo.sailFilePath.split(',')
+      unloadImgArr.forEach(element => {
+        fileList.push({
+          url: app.host.BASEIMG_URL+element,
+          isImage:true
+        })
+      });
     }
-
-    //获取客户列表接口
-    this.getCustomerData()
-    //供应商
-    this.getsupplierData()
-  },
-
-  //选择客户
-  getCustomerData:function(){
-    //收货单位列表接口
-    app.request.GET({
-      url: app.API.getCustomerList,
-      params: {},
-      page: this,
-      successFun: true
-    }).then(res => {
-      this.setData({
-        customerArray:res.data.data,
-        customerIndex: app.util.getDicIndex(res.data.data, this.data.info.customerId, 'id')
-      })
-      this.getSaleOrderData('info')
+    this.setData({
+      info          : getInfo,
+      currentChoose : getInfo.arriveTime,
+      fileList      : fileList
     })
+    //获取起卸预约信息
+    this.getLoadappointData()
   },
 
-  //选择供应商
-  getsupplierData:function(){
-    //收货单位列表接口
+  //选择起卸预约
+  getLoadappointData:function(){
     app.request.GET({
-      url: app.API.supplierPage,
-      params: {},
+      url: app.API.bizloadappointList,
+      params: {'status' : '2,3'},
       page: this,
       successFun: true
     }).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({
-        supplierArray:res.data.data,
-        supplierIndex: app.util.getDicIndex(res.data.data, this.data.info.supplierId, 'id')
+        loadappointArray: appointList,
+        loadappointIndex: app.util.getDicIndex(res.data.data, this.data.info.appointId, 'id')
       })
     })
   },
@@ -99,74 +116,46 @@ Page({
     let { pickername } = e.target.dataset
     let getIndex = pickername + 'Index'
     app.util.getPickerIndex(this, getIndex, e);
-    switch (pickername) {
-      case 'customer': //客户
-        this.setData({
-          confTimeArray:[],
-          confTimeIndex:null,
-          saleOrderArray:[],
-          saleOrderIndex:null,
-          orderType:''
-        })
-        this.getSaleOrderData() //获取销售订单
-        break;
-      case 'saleOrder': //销售订单
-        this.setData({
-          saleOrderType:this.data.saleOrderArray[this.data.saleOrderIndex].saleOrderType,
-          confTimeArray:[],
-          confTimeIndex:null,
-          saleOrderWeight:this.data.saleOrderArray[this.data.saleOrderIndex].saleOrderWeight
-        })
-        this.getConfTimeData() //获取提货时间段
-        break;
-    }
+    // switch (pickername) {
+    //   case 'appointId': //报港预约
+    //     this.getSaleOrderData()
+    //     break;
+    // }
   },
 
-  //选择销售订单
-  getSaleOrderData:function(type){
-    app.request.GET({
-      url: app.API.getOrderByCustomerId,
-      params: {
-        id:this.data.customerArray[this.data.customerIndex].id
-      },
+  //图片上传
+  afterRead:function(event){
+    const { file } = event.detail;
+    const { type } = event.currentTarget.dataset
+    app.request.uploadDIY({
+      url: app.API.uploadImgMap,
       page: this,
+      filePaths:file.url,
+      setfiled:'file',
+      params: {},
+      //isToken: false,
+      isLoading: false,
       successFun: true
     }).then(res => {
-      let orderList = res.data.data
-      orderList.forEach((element,index) => {
-        orderList[index].name = element.saleGoodsName + '-' + element.saleOrderNumber
-      });
-      this.setData({
-        saleOrderArray:orderList,
-        saleOrderIndex: type?app.util.getDicIndex(orderList, this.data.info.saleOrderInfo, 'id'):null
-      })
-      if(type){
-        this.getConfTimeData('info')
-      }
-      
+        const imgArray = this.data[type];
+        imgArray.push({
+          ...file,
+          url: app.host.BASEIMG_URL + JSON.parse(res.data).data.imageFile,
+          imgUrl: JSON.parse(res.data).data.imageFile
+        });
+        this.setData({
+          [type]: imgArray
+        });
     })
   },
 
-  //提货时间
-  getConfTimeData:function(type){
-    app.request.GET({
-      url: app.API.getTakeList,
-      params: {
-        goodsName:this.data.saleOrderArray[this.data.saleOrderIndex].saleGoodsName,
-        needWeight:this.data.saleOrderArray[this.data.saleOrderIndex].saleOrderWeight,
-        goodsCode:this.data.saleOrderArray[this.data.saleOrderIndex].saleGoodsCode
-      },
-      page: this,
-      successFun: true
-    }).then(res => {
-      let resData  = res.data.data
-      resData.forEach((element,index) => {
-        resData[index].timeRange = element.confStartTime + '至' + element.confEndTime
-      });
-      this.setData({
-        confTimeArray:resData,
-        confTimeIndex: type?app.util.getDicIndex(resData, this.data.info.deliveryTimeId, 'id'):null
-      })
+  // 删除图片
+  deleteImg: function (event) {
+    const { type } = event.currentTarget.dataset
+    let getFileList = this.data[type];
+    getFileList.splice(event.detail.index, 1)
+    this.setData({
+      [type]: getFileList
     })
   },
 
@@ -193,22 +182,39 @@ Page({
   //表单提交 carTaskAdd
   formSubmit: function ({detail:{value}}) {
     var warn = ""; //弹框时提示的内容
-    if (value.customerId == '') {
-      warn = "请选择客户！";
-    } else if(value.orderName == ''){
-      warn = "请选择销售订单！";
-    } else if(value.deliveryTimeId == ''){
-      warn = "请选择提货时间！";
-    } else if(value.supplierId == ''){
-      warn = "请选择供应商！";
-    } else if(value.freightPrice == ''){
-      warn = "请输入运费单价！";
+    if (value.appointId == '') {
+      warn = "请选择起卸预约订单！";
+    } else if(value.shipNo == ''){
+      warn = "请输入船号！";
+    } else if(value.arriveNumber == ''){
+      warn = "请输入报港数量！";
+    } else if(value.arriveTime == ''){
+      warn = "请选择到港时间！";
+    } 
+
+    /** 图片处理 START **/
+    let getfileList = this.data.fileList
+    if(getfileList.length < 1){
+      warn = "请上传发航单！";
     }
+    let fileNameList = []
+    let filePathList = []
+    getfileList.forEach((element,index) => {
+      fileNameList.push('图片'+(index+1)+'.'+element.imgUrl.split('.')[1])
+      filePathList.push(element.imgUrl)
+    });
+    value.fileNameList = fileNameList
+    value.filePathList = filePathList
+    /** 图片处理 END **/
+
+    // 处理时间
+    value.arriveTime = value.arriveTime + ":00"
+
     if (warn != '') {
       app.util.checkForm(warn);
     } else {
       app.request.POST({
-        url: app.API.orderEdit,
+        url: app.API.bizloadarriveEdit,
         params: value,
         page: this,
         isLoadingTxt: '提交中...',

otherPages/loadArrive/edit.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "修改物流订单",
+  "navigationBarTitleText": "修改报港预约",
   "usingComponents": {
     "van-checkbox": "@vant/weapp/checkbox/index",
     "van-checkbox-group": "@vant/weapp/checkbox-group/index",
@@ -14,6 +14,7 @@
     "van-datetime-picker": "@vant/weapp/datetime-picker/index",
     "van-radio": "@vant/weapp/radio/index",
     "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
     "van-search": "@vant/weapp/search/index"
   }
 }

otherPages/loadArrive/edit.wxml

@@ -5,25 +5,12 @@
     <form bindsubmit="formSubmit">
       <input name="id" value='{{info.id}}' hidden='true' />
       <view class="part">
-        <!-- 客户 -->
-        <van-field label="客户" required input-align="right" bindtap="hideKeybord">
+        <!-- 起卸预约订单 -->
+        <van-field label="起卸预约订单" required input-align="right">
           <view slot="input" style="width: 100%;">
-            <input name="customerId" value='{{customerArray[customerIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{customerIndex}}" range="{{customerArray}}" range-key="name" data-pickername='customer'>
-              <view wx:if="{{customerArray[customerIndex].name}}"> {{customerArray[customerIndex].name}}</view>
-              <view wx:else class="selectPlaceholder">{{defaultText}}</view>
-            </picker>
-          </view>
-          <view slot="right-icon">
-            <van-icon name="arrow" />
-          </view>
-        </van-field>
-
-        <!-- 销售订单 -->
-        <van-field label="销售订单" required input-align="right" wx:if="{{saleOrderArray.length>0}}">
-          <view slot="input" style="width: 100%;">
-            <picker bindchange="bindPickerChange" value="{{saleOrderIndex}}" range="{{saleOrderArray}}" range-key="name" data-pickername='saleOrder'>
-              <view wx:if="{{saleOrderArray[saleOrderIndex].name}}"> {{saleOrderArray[saleOrderIndex].name}}</view>
+            <input name="appointId" value='{{loadappointArray[loadappointIndex].id}}' hidden='true' />
+            <picker bindchange="bindPickerChange" value="{{loadappointIndex}}" range="{{loadappointArray}}" range-key="name" data-pickername='loadappoint'>
+              <view wx:if="{{loadappointArray[loadappointIndex].name}}"> {{loadappointArray[loadappointIndex].name}}</view>
               <view wx:else class="selectPlaceholder">{{ defaultText }}</view>
             </picker>
           </view>
@@ -31,66 +18,29 @@
             <van-icon name="arrow" />
           </view>
         </van-field>
-        <van-field required wx:else label="销售订单" name="" value="" readonly input-align="right" placeholder="请先选择客户" placeholder-style="color:red;" />
+        
+        <van-field label="船号" required name="shipNo" value="{{ info.shipNo }}" placeholder="请填写船号" input-align="right" ></van-field>
 
-        <van-field label="送货地址" required name="shipAddress" readonly value="{{ saleOrderArray[saleOrderIndex].shipAddress }}" placeholder="选择销售订单自动填入" input-align="right">
-        </van-field>
-
-        <van-field label="订单类型" name="orderType" value="{{ saleOrderType }}" required input-align="right" class="radioHeight fieldAutoHeight">
-          <view slot="input" class="radioHeightBx">
-            <radio-group class="radio-group" bindchange="dangerStatusChange" data-radioType="orderType">
-              <label class="radio" style="margin-right:20rpx;" wx:for="{{ orderTypeArray }}" wx:key="index">
-                <radio value="{{ item.dictValue }}" checked="{{ orderTypeArray[index].dictValue == saleOrderType }}" disabled color="#1989fa" />{{ item.dictLabel }}
-              </label>
-            </radio-group>
-          </view>
-        </van-field>
-
-        <van-field label="订单重量" type="digit" required name="orderWeight" value="{{ saleOrderWeight }}" placeholder="选择销售订单自动填入" input-align="right">
+        <van-field label="报港数量" type="digit" required name="arriveNumber" value="{{ info.arriveNumber }}" placeholder="请输入报港数量" input-align="right" border="{{ false }}">
           <view slot="right-icon">
             <text>吨</text>
           </view>
         </van-field>
-        <!-- <van-field label="销售订单信息" required value="{{saleOrderIndex||saleOrderIndex==0?saleOrderArray[saleOrderIndex].saleOrderName+'-'+saleOrderArray[saleOrderIndex].saleOrderNumber+'-'+saleOrderArray[saleOrderIndex].goodsName+'-'+saleOrderArray[saleOrderIndex].orderWeight+'-'+saleOrderArray[saleOrderIndex].orderType:''}}" placeholder="选择销售订单自动填入" input-align="right" readonly></van-field> -->
 
-        <input name="saleOrderInfo" value='{{saleOrderArray[saleOrderIndex].id}}' hidden='true' />
-        <!-- <van-field label="订单名称" required name="orderName" value="{{saleOrderArray[saleOrderIndex].saleOrderName}}" placeholder="选择销售订单自动填入" input-align="right" readonly></van-field> -->
-        <van-field label="订单编号" required name="orderNumber" value="{{saleOrderArray[saleOrderIndex].saleOrderNumber}}" placeholder="选择销售订单自动填入" input-align="right" readonly></van-field>
-
-        <!-- 提货时间 -->
-        <van-field label="提货时间" required input-align="right" wx:if="{{confTimeArray.length>0}}" type="textarea" autosize border="{{ false }}">
-          <view slot="input" style="width: 100%;">
-            <input name="deliveryTimeId" value='{{confTimeArray[confTimeIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{confTimeIndex}}" range="{{confTimeArray}}" range-key="timeRange" data-pickername='confTime'>
-              <view wx:if="{{confTimeArray[confTimeIndex].timeRange}}"> {{confTimeArray[confTimeIndex].timeRange}}</view>
-              <view wx:else class="selectPlaceholder">{{ defaultText }}</view>
-            </picker>
-          </view>
-          <view slot="right-icon">
-            <van-icon name="arrow" />
-          </view>
-        </van-field>
-        <van-field required wx:else label="提货时间" name="deliveryTimeId" value="" readonly input-align="right" placeholder="请先选择销售订单" placeholder-style="color:red;" />
-
-        <!-- 供应商 -->
-        <van-field label="供应商" required input-align="right" bindtap="hideKeybord">
-          <view slot="input" style="width: 100%;">
-            <input name="supplierId" value='{{supplierArray[supplierIndex].id}}' hidden='true' />
-            <picker bindchange="bindPickerChange" value="{{supplierIndex}}" range="{{supplierArray}}" range-key="supplierName" data-pickername='supplier'>
-              <view wx:if="{{supplierArray[supplierIndex].supplierName}}"> {{supplierArray[supplierIndex].supplierName}}</view>
-              <view wx:else class="selectPlaceholder">{{defaultText}}</view>
-            </picker>
-          </view>
-          <view slot="right-icon">
-            <van-icon name="arrow" />
-          </view>
-        </van-field>
-
-        <van-field label="运费单价" type="digit" required name="freightPrice" value="{{ freightPrice }}" placeholder="选择输入运费单价" input-align="right" bind:change="freightPriceChange" border="{{ false }}">
-          <view slot="right-icon">
-            <text>元</text>
-          </view>
+        <van-field label="到港时间" required name="arriveTime" value="{{ currentChoose }}" placeholder="请选择到港时间" input-align="right" bind:tap="openPicker">
         </van-field>
+        <van-action-sheet show="{{ show }}" bind:close="onClose" bind:getuserinfo="onGetUserInfo">
+          <van-datetime-picker type="datetime" value="{{ currentDate }}" min-date="{{ minDate }}" max-date="{{ maxDate }}" bind:cancel="onCancel" bind:confirm="onConfirm"  bind:change="onChange" />
+        </van-action-sheet>
+        
+        <view class="topItem">
+          <van-field label="发航单上传" required readonly input-align="right" border="{{false}}" />
+          <van-field name="" model:value="" label="" class="uploadBox">
+            <view slot="input" class="uploadboxView">
+              <van-uploader name="" deletable="{{true}}" data-type="fileList" file-list="{{ fileList }}" bind:after-read="afterRead" bind:delete="deleteImg" max-count="6" preview-size="110" />
+            </view>
+          </van-field>
+        </view>
 
       </view>
 

otherPages/loadArrive/index.js

@@ -265,9 +265,6 @@ Page({
       orderReason: '',
       id: id,
     });
-    /*wx.navigateTo({
-      url: '/pages/appointment/review?id='+e.currentTarget.dataset.id
-    })*/
   },
   onClose() {
     this.setData({
@@ -288,11 +285,12 @@ Page({
       })
     }
   },
+  
   //审核
   formSubmit: function (e) {
     let formData = e.detail.value;
     var warn = ""; //弹框时提示的内容
-    if (formData.auditFlag=='true' && formData.orderReason == '') {
+    if (formData.auditFlag=='true' && formData.arriveReason == '') {
       warn = "审核不通过时备注不能为空！";
     }
     formData.auditFlag = formData.auditFlag=='true'
@@ -319,41 +317,6 @@ Page({
   },
   // 审核E
 
-
-  //提交
-  orderSubmit: function (e) {
-    let _this = this
-    let { id, orderNumber } = e.currentTarget.dataset
-    wx.showModal({
-      title: '提示！',
-      content: `确认提交【${orderNumber}】订单？`,
-      confirmColor: '#FF5B5B',
-      success: function (res) {
-        if (res.confirm) {
-          app.request.POST({
-            url: app.API.orderSubmit,
-            params: {
-              id: id
-            },
-            page: _this,
-            isLoadingTxt: '操作中...',
-            successFun: true
-          }).then(res => {
-            wx.showToast({
-              title: '提交成功',
-              icon: 'success',
-              duration: 1000,
-              mask: true
-            })
-            _this.getListFun(); //刷新列表
-          })
-        } else if (res.cancel) {
-
-        }
-      }
-    })
-  },
-
   //申请
   changeAdd() {
     wx.navigateTo({

otherPages/loadArrive/index.wxml

@@ -36,7 +36,7 @@
               <view class="title van-ellipsis">
                 <van-icon class='iconfont' name='/images/codeNumber.png' size="36rpx"></van-icon>
                 <text>{{item.loadNumber}}</text>
-                <text wx:if="{{item.status}}" class="status orderStatus{{item.status}}">{{item.statusName}}</text>
+                <text wx:if="{{item.status}}" class="status arriveStatus{{item.status}}">{{item.statusName}}</text>
               </view>
               <view class="info">
                 <text>客户名称：{{item.customerName?item.customerName:'未填写'}}</text>
@@ -48,12 +48,12 @@
               <view class="info"><text>预约单号：{{ item.arriveNumber }}</text></view>
               <view class="time"><text>到港时间：{{item.arriveTime?filters.tosubStr(item.arriveTime,0,16):''}}</text></view>
               
-              <view class="bottomBtn" wx:if="{{ (roleCodeList == 'ship' && item.status != '2') || (roleCodeList == 'bizAdmin' && item.status == '2') }}">
-                <!-- <van-button type="info" size="small" data-url="edit?index={{index}}" catchtap="toLink" style="margin-right: 20rpx;" wx:if="{{roleCodeList == 'ship' && item.status != '1'}}">修改</van-button> -->
+              <view class="bottomBtn" wx:if="{{ (roleCodeList == 'ship' && item.status != '2') || (roleCodeList == 'bizAdmin' && item.status == '1') }}">
+                <van-button type="info" size="small" data-url="edit?index={{index}}" catchtap="toLink" style="margin-right: 20rpx;" wx:if="{{roleCodeList == 'ship' && item.status != '2'}}">修改</van-button>
 
                 <van-button type="danger" size="small" data-id="{{item.id}}" data-arrive-number="{{item.arriveNumber}}" catchtap="delFun" style="margin-right: 20rpx;" wx:if="{{roleCodeList == 'ship' && item.status != '2'}}">删除</van-button>
                 
-                <van-button type="primary" size="small" data-id="{{item.id}}" data-approve-type="one" catchtap="showPopup" wx:if="{{roleCodeList == 'bizAdmin' && item.status == '2'}}">审核</van-button>
+                <van-button type="primary" size="small" data-id="{{item.id}}" data-approve-type="one" catchtap="showPopup" wx:if="{{roleCodeList == 'bizAdmin' && item.status == '1'}}">审核</van-button>
                 
               </view>
             </navigator>
@@ -97,15 +97,15 @@
         <view slot="input" class="radioHeightBx">
           <radio-group class="radio-group" bindchange="dangerStatusChange" data-radioType="auditFlag">
             <label class="radio">
-              <radio value="false" checked="{{auditFlag=='false'}}" color="#4B70EA" />通过
+              <radio value="true" checked="{{auditFlag=='true'}}" color="#4B70EA" />通过
             </label>
             <label class="radio">
-              <radio value="true" checked="{{auditFlag=='true'}}" color="#4B70EA" />不通过
+              <radio value="false" checked="{{auditFlag=='false'}}" color="#4B70EA" />不通过
             </label>
           </radio-group>
         </view>
       </van-field>
-      <van-field label="审核备注" required="{{auditFlag=='true'}}" name="orderReason" value="{{ orderReason }}" type="textarea" input-align="right" placeholder="请输入审核备注" autosize></van-field>
+      <van-field label="审核备注" required="{{auditFlag=='false'}}" name="arriveReason" value="{{ arriveReason }}" type="textarea" input-align="right" placeholder="请输入审核备注" autosize></van-field>
     </view>
 
     <view class="submitBtn">
@@ -116,5 +116,4 @@
   </form>
 </van-popup>
 
-
 <wxs module="filters" src="../../utils/filter.wxs"></wxs>

otherPages/loadArrive/info.wxml

@@ -14,9 +14,10 @@
     <!-- <van-field label="创建人" input-align="right" value="{{info.createUserName}}" readonly></van-field>
     <van-field label="创建时间" input-align="right" value="{{info.createTime}}" readonly></van-field> -->
     <van-field label="预约状态" input-align="right" readonly>
-      <text slot="button" class="status status{{info.status}}">{{filters.codeAnalysis(arriveStatusArray, info.status, 'dictValue', 'dictLabel')}} 
+      <text slot="button" class="status arriveStatus{{info.status}}">{{filters.codeAnalysis(arriveStatusArray, info.status, 'dictValue', 'dictLabel')}} 
       </text>
     </van-field>
+    <van-field label="审核备注" wx:if="{{ info.status == '3' }}" input-align="right" value="{{info.arriveReason}}" readonly></van-field>
   </view>
   <view class="part">
     <van-field label="发航单" readonly border="{{false}}"></van-field>

otherPages/upDownAllocation/allocation.js

@@ -1,133 +1,66 @@
-// pages/upDownAllocation/allocation.js
-const app = getApp()
+// otherPages/upDownAllocation/allocation.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    orderId:'',
 
-    defaultText: '请选择',
-    isSubmitting: false,
-
-    loadPointArray:[],//生产工序
-    loadPointIndex:null,
-
-    statTime:'',
-    endTime:'',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-    
-  },
+  onLoad(options) {
 
-  //下拉选择
-  bindPickerChange: function (e) { //下拉菜单
-    let { pickername } = e.target.dataset
-    let getIndex = pickername + 'Index'
-    app.util.getPickerIndex(this, getIndex, e);
-  },
-
-  //日期选择
-  bindDateChange(e){
-    console.log(e.detail.value)
-    this.setData({
-      [e.target.dataset.pickertype]: e.detail.value
-    })
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  bindscrolltolowerFun() {
-    
-  },
-
-  //表单提交 carTaskAdd
-  formSubmit: function ({detail:{value}}) {
-    var warn = ""; //弹框时提示的内容
-    if (value.loadPointId == '') {
-      warn = "请选择装卸点位！";
-    } else if(value.loadTimeId == ''){
-      warn = "请选择装卸时间！";
-    }
-    if (warn != '') {
-      app.util.checkForm(warn);
-    } else {
-      app.request.POST({
-        url: app.API.orderloadAdd,
-        params: value,
-        page: this,
-        isLoadingTxt: '提交中...',
-        isSubmitting: true,
-        successFun: true
-      }).then(res => {
-        wx.showToast({
-          title: '新增成功',
-          icon: 'success',
-          duration: 2000,
-          mask:true,
-          complete: function () {
-            setTimeout(() => {
-              wx.navigateBack()
-            }, 1500) //延迟时间  
-          }
-        })
-      })
-
-    }
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function () {
+  onReady() {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
+  onShow() {
 
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function () {
+  onHide() {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function () {
+  onUnload() {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh() {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-    
+  onReachBottom() {
+
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
+  onShareAppMessage() {
 
   }
 })

otherPages/upDownAllocation/allocation.json

@@ -1,19 +0,0 @@
-{
-  "navigationBarTitleText": "起卸分配",
-  "usingComponents": {
-    "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"
-  }
-}

otherPages/upDownAllocation/allocation.less

@@ -1,9 +0,0 @@
-/* pages/upDownAllocation/allocation.wxss */
-.dateBox{
-  display: flex;
-  background-color: #fff;
-  align-items: center;
-  .contactInput{
-    flex: 1;
-  }
-}

otherPages/upDownAllocation/allocation.wxml

@@ -1,108 +1,2 @@
-<!--pages/upDownAllocation/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>
-
-        <!-- 巡检员 -->
-        <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>
-
-        <!-- 起卸时段 -->
-        <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>
-
-      <view class="fixedBtn submitBtn">
-        <van-button loading="{{isSubmitting}}" round block disabled="{{isSubmitting}}" loading-text="{{isSubmitting?'提交中...':''}}" type="info" form-type="submit">确定
-        </van-button>
-      </view>
-
-    </form>
-  </view>
-</view>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>
+<!--otherPages/upDownAllocation/allocation.wxml-->
+<text>otherPages/upDownAllocation/allocation.wxml</text>

otherPages/upDownAllocation/allocation.wxss

@@ -1,9 +0,0 @@
-/* pages/upDownAllocation/allocation.wxss */
-.dateBox {
-  display: flex;
-  background-color: #fff;
-  align-items: center;
-}
-.dateBox .contactInput {
-  flex: 1;
-}

otherPages/upDownAllocation/index.js

@@ -1,24 +1,11 @@
-// pages/upDownAllocation/index.js
-const app = getApp();
+// otherPages/upDownAllocation/index.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    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:[],
+
   },
 
   /**
@@ -39,60 +26,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    const roleCodeList = wx.getStorageSync('roleCodeList')
-    let loginStatus = wx.getStorageSync('loginStatus')
-    this.setData({
-      searchVal: '',
-      roleCodeList: roleCodeList ? roleCodeList : '',
-      loginStatus: loginStatus ? loginStatus : false
-    })
-    if(wx.getStorageSync('loginStatus')){
-      this.getListFun();
-    }
-  },
 
-  //页面跳转
-  toLink: function (e) {
-    let { url } = e.currentTarget.dataset
-    wx.navigateTo({
-      url: url
-    })
-  },
-
-  //搜索框请求S
-  onChange(e) {
-    this.setData({
-      searchVal: e.detail,
-    });
-  },
-  onSearch: function (event) {
-    this.setData({
-      searchVal: event.detail
-    })
-    this.getListFun();
-  },
-  onCancel: function () {
-    this.setData({})
-  },
-  toSearch: function (event) {
-    this.getListFun();
-  },
-
-  //列表
-  getListFun: function () {
-    this.setData({
-      page: 1
-    })
-    let params = {
-      current: this.data.page,
-      size: this.data.limit,
-      licenseNumber:this.data.searchVal
-    }
-    app.request.pageFirst({
-      url: app.API.appointmentList,
-      page: this,
-      params: params,
-    })
   },
 
   /**
@@ -112,33 +46,15 @@ Page({
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function () {
-    this.setData({
-      searchVal: ''
-    })
-    if (wx.getStorageSync('loginStatus')) {
-      this.getListFun();
-    } else {
-      wx.stopPullDownRefresh();
-    }
+  onPullDownRefresh() {
+
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
-    this.data.page++;
-    let params = {
-      current: this.data.page,
-      size: this.data.limit,
-      licenseNumber:this.data.searchVal,
-    }
-    app.request.pageOther({
-      url: app.API.appointmentList,
-      page: this,
-      params: params,
-      loadType: true //加载类型，是否是下拉加载
-    });
+  onReachBottom() {
+
   },
 
   /**

otherPages/upDownAllocation/index.json

@@ -1,22 +0,0 @@
-{
-  "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"
-  }
-}

otherPages/upDownAllocation/index.less

@@ -1,11 +0,0 @@
-/* pages/upDownAllocation/index.wxss */
-.container{
-  padding-bottom: 120rpx;
-}
-.bottomBtn{
-  padding-top: 20rpx;
-  text-align: right;
-}
-.bottomBtn button {
-  margin-left: 0 !important;
-}

otherPages/upDownAllocation/index.wxml

@@ -1,64 +1,2 @@
-<!--pages/upDownAllocation/index.wxml-->
-<view class="container listMain">
-  <block wx:if="{{loginStatus}}">
-    <van-sticky>
-      <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>
-          </view>
-        </view>
-      </view>
-    </van-sticky>
-
-    <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/licensePlate.png' size="36rpx"></van-icon><text>{{item.licenseNumber}}</text>
-                <text wx:if="{{item.status}}" class="status status{{item.status}}">{{item.statusName}}</text>
-              </view>
-              <view class="info">
-                <text>订单编号：{{item.orderNumber?item.orderNumber:'未填写'}}</text>
-              </view>
-              <view class="info">
-                <text decode="{{true}}">司{{str+str}}机：{{item.driverName?item.driverName:'未填写'}} {{item.driverMobile?item.driverMobile:'司机电话'}}</text>
-              </view>
-              <view class="time"><text>提货时间：{{item.beginTime?filters.tosubStr(item.beginTime,0,16):'提货开始时间'}} 至 {{item.endTime?filters.tosubStr(item.endTime,0,16):'提货结束时间'}}</text></view>
-
-              <view class="bottomBtn" wx:if="{{ item.status }}">
-                <van-button type="primary" 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>
-              </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>
-          <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>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>
+<!--otherPages/upDownAllocation/index.wxml-->
+<text>otherPages/upDownAllocation/index.wxml</text>

otherPages/upDownAllocation/index.wxss

@@ -1,11 +0,0 @@
-/* pages/upDownAllocation/index.wxss */
-.container {
-  padding-bottom: 120rpx;
-}
-.bottomBtn {
-  padding-top: 20rpx;
-  text-align: right;
-}
-.bottomBtn button {
-  margin-left: 0 !important;
-}

otherPages/upDownAllocation/info.js

@@ -1,62 +1,18 @@
-// pages/upDownAllocation/info.js
-const app = getApp()
+// otherPages/upDownAllocation/info.js
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-    appointmentClassifyArray: [
-      { label:'充电预约',value:'1' },
-      { label:'管桩预约',value:'2' },
-      { label:'其他预约',value:'3' },
-    ], //预约类型
-    info: {},
-    fileList:[], //司机回签图片
+
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    //获取详情
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];
-    let getInfo = prevPage.data.resData[options.index]
-    //司机回签图片
-    let fileList = []
-    if(getInfo.unloadImg){
-      let unloadImgArr = getInfo.unloadImg.split(',')
-      unloadImgArr.forEach(element => {
-        fileList.push({
-          url: app.host.BASEIMG_URL+element,
-          isImage:true
-        })
-      });
-    }
-    this.setData({
-      info:getInfo,
-      fileList:fileList
-    })
-  },
 
-  //查询详情
-  getInfo: function (id) {
-    //详情
-    app.request.GET({
-      url: app.API.appointDetail,
-      page: this,
-      params: {
-        'id': id
-      },
-      successFun: true
-    }).then(res => {
-      let getInfo = res.data.data;
-      this.setData({
-        info: getInfo,
-        accessControlAuth:JSON.parse(getInfo.accessControlAuth)
-      })
-    })
   },
 
   /**

otherPages/upDownAllocation/info.json

@@ -1,15 +0,0 @@
-{
-  "navigationBarTitleText": "起卸分配详情",
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "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-group": "@vant/weapp/cell-group/index",
-    "van-field": "@vant/weapp/field/index",
-    "van-button": "@vant/weapp/button/index",
-    "van-image": "@vant/weapp/image/index"
-  }
-}

otherPages/upDownAllocation/info.less

@@ -1 +0,0 @@
-/* pages/upDownAllocation/info.wxss */

otherPages/upDownAllocation/info.wxml

@@ -1,53 +1,2 @@
-<!--pages/upDownAllocation/info.wxml-->
-<view class="container">
-  <view class="part">
-    <van-field label="车牌号" input-align="right" model:value="{{info.licenseNumber}}" readonly></van-field>
-    <van-field label="预约状态" input-align="right" readonly>
-      <text slot="button" class="status status{{info.status}}">{{ info.statusName }}</text>
-    </van-field>
-    <van-field label="司机姓名" input-align="right" model:value="{{info.driverName}}" readonly></van-field>
-    <van-field label="司机电话" input-align="right" model:value="{{info.driverMobile}}" readonly></van-field>
-    <van-field label="预约分类" input-align="right" readonly wx:if="{{ info.appointmentType == '2' }}">
-      <text slot="button" class="status status{{info.appointmentClassify}}">{{ filters.codeAnalysis(appointmentClassifyArray,info.appointmentClassify, 'value', 'label') }}</text>
-    </van-field>
-    <block wx:if="{{ info.appointmentType == '1' }}">
-      <van-field label="订单编号" input-align="right" model:value="{{info.orderNumber}}" readonly></van-field>
-      <van-field label="订单名称" input-align="right" model:value="{{info.orderName}}" readonly></van-field>
-      <van-field label="客户名称" input-align="right" model:value="{{info.customerName}}" readonly type="textarea" autosize></van-field>
-      <van-field label="货品名称" input-align="right" model:value="{{info.goodsName}}" readonly></van-field>
-      <van-field label="货品编码" input-align="right" model:value="{{info.goodsCode}}" readonly></van-field>
-      <van-field label="提货开始时间" input-align="right" model:value="{{info.beginTime}}" readonly></van-field>
-      <van-field label="提货结束时间" input-align="right" model:value="{{info.endTime}}" readonly></van-field>
-    </block>
-
-    <van-field label="审核备注" input-align="right" model:value="{{info.appointmentReason}}" readonly></van-field>
-
-    <block wx:if="{{ info.appointmentType == '1' }}">
-      <van-field center clearable label="司机确认" use-button-slot class="radioHeight fieldAutoHeight">
-        <view slot="input" class="radioHeightBx" wx:if="{{ info.driverSign }}">
-          <van-image slot="input" width="100px" height="100px" src="{{ info.driverSign }}" />
-        </view>
-      </van-field>
-      <van-field label="卸货重量" input-align="right" model:value="{{info.unloadWeight}}" readonly>
-        <view slot="right-icon">
-          <text>吨</text>
-        </view>
-      </van-field>
-
-      <view class="part">
-        <van-field label="司机回签" readonly border="{{false}}"></van-field>
-        <van-cell-group wx:if="{{ fileList.length>0 }}">
-          <van-field name="" model:value="" label="" class="checkbox">
-            <view slot="input" class="checkboxView">
-              <van-uploader name="" deletable="{{false}}" file-list="{{ fileList }}" max-count="{{fileList.length}}" preview-size="80" />
-            </view>
-          </van-field>
-        </van-cell-group>
-      </view>
-    </block>
-
-  </view>
-  <view style="height: 50px;"></view>
-</view>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>
+<!--otherPages/upDownAllocation/info.wxml-->
+<text>otherPages/upDownAllocation/info.wxml</text>

otherPages/upDownAllocation/info.wxss

@@ -1 +0,0 @@
-/* pages/upDownAllocation/info.wxss */

pages/index/index.js

@@ -423,7 +423,6 @@ Page({
       success: (res) => {
         let info = JSON.parse(res.result.trim())
         console.log(info)
-        //console.log(info)
         //console.log(JSON.parse(info)) //{id: "1712651156370632706", projectCode: "D456"}
         if(info.type=='1'){
           wx.navigateTo({
@@ -433,6 +432,10 @@ Page({
           wx.navigateTo({
             url: '/pages/temporary/add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
           })
+        }else if(info.type=='3'){
+          wx.navigateTo({
+            url: '/otherPages/loadAppoint/add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
+          })
         }
         
       },

pages/workstand/index.js

@@ -8,11 +8,16 @@ Page({
     loginStatus: wx.getStorageSync('loginStatus') ? wx.getStorageSync('loginStatus') : false,
     roleCodeList: wx.getStorageSync('roleCodeList') ? wx.getStorageSync('roleCodeList') : '',
     menuData:[
+      //"bizAdmin"管理员, "driver"司机, "customer"用友客户, "ship"船主, "sale"销售, "dispatcher"调度员, "send"发货员
       {url:'/pages/index/index',flowName:'扫码预约',flowIcon:'',iconfont:'yuyue',color:"#00a8ff",role:["driver","customer", "ship"]},
       {url:'/pages/weighingRecord/index',flowName:'过磅记录',flowIcon:'',iconfont:'xuexijilu-',color:"#26CA83",role:["bizAdmin","driver", "ship"]},
 
       {url:'/pages/queueCar/index',flowName:'排队车辆',flowIcon:'',iconfont:'item5',color:"#6c5ce7",role:["bizAdmin"]},
+
       {url:'/pages/salesOrderMan/index',flowName:'物流订单',flowIcon:'',iconfont:'xiaoshouguanli3',color:"#20A0E3",role:["bizAdmin","sale","customer","dispatcher"]},
+      
+      {url:'/otherPages/loadAppoint/index',flowName:'起卸分配',flowIcon:'',iconfont:'fenpei',color:"#6c5ce7",role:["dispatcher","bizAdmin"]},
+
       {url:'/pages/reservationMan/index',flowName:'预约管理',flowIcon:'',iconfont:'yuyueguanli2',color:"#FF6160",role:["bizAdmin"]},
 
       {url:'/pages/deliveryConfirm/index',flowName:'发货确认',flowIcon:'',iconfont:'daifahuo1',color:"#FF9237",role:["send"]},
@@ -24,7 +29,6 @@ Page({
       // 新增功能模块，包含列表、详情、新增，后续其他页面可复制，修改页面参数显示、接口地址即可
       // url：表示页面地址  role：有权限的角色名
     //   {url:'/pages/operationExecution/index',flowName:'运营执行',flowIcon:'',iconfont:'moxingzhihang',color:"#20A0E3",role:["dispatcher"]},
-    //   {url:'/otherPages/upDownAllocation/index',flowName:'起卸分配',flowIcon:'',iconfont:'fenpei',color:"#20A0E3",role:["dispatcher","bizAdmin",]},
     //   {url:'/otherPages/repairDispatch/index',flowName:'维修调度',flowIcon:'',iconfont:'weixiu1',color:"#20A0E3",role:["dispatcher"]},
 
     //   {url:'/otherPages/upDownSubmit/index',flowName:'起卸填报',flowIcon:'',iconfont:'yuyueshenbao',color:"#20A0E3",role:["起卸员"]},

utils/api.js

@@ -85,13 +85,16 @@ const api = {
   'bizparkconfigDelete':'/biz/bizorderload/delete',//删除
 
   //起卸预约
+  'bizloadappointPage':'/biz/bizloadappoint/page',//分页列表
   'bizloadappointList':'/biz/bizloadappoint/getList',//列表
   'bizloadappointDetail':'/biz/bizloadappoint/detail',//详情
+  'bizloadappointAudit':'/biz/bizloadappoint/audit',//审核
+  'bizloadappointSupplier':'/biz/bizloadappointsupplier/getList',//起卸获取供应商
   
   //报港预约
   'bizloadarrivePage':'/biz/bizloadarrive/page',//分页列表
-  'bizloadarriveAdd':'/biz/bizloadarrive/add',//添加
   'bizloadarriveDetail':'/biz/bizloadarrive/detail',//详情
+  'bizloadarriveAdd':'/biz/bizloadarrive/add',//添加
   'bizloadarriveEdit':'/biz/bizloadarrive/edit',//编辑
   '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.120:83', //接口地址
+    BASE_URL: 'http://192.168.0.127:83', //接口地址
     BASEIMG_URL: 'https://wx.js-whzl.com:8055/preview/', //图片预览上传地址
   },
   trial: { // 体验版

utils/iconfont.wxss

@@ -114,6 +114,10 @@
   content: "\e66c";
 }
 
+.iconfont-loadAppoint:before {
+  content: "\e66c";
+}
+
 .iconfont-xiaoguan-begin:before {
   content: "\e604";
 }