diff --git a/imgs/bindImage.png b/imgs/bindImage.png index 9a64563..ae5447a 100644 Binary files a/imgs/bindImage.png and b/imgs/bindImage.png differ diff --git a/pages/saleOutStore/saleOutStore.js b/pages/saleOutStore/saleOutStore.js index f5ff9c1..a8b7f22 100644 --- a/pages/saleOutStore/saleOutStore.js +++ b/pages/saleOutStore/saleOutStore.js @@ -11,7 +11,7 @@ var getListPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Driver/SaleOutStoreRpc/Ge function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successaction) { let getArr = []; let method = getListPath; - let params = [true, app.globalData.Phone, UnCheckPageIndex, PageSize]; + let params = [false, app.globalData.Phone, UnCheckPageIndex, PageSize]; network.transfer_request(method, params, function (res) { successaction(); var array = res.result; @@ -24,7 +24,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact } for (var i = 0; i < array.length; i++) { var dmo = { - OrderState: "已审核", + OrderState: "未审核", ID: array[i].ID, Employee_Name: array[i].Employee_Name, TotalNumber: array[i].TotalNumber, @@ -58,7 +58,7 @@ function getCheckedOrderList(that, CheckedPageIndex, CheckedPageSize) { for (var i = 0; i < array.length; i++) { var dmo = { //添加单据状态的传递,在详情页面判断此值,进行是否允许提交的操作 - OrderState: "未审核", + OrderState: "已审核", ID: array[i].ID, Employee_Name: array[i].Employee_Name, TotalNumber: array[i].TotalNumber, diff --git a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js index 2d1977d..2106434 100644 --- a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js +++ b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js @@ -14,7 +14,7 @@ Page({ showConfirmBtn: true, }, - onShow: function (options) { + onLoad: function (options) { var that = this; let ID = Number(options.id); var OrderState = options.orderState; diff --git a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml index 1f75eef..5567016 100644 --- a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml +++ b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml @@ -105,7 +105,7 @@ -