diff --git a/pages/saleOutStore/saleOutStore.js b/pages/saleOutStore/saleOutStore.js index 4061a6a..8f35d06 100644 --- a/pages/saleOutStore/saleOutStore.js +++ b/pages/saleOutStore/saleOutStore.js @@ -24,7 +24,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, UnCheckPageSize, successact } for (var i = 0; i < array.length; i++) { var dmo = { - orderState: true, + 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: true, + OrderState: "未审核", ID: array[i].ID, Employee_Name: array[i].Employee_Name, TotalNumber: array[i].TotalNumber, @@ -113,7 +113,7 @@ Page({ */ onShow: function () { this.setData({ - checkedDataArr: [1], + checkedDataArr: [], unCheckDataArr: [], }) var that = this; @@ -146,7 +146,7 @@ Page({ // 进入订单详情 transToOrderDetail: function (e) { wx.navigateTo({ - url: 'saleOutStoreDetail/saleOutStoreDetail?id=' + e.currentTarget.dataset.detailitemid, + url: 'saleOutStoreDetail/saleOutStoreDetail?id=' + e.currentTarget.dataset.detailitemid + "&orderState=" + e.currentTarget.dataset.detailitemstate, }) }, diff --git a/pages/saleOutStore/saleOutStore.wxml b/pages/saleOutStore/saleOutStore.wxml index 1966914..9109b21 100644 --- a/pages/saleOutStore/saleOutStore.wxml +++ b/pages/saleOutStore/saleOutStore.wxml @@ -30,7 +30,7 @@