From 5e3560fe49c646f29cffd646b7ec2ba2945c3323 Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Fri, 14 Dec 2018 17:16:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=86=85=E5=AE=B9=E5=88=A0=E5=87=8F=202?=
 =?UTF-8?q?=E3=80=81=E6=B7=BB=E5=8A=A0=E4=BB=98=E8=B4=B9=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/detail.js   | 51 ++++------------------------------
 pages/order/detail/detail.wxml | 27 ++++++++----------
 pages/order/newBill/newBill.js |  1 +
 3 files changed, 18 insertions(+), 61 deletions(-)

diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index 19773c5..4463812 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -489,55 +489,18 @@ Page({
   // 保存
   submitForm: function() {
     var dmo = this.data.dmo;
-
     if (dmo.Customer_ID == null) {
       wx.showToast({
-        title: '请选择购货客户'
-      })
-      return;
-    }
-    if (dmo.AccountingUnit_ID == null) {
-      wx.showToast({
-        title: '请选择会计单位'
-      })
-      return;
-    }
-
-    if (dmo.Department_ID == null) {
-      wx.showToast({
-        title: '请选择销售部门',
-      })
-      return;
-    }
-
-    if (dmo.Employee_ID == null) {
-      wx.showToast({
-        title: '请选择业务员',
+        title: '个人信息获取不完善'
       })
       return;
     }
-
-    if (dmo.Store_ID == null) {
+    if (dmo.Details.length <= 0) {
       wx.showToast({
-        title: '请选择仓库',
+        title: '存货不能为空',
       })
       return;
     }
-
-    if (dmo.SaleKind_ID == null) {
-      wx.showToast({
-        title: '请选择销售类型',
-      })
-      return;
-    }
-
-    if (dmo.TakeGoods_Type == "") {
-      wx.showToast({
-        title: '请选择配送方式',
-      })
-      return;
-    }
-
     for (var i = 0; i < dmo.Details.length; i++) {
       if (dmo.Details[i].SaleGoods_ID == null) {
         wx.showToast({
@@ -551,12 +514,7 @@ Page({
         })
         return;
       }
-      // if (dmo.Details[i].SecondNumber == null) {
-      //   wx.showToast({
-      //     title: '辅数量不能为空',
-      //   })
-      //   return;
-      // }
+     
     }
 
     let method = update;
@@ -572,6 +530,7 @@ Page({
       "DeliverAddress": dmo.DeliverAddress,
       "Remark": dmo.Remark,
       "Details": dmo.Details,
+      "CheckOutManner_ID": dmo.CheckOutManner_ID,
       "ID": dmo.ID
     }];
 
diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml
index 445b7c8..c61502c 100644
--- a/pages/order/detail/detail.wxml
+++ b/pages/order/detail/detail.wxml
@@ -19,7 +19,7 @@
         <view class='horizontallineView'></view>
 
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>发货时间</text>
           <picker class='baseitem_value' mode="multiSelector" value="{{dmo.LoadTime}}" bindchange="changeDateTime1" range="{{dateTimeArray1}}">
             <view class="tui-picker-detail">
@@ -27,47 +27,47 @@
             </view>
           </picker>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>会计单位</text>
           <view class='baseitem_value'>
             {{dmo.AccountingUnit_Name}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>销售部门</text>
           <view class='baseitem_value' >
             {{dmo.Department_Name}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>业务员</text>
           <view class='baseitem_value' >
             {{dmo.Employee_Name}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>仓库</text>
           <view class='baseitem_value' >
             {{dmo.Store_Name}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
-        <view class='baseitem'>
+        <!-- <view class='baseitem'>
           <text class='baseitem_key'>销售类型</text>
           <view class='baseitem_value' >
             {{dmo.SaleKind_Name}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
         <view class='baseitem'>
           <text class='baseitem_key'>配送方式</text>
@@ -103,9 +103,6 @@
             <view class='baseitem_value'>
               {{item.Goods_Name}}
             </view>
-            <!-- <view class='baseitem_value' bindtap="powerDrawer" data-idx='{{idx}}' data-x='存货'>
-              {{item.Goods_Name?item.Goods_Name:"请选择存货"}}
-            </view> -->
           </view>
           <view class='horizontallineView'></view>
 
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index b301573..268c60c 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -518,6 +518,7 @@ Page({
       "DeliverAddress": dmo.DeliverAddress,
       "Remark": dmo.Remark,
       "Details": dmo.Details,
+      "CheckOutManner_ID": dmo.CheckOutManner_ID,
       "ID": dmo.ID
     }];