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 @@
购货客户
- {{dmo.Customer_Name?dmo.Customer_Name:"请选择客户"}}
+ {{dmo.Customer_Name}}
@@ -31,40 +31,40 @@
会计单位
-
- {{dmo.AccountingUnit_Name?dmo.AccountingUnit_Name:"请选择会计单位"}}
+
+ {{dmo.AccountingUnit_Name}}
销售部门
-
- {{dmo.Department_Name?dmo.Department_Name:"请选择销售部门"}}
+
+ {{dmo.Department_Name}}
业务员
-
- {{dmo.Employee_Name?dmo.Employee_Name:"请选择业务员"}}
+
+ {{dmo.Employee_Name}}
仓库
-
- {{dmo.Store_Name?dmo.Store_Name:"请选择仓库"}}
+
+ {{dmo.Store_Name}}
销售类型
-
- {{dmo.SaleKind_Name?dmo.SaleKind_Name:"请选择销售类型"}}
+
+ {{dmo.SaleKind_Name}}
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,
}];