From 6af44efeb411961f0206ebb7af491d02c66be3bf Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Fri, 14 Dec 2018 13:41:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E6=8E=89=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=202=E3=80=81=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8D=A0=E4=BD=8D=E5=AD=97=E4=BD=93=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=203=E3=80=81=E9=81=AE=E7=BD=A9=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/newBill/newBill.js   |  6 ++++--
 pages/order/newBill/newBill.wxml | 30 +++++++++++++++---------------
 pages/order/newBill/newBill.wxss |  4 ++++
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 2a294d2..40115dd 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -428,10 +428,11 @@ Page({
     var dmo = this.data.dmo;
     if (dmo.Customer_ID == null) {
       wx.showToast({
-        title: '请选择购货客户'
+        title: '个人信息获取不完善'
       })
       return;
     }
+    /*
     if (dmo.AccountingUnit_ID == null) {
       wx.showToast({
         title: '请选择会计单位'
@@ -473,7 +474,8 @@ Page({
       })
       return;
     }
-
+   */
+  
     // if (dmo.DeliverAddress == "") {
     //   wx.showToast({
     //     title: '请填写送货地址',
diff --git a/pages/order/newBill/newBill.wxml b/pages/order/newBill/newBill.wxml
index 2dd235b..aac7ccd 100644
--- a/pages/order/newBill/newBill.wxml
+++ b/pages/order/newBill/newBill.wxml
@@ -18,7 +18,7 @@
         </view>
         <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">
@@ -26,51 +26,51 @@
             </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' catchtap="powerDrawer" data-x='会计部门'>
             {{dmo.AccountingUnit_Name?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' catchtap="powerDrawer" data-x='部门'>
             {{dmo.Department_Name?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' catchtap="powerDrawer" data-x='业务员'>
             {{dmo.Employee_Name?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' catchtap="powerDrawer" data-x='仓库'>
             {{dmo.Store_Name?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' catchtap="powerDrawer" data-x='销售类型'>
             {{dmo.SaleKind_Name?dmo.SaleKind_Name:"请选择销售类型"}}
           </view>
         </view>
-        <view class='horizontallineView'></view>
+        <view class='horizontallineView'></view> -->
 
         <view class='baseitem'>
           <text class='baseitem_key'>配送方式</text>
-          <view class='baseitem_value' catchtap="powerDrawer" data-x='配送方式'>
+          <view class="baseitem_value {{dmo.TakeGoods_Type?'':'novalue'}}" catchtap="powerDrawer" data-x='配送方式'>
             {{dmo.TakeGoods_Type?dmo.TakeGoods_Type:"请选择配送方式"}}
           </view>
         </view>
@@ -105,7 +105,7 @@
                 {{item.Goods_Name}}
               </view>
             </view>
-              <!-- <view class='baseitem_value' bindtap="powerDrawer" data-idx='{{idx}}' data-x='存货'>
+            <!-- <view class='baseitem_value' bindtap="powerDrawer" data-idx='{{idx}}' data-x='存货'>
                 {{item.Goods_Name?item.Goods_Name:"请选择存货"}}
               </view>
             </view> -->
@@ -176,7 +176,7 @@
   </swiper-item>
 </swiper>
 
-<view class="drawer_screen" catchtap="powerDrawer" data-statu="open" wx:if="{{showModalStatus}}"></view>
+<view class="drawer_screen" catchtap="dialogClose" wx:if="{{showModalStatus}}"></view>
 <view animation="{{animationData}}" class="drawer_box" wx:if="{{showModalStatus}}">
   <view class='top'>
     <input class="sousuo" bindinput="select" placeholder='请输入搜索'>
diff --git a/pages/order/newBill/newBill.wxss b/pages/order/newBill/newBill.wxss
index 66b7f3e..6070296 100644
--- a/pages/order/newBill/newBill.wxss
+++ b/pages/order/newBill/newBill.wxss
@@ -83,6 +83,10 @@ page {
   text-align: right;
 }
 
+.novalue{
+  color:rgb(202, 202, 202);
+}
+
 .baseitem_key2 {
   color: #666;
   width: 30%;