diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index 19773c5..4463812 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -489,55 +489,18 @@ Page({
// 保存
submitForm: function() {
var dmo = this.data.dmo;
-
if (dmo.Customer_ID == null) {
wx.showToast({
- title: '请选择购货客户'
- })
- return;
- }
- if (dmo.AccountingUnit_ID == null) {
- wx.showToast({
- title: '请选择会计单位'
- })
- return;
- }
-
- if (dmo.Department_ID == null) {
- wx.showToast({
- title: '请选择销售部门',
- })
- return;
- }
-
- if (dmo.Employee_ID == null) {
- wx.showToast({
- title: '请选择业务员',
+ title: '个人信息获取不完善'
})
return;
}
-
- if (dmo.Store_ID == null) {
+ if (dmo.Details.length <= 0) {
wx.showToast({
- title: '请选择仓库',
+ title: '存货不能为空',
})
return;
}
-
- if (dmo.SaleKind_ID == null) {
- wx.showToast({
- title: '请选择销售类型',
- })
- return;
- }
-
- if (dmo.TakeGoods_Type == "") {
- wx.showToast({
- title: '请选择配送方式',
- })
- return;
- }
-
for (var i = 0; i < dmo.Details.length; i++) {
if (dmo.Details[i].SaleGoods_ID == null) {
wx.showToast({
@@ -551,12 +514,7 @@ Page({
})
return;
}
- // if (dmo.Details[i].SecondNumber == null) {
- // wx.showToast({
- // title: '辅数量不能为空',
- // })
- // return;
- // }
+
}
let method = update;
@@ -572,6 +530,7 @@ Page({
"DeliverAddress": dmo.DeliverAddress,
"Remark": dmo.Remark,
"Details": dmo.Details,
+ "CheckOutManner_ID": dmo.CheckOutManner_ID,
"ID": dmo.ID
}];
diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml
index 445b7c8..c61502c 100644
--- a/pages/order/detail/detail.wxml
+++ b/pages/order/detail/detail.wxml
@@ -19,7 +19,7 @@
-
+
-
+
-
+
-
+
-
+
-
+
配送方式
@@ -103,9 +103,6 @@
{{item.Goods_Name}}
-
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index b301573..268c60c 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -518,6 +518,7 @@ Page({
"DeliverAddress": dmo.DeliverAddress,
"Remark": dmo.Remark,
"Details": dmo.Details,
+ "CheckOutManner_ID": dmo.CheckOutManner_ID,
"ID": dmo.ID
}];