From 50fb37a91f0b931c690b836de7533d8ce9526fbc Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Thu, 13 Dec 2018 14:03:39 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E9=80=89=E5=8F=96=E5=AE=A2=E6=88=B7=E5=B8=A6?=
 =?UTF-8?q?=E5=87=BA=E4=BC=9A=E8=AE=A1=E5=8D=95=E4=BD=8D=E3=80=82=202?=
 =?UTF-8?q?=E3=80=81=E8=AE=A2=E5=8D=95=E6=96=B0=E5=BB=BA=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B8=A6=E5=87=BA=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E4=BB=93=E5=BA=93=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/newBill/newBill.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index 907d011..bc96f35 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -18,6 +18,8 @@ var getCustomerInfo = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Get
 
 let insert = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Insert'
 
+var getUserPrifile = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/AccountRpc/GetUserPrifile"
+
 // 获取完整的年月日 时分秒，以及默认显示的数组'
 function setTime(that) {
   // 精确到分的处理，将数组的秒去掉
@@ -71,13 +73,15 @@ function GetGoodsInfo(that, dmo, detail) {
 }
 
 function GetCustomerInfo(that, dmo) {
-  var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "TakeGoods_Type", "Address"]]
+  var params = [dmo.Customer_ID, ["Department_ID", "Department_Name", "Employee_ID", "Employee_Name", "AccountingUnit_ID","AccountingUnit_Name","TakeGoods_Type", "Address"]]
   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.Employee_ID = obj.Employee_ID;
     dmo.Employee_Name = obj.Employee_Name;
+    dmo.AccountingUnit_ID = obj.AccountingUnit_ID;
+    dmo.AccountingUnit_Name = obj.AccountingUnit_Name;
     if (obj.TakeGoods_Type != null)
       dmo.TakeGoods_Type = obj.TakeGoods_Type.Name;
     else
@@ -101,15 +105,29 @@ Page({
     },
     dateTimeArray1: null,
     dateTime1: null,
-    backPage:"",
+    backPage: "",
   },
 
   onLoad: function(options) {
     var that = this;
-    setTime(that)
+    setTime(that);
+    this.getUserPrifile();
+  },
+
+  getUserPrifile: function() {
+    var that = this;
+    network.transfer_request(getUserPrifile, [], function(res) {
+      that.data.dmo.SaleKind_ID = res.result.Order_SaleKind_ID;
+      that.data.dmo.SaleKind_Name = res.result.Order_SaleKind_Name;
+      that.data.dmo.Store_ID = res.result.Order_Store_ID;
+      that.data.dmo.Store_Name = res.result.Order_Store_Name;
+      that.setData({
+        dmo: that.data.dmo
+      });
+    });
   },
 
-  onShow: function () {
+  onShow: function() {
     var that = this;
     if (this.data.backPage == "goodsNameChoosePage") {
       var goodsArr = app.globalData.goodsNameArray;