From 979725cfd667b3830d258628f2f7847c4018b25e Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Fri, 14 Dec 2018 17:17:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BB=98=E8=B4=B9=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail/detail.js   | 1 +
 pages/order/newBill/newBill.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index 19773c5..422763f 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -572,6 +572,7 @@ Page({
       "DeliverAddress": dmo.DeliverAddress,
       "Remark": dmo.Remark,
       "Details": dmo.Details,
+      "CheckOutManner_ID": dmo.CheckOutManner_ID,
       "ID": dmo.ID
     }];
 
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index f55aa97..7704457 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -73,11 +73,12 @@ function GetGoodsInfo(that, dmo, detail) {
 }
 
 function GetCustomerInfo(that, dmo) {
-  var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID","AccountingUnit_Name","TakeGoods_Type", "Address"]]
+  var params = [dmo.Customer_ID, ["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.Department_ID = obj.Department_ID;
     dmo.Department_Name = obj.Department_Name;
+    dmo.CheckOutManner_ID = obj.CheckOutManner_ID;
     dmo.Employee_ID = obj.Employee_ID;
     dmo.Employee_Name = obj.Employee_Name;
     dmo.AccountingUnit_ID = obj.AccountingUnit_ID;
@@ -504,6 +505,7 @@ Page({
       "DeliverAddress": dmo.DeliverAddress,
       "Remark": dmo.Remark,
       "Details": dmo.Details,
+      "CheckOutManner_ID": dmo.CheckOutManner_ID,
       "ID": dmo.ID
     }];