From e525be62b80f0c7c05967cf5534087babd9a11cb Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Fri, 14 Dec 2018 16:13:27 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4=202?=
 =?UTF-8?q?=E3=80=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=93=8D=E4=BD=9C=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/detail.wxml | 22 +++++++++++-----------
 pages/order/newBill/newBill.js |  3 ++-
 pages/order/order.js           |  6 +++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml
index f9f74cd..445b7c8 100644
--- a/pages/order/detail/detail.wxml
+++ b/pages/order/detail/detail.wxml
@@ -13,7 +13,7 @@
         <view class='baseitem'>
           <text class='baseitem_key'>购货客户</text>
           <view class='baseitem_value' data-x='购货客户'>
-            {{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
+            {{dmo.Customer_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
@@ -31,40 +31,40 @@
 
         <view class='baseitem'>
           <text class='baseitem_key'>会计单位</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='会计部门'>
-            {{dmo.AccountingUnit_Name?dmo.AccountingUnit_Name:"请选择会计单位"}}
+          <view class='baseitem_value'>
+            {{dmo.AccountingUnit_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
 
         <view class='baseitem'>
           <text class='baseitem_key'>销售部门</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='部门'>
-            {{dmo.Department_Name?dmo.Department_Name:"请选择销售部门"}}
+          <view class='baseitem_value' >
+            {{dmo.Department_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
 
         <view class='baseitem'>
           <text class='baseitem_key'>业务员</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='业务员'>
-            {{dmo.Employee_Name?dmo.Employee_Name:"请选择业务员"}}
+          <view class='baseitem_value' >
+            {{dmo.Employee_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
 
         <view class='baseitem'>
           <text class='baseitem_key'>仓库</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='仓库'>
-            {{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}}
+          <view class='baseitem_value' >
+            {{dmo.Store_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
 
         <view class='baseitem'>
           <text class='baseitem_key'>销售类型</text>
-          <view class='baseitem_value' bindtap="powerDrawer" data-x='销售类型'>
-            {{dmo.SaleKind_Name?dmo.SaleKind_Name:"请选择销售类型"}}
+          <view class='baseitem_value' >
+            {{dmo.SaleKind_Name}}
           </view>
         </view>
         <view class='horizontallineView'></view>
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index e39b719..b301573 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -71,11 +71,12 @@ function GetGoodsInfo(that, dmo, detail) {
 }
 
 function GetCustomerInfo(that, dmo, succession) {
-  var params = [app.globalData.userID, ["Name", "Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address"]]
+  var params = [app.globalData.userID, ["Name", "Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID", "AccountingUnit_Name", "TakeGoods_Type", "Address","CheckOutManner_ID"]]
   network.transfer_request(getCustomerInfo, params, function(res) {
     var obj = JSON.parse(res.result);
     dmo.Customer_ID = app.globalData.userID;
     dmo.Customer_Name = obj.Name;
+    dmo.CheckOutManner_ID = obj.CheckOutManner_ID;
     dmo.Department_ID = obj.Department_ID;
     dmo.Department_Name = obj.Department_Name;
     dmo.Employee_ID = obj.Employee_ID;
diff --git a/pages/order/order.js b/pages/order/order.js
index 928513f..70acaf7 100644
--- a/pages/order/order.js
+++ b/pages/order/order.js
@@ -5,7 +5,7 @@ var timechage = require("../../utils/dateTimeUtil.js");
 var PageSize = 10
 var UnCheckPageIndex = 0
 var CheckedPageIndex = 0
-var getListPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/GetList'
+var getListPath = '/MainSystem/B3MiniProgramRpc/XuRpcs/Customer/OrderRpc/GetList'
 var deleteItem = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Delete"
 
 // 未审核订单列表
@@ -16,7 +16,7 @@ function getUnCheckOrderList(that, UnCheckPageIndex, PageSize, successaction) {
     "BillState": 0,
     "StartLoadTime": app.globalData.selectStartDate,
     "EndLoadTime": app.globalData.selectEndDate,
-    "Customer_ID": app.globalData.userID,
+    "Customer_ID": null,//app.globalData.userID
     "PageIndex": UnCheckPageIndex,
     "PageSize": PageSize,
   }];
@@ -57,7 +57,7 @@ function getCheckedOrderList(that, CheckedPageIndex, PageSize) {
     "BillState": 20,
     "StartLoadTime": app.globalData.selectStartDate,
     "EndLoadTime": app.globalData.selectEndDate,
-    "Customer_ID": app.globalData.userID,
+    "Customer_ID":  null, // app.globalData.userID,
     "PageIndex": CheckedPageIndex,
     "PageSize": PageSize,
   }];