diff --git a/pages/orderList/orderList.js b/pages/orderList/orderList.js index 41ae832..c3a9a06 100644 --- a/pages/orderList/orderList.js +++ b/pages/orderList/orderList.js @@ -2,10 +2,86 @@ const app = getApp(); var network = require("../../utils/net.js"); var timechage = require("../../utils/dateTimeUtil.js"); +var PageSize = 10 +var UnCheckPageIndex = 0 +var CheckedPageIndex = 0 var getOrderList = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/CarRecordRpc/GetList' +// 未审核订单列表 +function getUnCheckOrderList(that, UnCheckPageIndex, successaction) { + let getArr = []; + let method = getListPath; + let params = [false, app.globalData.Phone, UnCheckPageIndex, PageSize]; + network.transfer_request(method, params, function (res) { + successaction(); + var array = res.result; + if (array.length <= 0) { + wx.showToast({ + title: '无数据更新', + }) + UnCheckPageIndex = UnCheckPageIndex - 1; + return; + } + for (var i = 0; i < array.length; i++) { + var dmo = { + OrderState: "未审核", + ID: array[i].ID, + Employee_Name: array[i].Employee_Name, + TotalNumber: array[i].TotalNumber, + Customer_Name: array[i].Customer_Name, + LoadTime: timechage.formatTimeTwo(array[i].LoadTime.substring(6, 19), 'Y/M/D'), + Address: array[i].Address, + } + getArr.push(dmo); + } + let arrLast = that.data.unCheckDataArr.concat(getArr); + that.setData({ + unCheckDataArr: arrLast, + }) + }) +} + +// 已审核订单列表 +function getCheckedOrderList(that, CheckedPageIndex) { + let getArr = []; + let method = getListPath; + let params = [true, app.globalData.Phone, CheckedPageIndex, PageSize]; + network.transfer_request(method, params, function (res) { + var array = res.result; + if (array.length <= 0) { + wx.showToast({ + title: '无数据更新', + }) + CheckedPageIndex = CheckedPageIndex - 1; + return; + } + for (var i = 0; i < array.length; i++) { + var dmo = { + //添加单据状态的传递,在详情页面判断此值,进行是否允许提交的操作 + OrderState: "已审核", + ID: array[i].ID, + Employee_Name: array[i].Employee_Name, + TotalNumber: array[i].TotalNumber, + Customer_Name: array[i].Customer_Name, + LoadTime: timechage.formatTimeTwo(array[i].LoadTime.substring(6, 19), 'Y/M/D'), + Address: array[i].Address, + } + getArr.push(dmo); + } + let arrLast = that.data.checkedDataArr.concat(getArr); + // console.log(arrLast); + that.setData({ + checkedDataArr: arrLast, + }) + }) +} + Page({ data: { + checkedDataArr: [], + unCheckDataArr: [], + winHeight: app.globalData.winHeight, + currentTab: 0, orderList: [], }, @@ -45,6 +121,28 @@ Page({ url: 'orderDetail/orderDetail?id=' + itemID, }) }, + /** + * 滑动切换tab + */ + bindChange: function (e) { + var that = this; + that.setData({ + currentTab: e.detail.current + }); + }, + /** + * 点击tab切换 + */ + swichNav: function (e) { + var that = this; + if (this.data.currentTab === e.target.dataset.current) { + return false; + } else { + that.setData({ + currentTab: e.target.dataset.current + }) + } + }, }) \ No newline at end of file diff --git a/pages/orderList/orderList.wxml b/pages/orderList/orderList.wxml index 90d0da8..45088b4 100644 --- a/pages/orderList/orderList.wxml +++ b/pages/orderList/orderList.wxml @@ -1,11 +1,33 @@ - - - -