预约

otherPages/loadAppoint/index.js

@@ -191,7 +191,7 @@ Page({
       loadNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

otherPages/repairDispatch/index.js

@@ -89,7 +89,7 @@ Page({
       licenseNumber:this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -134,7 +134,7 @@ Page({
       licenseNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

otherPages/reportFault/index.js

@@ -89,7 +89,7 @@ Page({
       licenseNumber:this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -134,7 +134,7 @@ Page({
       licenseNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

otherPages/upDownSubmit/index.js

@@ -92,7 +92,7 @@ Page({
       licenseNumber:this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -186,7 +186,7 @@ Page({
       licenseNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

otherPages/workTask/index.js

@@ -92,7 +92,7 @@ Page({
       licenseNumber:this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -205,7 +205,7 @@ Page({
       licenseNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

pages/index/index.js

@@ -408,7 +408,7 @@ Page({
       licenseNumber: this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -440,51 +440,51 @@ Page({
 
   //扫码预约申请
   changeAdd() {
-    wx.navigateTo({
-      url: '/pages/reservationLoadAppoint/add?orderId=1940665005240860674'
-    })
+    // wx.navigateTo({
+    //   url: '/pages/reservationLoadAppoint/add?orderId=1940665005240860674'
+    // })
 
-    // wx.scanCode({
-    //   success: (res) => {
-    //     let info = JSON.parse(res.result.trim())
-    //     console.log(info)
-    //     //console.log(JSON.parse(info)) //{id: "1712651156370632706", projectCode: "D456"}
-    //     if(info.type=='1'){
-    //       // 砂石预约
-    //       wx.navigateTo({
-    //         url: 'add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
-    //       })
-    //     // }else if(info.type=='2'){
-    //     //   // 临时预约----已作废
-    //     //   wx.navigateTo({
-    //     //     url: '/pages/reservationTemp/add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
-    //     //   })
-    //     }else if(info.type=='3'){
-    //       // 起卸预约
-    //       wx.navigateTo({
-    //         url: '/pages/reservationLoadAppoint/add?orderId=' + info.id
-    //       })
-    //     }else if(info.type=='4'){
-    //       // 充电桩预约
-    //       wx.navigateTo({
-    //         url: '/pages/reservationChargestation/add?orderId=' + info.id
-    //       })
-    //     }else if(info.type=='5'){
-    //       // 管桩预约
-    //       wx.navigateTo({
-    //         url: '/pages/reservationPipe/add?orderId=' + info.id
-    //       })
-    //     }
+    wx.scanCode({
+      success: (res) => {
+        let info = JSON.parse(res.result.trim())
+        console.log(info)
+        //console.log(JSON.parse(info)) //{id: "1712651156370632706", projectCode: "D456"}
+        if(info.type=='1'){
+          // 砂石预约
+          wx.navigateTo({
+            url: 'add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
+          })
+        // }else if(info.type=='2'){
+        //   // 临时预约----已作废
+        //   wx.navigateTo({
+        //     url: '/pages/reservationTemp/add?orderId=' + info.id + '&orderName='+ info.orderName+'&orderNumber='+ info.orderNumber
+        //   })
+        }else if(info.type=='3'){
+          // 起卸预约
+          wx.navigateTo({
+            url: '/pages/reservationLoadAppoint/add?orderId=' + info.id
+          })
+        }else if(info.type=='4'){
+          // 充电桩预约
+          wx.navigateTo({
+            url: '/pages/reservationChargestation/add?orderId=' + info.id
+          })
+        }else if(info.type=='5'){
+          // 管桩预约
+          wx.navigateTo({
+            url: '/pages/reservationPipe/add?orderId=' + info.id
+          })
+        }
     
-    //   },
-    //   fail: (res) => {
-    //     wx.showToast({
-    //       title: '请重试！',
-    //       icon: 'error',
-    //       duration: 2000
-    //     })
-    //   }
-    // })
+      },
+      fail: (res) => {
+        wx.showToast({
+          title: '请重试！',
+          icon: 'error',
+          duration: 2000
+        })
+      }
+    })
   },
 
   //删除
@@ -731,7 +731,7 @@ Page({
       // reservationType: this.data.typeArray[this.data.typeIndex].code,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true, //加载类型，是否是下拉加载

pages/index/info.js

@@ -10,6 +10,12 @@ Page({
     info: {},
     fileList:[], //司机回签图片
 
+    appointmentTypeArray: [{
+      dictValue: "",
+      dictLabel: "全部状态"
+    }],
+    appointmentTypeIndex: 0,
+
     appointmentClassifyArray: [
       { label:'充电预约',value:'1' },
       { label:'管桩预约',value:'2' },
@@ -21,6 +27,19 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    //订单类型
+    let treeData = app.globalData.treeArr
+    for (const element of treeData) {
+      let arrStr;
+      switch (element.dictValue) {
+        case 'appointment_type':
+          arrStr = "appointmentTypeArray";
+          break;
+      }
+      this.setData({
+        [arrStr]: element.children
+      })
+    }
     //获取详情
     var pages = getCurrentPages();
     var prevPage = pages[pages.length - 2];
@@ -37,9 +56,14 @@ Page({
       });
     }
     this.setData({
-      info:getInfo,
-      fileList:fileList
+      info      : getInfo,
+      fileList  : fileList
     })
+    // 预约类型
+    if(getInfo.appointmentType == '5'){
+      // 管桩预约
+      this.getPipeplanData(getInfo.orderId)
+    }
 
     if(getInfo.status!='1'||getInfo.status!='2'||getInfo.status!='10'||getInfo.status!='11'||getInfo.status!='12'||getInfo.status!='13'||getInfo.status!='14'||getInfo.status!='15'){
       this.makeCode(JSON.stringify({
@@ -64,21 +88,20 @@ Page({
     qrcode.makeCode(data);
   },
 
-  //查询详情
-  getInfo: function (id) {
-    //详情
+  // 管桩计划详情
+  getPipeplanData: function (id) {
     app.request.GET({
-      url: app.API.appointDetail,
+      url: app.API.bizpipeplanDetail,
+      params: {'id' : id},
       page: this,
-      params: {
-        'id': id
-      },
       successFun: true
     }).then(res => {
       let getInfo = res.data.data;
       this.setData({
-        info: getInfo,
-        accessControlAuth:JSON.parse(getInfo.accessControlAuth)
+        planNumber      : getInfo.planNumber,
+        planName        : getInfo.planName,
+        planCount       : getInfo.planCount,
+        planAlreadyCount: getInfo.planAlreadyCount,
       })
     })
   },

pages/index/info.wxml

@@ -2,7 +2,7 @@
 <view class="container">
   <view class="part topProJectInfo">
     <view class="proTitle">
-      <van-icon class='iconfont' class-prefix='iconfont' name='/images/licensePlate.png' size="30rpx" color="rgba(0, 0, 0, 0.85)"></van-icon> {{info.licenseNumber}}<!--<text class="queueNumber">排队号：{{info.queueNumber}}</text>-->
+      <van-icon class='iconfont' class-prefix='iconfont' name='/images/licensePlate.png' size="30rpx" color="rgba(0, 0, 0, 0.85)"></van-icon> {{info.licenseNumber}}<text slot="button" class="status status{{info.appointmentType}}">{{ filters.codeAnalysis(appointmentTypeArray, info.appointmentType, 'dictValue', 'dictLabel') }}</text><!--<text class="queueNumber">排队号：{{info.queueNumber}}</text>-->      
     </view>
     <view class="sijiInfo" wx:if="{{ info.type != '2' }}">
       <view wx:if="{{info.driverName}}">司机：{{info.driverName}}</view>
@@ -14,16 +14,23 @@
     </view>
   </view>
   <view class="part">
+    <!-- 砂石预约 -->
     <block wx:if="{{ info.appointmentType == '1' }}">
       <van-field label="订单名称" input-align="right" model:value="{{info.orderName}}" readonly></van-field>
       <van-field label="订单编号" input-align="right" model:value="{{info.orderNumber}}" readonly></van-field>
     </block>
+
+    <!-- <van-field label="预约类型" input-align="right" readonly>
+      <text slot="button" class="status status{{info.appointmentType}}">{{ filters.codeAnalysis(appointmentTypeArray, info.appointmentType, 'dictValue', 'dictLabel') }}</text>
+    </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" 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.customerName}}" readonly></van-field>
       <van-field label="货品名称" input-align="right" model:value="{{info.goodsName}}" readonly></van-field>
@@ -31,32 +38,44 @@
       <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>
+
+    <!-- 管桩预约 -->
+    <block wx:if="{{ info.appointmentType == '5' }}">
+      <van-field label="管桩计划单号" input-align="right" value="{{planNumber }}" readonly></van-field>
+      <van-field label="- 计划名称" input-align="right" value="{{ planName }}" readonly></van-field>
+      <van-field label="- 预约次数" input-align="right" value="{{ planCount }}" readonly></van-field>
+      <van-field label="- 已预约次数" input-align="right" value="{{ planAlreadyCount }}" 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">
+
+    <!-- 砂石预约  起卸预约  -->
+    <block wx:if="{{ info.appointmentType == '1' || info.appointmentType == '3' }}">
+      <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>
-    <van-field label="装卸点位" input-align="right" model:value="{{info.loadPoint}}" readonly></van-field>
-    <van-field label="装卸时间" input-align="right" model:value="{{info.loadBeginTime+'~'+info.loadEndTime}}" readonly type="textarea" autosize></van-field>
+      <van-field label="卸货重量" input-align="right" model:value="{{info.unloadWeight}}" readonly>
+        <view slot="right-icon">
+          <text>吨</text>
+        </view>
+      </van-field>
+      <van-field label="装卸点位" input-align="right" model:value="{{info.loadPoint}}" readonly></van-field>
+      <van-field label="装卸时间" input-align="right" model:value="{{info.loadBeginTime+'~'+info.loadEndTime}}" readonly type="textarea" autosize></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>
+      <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>
+        <van-field center clearable label="签收审核" use-button-slot class="radioHeight fieldAutoHeight">
+          <view slot="input" class="radioHeightBx" wx:if="{{ info.auditSign }}"><van-image slot="input" width="100px" height="100px" src="{{ info.auditSign }}" /></view>
         </van-field>
-      </van-cell-group>
-      <van-field center clearable label="签收审核" use-button-slot class="radioHeight fieldAutoHeight">
-        <view slot="input" class="radioHeightBx" wx:if="{{ info.auditSign }}"><van-image slot="input" width="100px" height="100px" src="{{ info.auditSign }}" /></view>
-      </van-field>
-    </view></block>
+      </view>
+    </block>
 
     <view style="padding: 20px 0;" wx:if="{{ info.status!= '1' || info.status!= '2' || info.status!= '10' || info.status!= '11' || info.status!= '12' || info.status!= '13' || info.status!= '14' || info.status!= '15'}}"><canvas class='canvas' canvas-id='canvas' style='width:220px;height:220px;margin: 0 auto;'></canvas></view>
 

pages/operationExecution/index.js

@@ -89,7 +89,7 @@ Page({
       licenseNumber:this.data.searchVal
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -134,7 +134,7 @@ Page({
       licenseNumber:this.data.searchVal,
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

pages/reservationChargestation/info.js

@@ -1,143 +0,0 @@
-// pages/reservationPipe/info.js
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info: {},
-
-    appointmentStatusArray: [{
-      dictValue: "",
-      dictLabel: "全部状态"
-    }],
-    appointmentStatusIndex: 0,
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    //预约审核状态
-    let treeData = app.globalData.treeArr
-    for (const element of treeData) {
-      let arrStr;
-      switch (element.dictValue) {
-        case 'appointment_status':
-          arrStr = "appointmentStatusArray";
-          break;
-      }
-      let getArray =[{
-        dictValue: "",
-        dictLabel: "全部状态"
-      }]
-      this.setData({
-        [arrStr]: getArray.concat(element.children)
-      })
-    }
-    //获取详情
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];
-    let getInfo = prevPage.data.resData[options.index]
-  
-    this.setData({
-      info     : getInfo
-    })
-
-    app.request.GET({
-      url: app.API.bizpipeplanDetail,
-      params: {'id' : getInfo.orderId},
-      page: this,
-      successFun: true
-    }).then(res => {
-      let getInfo = res.data.data;
-      this.setData({
-        planNumber      : getInfo.planNumber,
-        planName        : getInfo.planName,
-        planCount       : getInfo.planCount,
-        planAlreadyCount: getInfo.planAlreadyCount,
-      })
-    })
-    //this.getInfo(options.id)
-  },
-
-  // //查询详情
-  // getInfo: function (id) {
-  //   app.request.GET({
-  //     url: app.API.bizloadarriveDetail,
-  //     page: this,
-  //     params: {
-  //       'id': id
-  //     },
-  //     successFun: true
-  //   }).then(res => {
-  //     let getInfo = res.data.data;
-  //     //司机回签图片
-  //     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,
-  //       accessControlAuth : JSON.parse(getInfo.accessControlAuth)
-  //     })
-  //   })
-  // },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/reservationChargestation/info.json

@@ -1,16 +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-tag": "@vant/weapp/tag/index",
-    "van-image": "@vant/weapp/image/index"
-  }
-}

pages/reservationChargestation/info.less

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

pages/reservationChargestation/info.wxml

@@ -1,24 +0,0 @@
-<!--pages/reservationPipe/info.wxml-->
-<view class="container">
-  <view class="part">
-    <van-field label="管桩计划单号" input-align="right" value="{{info.planNumber }}" readonly></van-field>
-    <van-field label="- 计划名称" input-align="right" value="{{ planName }}" readonly></van-field>
-    <van-field label="- 预约次数" input-align="right" value="{{ planCount }}" readonly></van-field>
-    <van-field label="- 已预约次数" input-align="right" value="{{ planAlreadyCount }}" readonly></van-field>
-
-    <van-field label="车牌号" input-align="right" value="{{ info.licenseNumber }}" readonly></van-field>
-    <van-field label="司机姓名" input-align="right" value="{{ info.driverName }}" readonly></van-field>
-    <van-field label="司机电话" input-align="right" value="{{ info.driverMobile }}" readonly></van-field>
-    <van-field label="入场时间" input-align="right" value="{{ info.enterTime }}" readonly></van-field>
-    <van-field label="出场时间" input-align="right" value="{{ info.leaveTime }}" readonly></van-field>
-    <!-- <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(appointmentStatusArray, info.status, 'dictValue', 'dictLabel')}} 
-      </text>
-    </van-field>
-  </view>
-  <view style="height: 50px;"></view>
-</view>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>

pages/reservationLoadAppoint/info.js

@@ -1,143 +0,0 @@
-// pages/reservationPipe/info.js
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info: {},
-
-    appointmentStatusArray: [{
-      dictValue: "",
-      dictLabel: "全部状态"
-    }],
-    appointmentStatusIndex: 0,
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    //预约审核状态
-    let treeData = app.globalData.treeArr
-    for (const element of treeData) {
-      let arrStr;
-      switch (element.dictValue) {
-        case 'appointment_status':
-          arrStr = "appointmentStatusArray";
-          break;
-      }
-      let getArray =[{
-        dictValue: "",
-        dictLabel: "全部状态"
-      }]
-      this.setData({
-        [arrStr]: getArray.concat(element.children)
-      })
-    }
-    //获取详情
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];
-    let getInfo = prevPage.data.resData[options.index]
-  
-    this.setData({
-      info     : getInfo
-    })
-
-    app.request.GET({
-      url: app.API.bizpipeplanDetail,
-      params: {'id' : getInfo.orderId},
-      page: this,
-      successFun: true
-    }).then(res => {
-      let getInfo = res.data.data;
-      this.setData({
-        planNumber      : getInfo.planNumber,
-        planName        : getInfo.planName,
-        planCount       : getInfo.planCount,
-        planAlreadyCount: getInfo.planAlreadyCount,
-      })
-    })
-    //this.getInfo(options.id)
-  },
-
-  // //查询详情
-  // getInfo: function (id) {
-  //   app.request.GET({
-  //     url: app.API.bizloadarriveDetail,
-  //     page: this,
-  //     params: {
-  //       'id': id
-  //     },
-  //     successFun: true
-  //   }).then(res => {
-  //     let getInfo = res.data.data;
-  //     //司机回签图片
-  //     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,
-  //       accessControlAuth : JSON.parse(getInfo.accessControlAuth)
-  //     })
-  //   })
-  // },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/reservationLoadAppoint/info.json

@@ -1,16 +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-tag": "@vant/weapp/tag/index",
-    "van-image": "@vant/weapp/image/index"
-  }
-}

pages/reservationLoadAppoint/info.less

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

pages/reservationLoadAppoint/info.wxml

@@ -1,24 +0,0 @@
-<!--pages/reservationPipe/info.wxml-->
-<view class="container">
-  <view class="part">
-    <van-field label="管桩计划单号" input-align="right" value="{{info.planNumber }}" readonly></van-field>
-    <van-field label="- 计划名称" input-align="right" value="{{ planName }}" readonly></van-field>
-    <van-field label="- 预约次数" input-align="right" value="{{ planCount }}" readonly></van-field>
-    <van-field label="- 已预约次数" input-align="right" value="{{ planAlreadyCount }}" readonly></van-field>
-
-    <van-field label="车牌号" input-align="right" value="{{ info.licenseNumber }}" readonly></van-field>
-    <van-field label="司机姓名" input-align="right" value="{{ info.driverName }}" readonly></van-field>
-    <van-field label="司机电话" input-align="right" value="{{ info.driverMobile }}" readonly></van-field>
-    <van-field label="入场时间" input-align="right" value="{{ info.enterTime }}" readonly></van-field>
-    <van-field label="出场时间" input-align="right" value="{{ info.leaveTime }}" readonly></van-field>
-    <!-- <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(appointmentStatusArray, info.status, 'dictValue', 'dictLabel')}} 
-      </text>
-    </van-field>
-  </view>
-  <view style="height: 50px;"></view>
-</view>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>

pages/reservationMan/index.js

@@ -122,7 +122,7 @@ Page({
       //status:1
     }
     app.request.pageFirst({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
     })
@@ -295,7 +295,7 @@ Page({
       //status:1
     }
     app.request.pageOther({
-      url: app.API.appointmentList,
+      url: app.API.appointmentPage,
       page: this,
       params: params,
       loadType: true //加载类型，是否是下拉加载

pages/reservationPipe/index.wxml

@@ -79,35 +79,4 @@
   </block>
 </view>
 
-<!-- 弹窗 -->
-<van-popup show="{{ show }}" position="bottom" round closeable custom-style="width:100%;padding:0rpx 30rpx 160rpx;" bind:close="onClose">
-  <view style="height: 90rpx;line-height: 90rpx;text-align: center;">审核</view>
-  <form bindsubmit="formSubmit">
-    <view class="part">
-      <view class="height20"> </view>
-      <view class="height20"> </view>
-      <input name="id" value='{{id}}' hidden='true' />
-      <van-field label="审核结果" name="auditFlag" value="{{ auditFlag }}" required input-align="right" class="radioHeight fieldAutoHeight">
-        <view slot="input" class="radioHeightBx">
-          <radio-group class="radio-group" bindchange="dangerStatusChange" data-radioType="auditFlag">
-            <label class="radio">
-              <radio value="true" checked="{{auditFlag=='true'}}" color="#4B70EA" />通过
-            </label>
-            <label class="radio">
-              <radio value="false" checked="{{auditFlag=='false'}}" color="#4B70EA" />不通过
-            </label>
-          </radio-group>
-        </view>
-      </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">
-      <view style="padding-top: 60rpx;">
-        <van-button block round type="info" form-type="submit" color="#0396FF">确认</van-button>
-      </view>
-    </view>
-  </form>
-</van-popup>
-
 <wxs module="filters" src="../../utils/filter.wxs"></wxs>

pages/reservationPipe/info.js

@@ -1,143 +0,0 @@
-// pages/reservationPipe/info.js
-const app = getApp()
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    info: {},
-
-    appointmentStatusArray: [{
-      dictValue: "",
-      dictLabel: "全部状态"
-    }],
-    appointmentStatusIndex: 0,
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    //预约审核状态
-    let treeData = app.globalData.treeArr
-    for (const element of treeData) {
-      let arrStr;
-      switch (element.dictValue) {
-        case 'appointment_status':
-          arrStr = "appointmentStatusArray";
-          break;
-      }
-      let getArray =[{
-        dictValue: "",
-        dictLabel: "全部状态"
-      }]
-      this.setData({
-        [arrStr]: getArray.concat(element.children)
-      })
-    }
-    //获取详情
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2];
-    let getInfo = prevPage.data.resData[options.index]
-  
-    this.setData({
-      info     : getInfo
-    })
-
-    app.request.GET({
-      url: app.API.bizpipeplanDetail,
-      params: {'id' : getInfo.orderId},
-      page: this,
-      successFun: true
-    }).then(res => {
-      let getInfo = res.data.data;
-      this.setData({
-        planNumber      : getInfo.planNumber,
-        planName        : getInfo.planName,
-        planCount       : getInfo.planCount,
-        planAlreadyCount: getInfo.planAlreadyCount,
-      })
-    })
-    //this.getInfo(options.id)
-  },
-
-  // //查询详情
-  // getInfo: function (id) {
-  //   app.request.GET({
-  //     url: app.API.bizloadarriveDetail,
-  //     page: this,
-  //     params: {
-  //       'id': id
-  //     },
-  //     successFun: true
-  //   }).then(res => {
-  //     let getInfo = res.data.data;
-  //     //司机回签图片
-  //     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,
-  //       accessControlAuth : JSON.parse(getInfo.accessControlAuth)
-  //     })
-  //   })
-  // },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/reservationPipe/info.json

@@ -1,16 +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-tag": "@vant/weapp/tag/index",
-    "van-image": "@vant/weapp/image/index"
-  }
-}

pages/reservationPipe/info.less

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

pages/reservationPipe/info.wxml

@@ -1,24 +0,0 @@
-<!--pages/reservationPipe/info.wxml-->
-<view class="container">
-  <view class="part">
-    <van-field label="管桩计划单号" input-align="right" value="{{info.planNumber }}" readonly></van-field>
-    <van-field label="- 计划名称" input-align="right" value="{{ planName }}" readonly></van-field>
-    <van-field label="- 预约次数" input-align="right" value="{{ planCount }}" readonly></van-field>
-    <van-field label="- 已预约次数" input-align="right" value="{{ planAlreadyCount }}" readonly></van-field>
-
-    <van-field label="车牌号" input-align="right" value="{{ info.licenseNumber }}" readonly></van-field>
-    <van-field label="司机姓名" input-align="right" value="{{ info.driverName }}" readonly></van-field>
-    <van-field label="司机电话" input-align="right" value="{{ info.driverMobile }}" readonly></van-field>
-    <van-field label="入场时间" input-align="right" value="{{ info.enterTime }}" readonly></van-field>
-    <van-field label="出场时间" input-align="right" value="{{ info.leaveTime }}" readonly></van-field>
-    <!-- <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(appointmentStatusArray, info.status, 'dictValue', 'dictLabel')}} 
-      </text>
-    </van-field>
-  </view>
-  <view style="height: 50px;"></view>
-</view>
-
-<wxs module="filters" src="../../utils/filter.wxs"></wxs>

utils/api.js

@@ -34,7 +34,7 @@ const api = {
   'getCarzheList':'/biz/bizexcessconfig/getList',//车辆轴数下拉列表
   'appointmentAdd':'/biz/bizappointmentrecord/add',//新增预约
   'appointmentEdit':'/biz/bizappointmentrecord/edit',//编辑预约
-  'appointmentList':'/biz/bizappointmentrecord/page',//预约列表
+  'appointmentPage':'/biz/bizappointmentrecord/page',//预约列表
   'appointmentDelete':'/biz/bizappointmentrecord/delete',//删除预约
   'appointmentCancel':'/biz/bizappointmentrecord/cancel',//取消预约
   'appointmentAudit':'/biz/bizappointmentrecord/auditRecord',//预约审核