From 90ffa921ebc60b7135795f91025b97d6069984dd Mon Sep 17 00:00:00 2001
From: chenxuhui <qwehui12@163.com>
Date: Wed, 12 Dec 2018 16:10:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E4=B8=BB?=
 =?UTF-8?q?=E8=BE=85=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E9=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js
index 99cdd3a..19773c5 100644
--- a/pages/order/detail/detail.js
+++ b/pages/order/detail/detail.js
@@ -545,9 +545,9 @@ Page({
         })
         return;
       }
-      if (dmo.Details[i].UnitNum == null) {
+      if (dmo.Details[i].UnitNum == null && dmo.Details[i].SecondNumber == null) {
         wx.showToast({
-          title: '报货数量不能为空',
+          title: '请输入报货数量/重量',
         })
         return;
       }
diff --git a/pages/order/newBill/newBill.js b/pages/order/newBill/newBill.js
index a1854bc..907d011 100644
--- a/pages/order/newBill/newBill.js
+++ b/pages/order/newBill/newBill.js
@@ -464,9 +464,9 @@ Page({
         })
         return;
       }
-      if (dmo.Details[i].UnitNum == null) {
+      if (dmo.Details[i].UnitNum == null && dmo.Details[i].SecondNumber == null) {
         wx.showToast({
-          title: '报货数量不能为空',
+          title: '请输入报货数量/重量',
         })
         return;
       }