From f3a07be381b8a69cbd5b8e8471992b05b7b39f34 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Tue, 4 Dec 2018 10:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E8=AF=A6=E6=83=85=E9=A1=B5=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E8=AF=A5=E5=80=BC=E5=88=A4=E6=96=AD=E7=A1=AE=E5=AE=9A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E5=8F=8A=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/saleOutStore/saleOutStore.js                     |  8 ++++----
 pages/saleOutStore/saleOutStore.wxml                   |  2 +-
 .../saleOutStoreDetail/saleOutStoreDetail.js           | 10 +++++++++-
 .../saleOutStoreDetail/saleOutStoreDetail.wxml         |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

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 @@
 
 <template name="outStoreOrderTemplate">
   <view class='listContainer'>
-    <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.ID}}'>
+    <view class='listItem' catchtap='transToOrderDetail' data-detailitemid='{{item.ID}}' data-detailitemstate='{{item.OrderState}}'>
       <view class='topView'>
         <view class='goodsNum'>
           <text class='goodsIDText'>{{item.Customer_Name}}</text>
diff --git a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js
index 4afdbae..2d1977d 100644
--- a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js
+++ b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.js
@@ -11,11 +11,19 @@ Page({
     currentTab: 0,
     winHeight: app.globalData.winHeight,
     orderInfo: {},
+    showConfirmBtn: true,
   },
 
-  onLoad: function (options) {
+  onShow: function (options) {
     var that = this;
     let ID = Number(options.id);
+    var OrderState = options.orderState;
+    if (OrderState == "已审核"){
+      this.setData({
+        showConfirmBtn:false
+      })
+    } 
+
     var method = LoadOrder;
     var params = [ID];
     network.transfer_request(method, params, function (res) {
diff --git a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml
index 3c68c9e..1f75eef 100644
--- a/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml
+++ b/pages/saleOutStore/saleOutStoreDetail/saleOutStoreDetail.wxml
@@ -109,7 +109,7 @@
         </block>
       </view>
 
-      <view class='imageView' catchtap='billConfirm'>
+      <view class='imageView' wx:if="{{showConfirmBtn}}" catchtap='billConfirm'>
         <image class='currentImage' src="/imgs/blueBtn.png">
           <view class='btnTextView'>
             <text class='btnText'>确定</text>
@@ -161,7 +161,7 @@
   <view class='baseitem'>
     <text class='baseitem_key'>确认数量</text>
     <view class='baseitem_value'>
-      <input class='inputItem' bindinput='getConfirmNumber' placeholder='请输入确认收货数量' value="{{item.ConfirmNumber}}" data-index='{{idx}}'></input>
+      <input class='inputItem' disabled="{{!showConfirmBtn}}" bindinput='getConfirmNumber' placeholder='请输入确认收货数量' value="{{item.ConfirmNumber}}" data-index='{{idx}}'></input>
     </view>
   </view>
   <view class='horizontallineView'></view>