From faf2c3ecc355ed81481cf4e9b57e9aeefb27e035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 22 May 2022 00:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E5=80=99=E5=8D=95=E4=BD=8D=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/material/modules/MaterialModal.vue      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 58802c7b..839bb42b 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -644,8 +644,15 @@
                   }
                 } else if(formData.unitId) {
                   if(commodityUnit != basicUnit && commodityUnit != otherUnit && commodityUnit != otherUnitTwo && commodityUnit != otherUnitThree) {
-                    this.$message.warning('条码之后的单位填写有误，单位【' + commodityUnit + '】请修改为【'
-                      + basicUnit+ '】或【' + otherUnit+ '】或【' + otherUnitTwo+ '】或【' + otherUnitThree+ '】！');
+                    let warnInfo = '条码之后的单位填写有误，单位【' + commodityUnit + '】请修改为【' + basicUnit+ '】或【' + otherUnit+ '】'
+                    if(otherUnitTwo) {
+                      warnInfo += '或【' + otherUnitTwo+ '】'
+                    }
+                    if(otherUnitThree) {
+                      warnInfo += '或【' + otherUnitThree+ '】'
+                    }
+                    warnInfo += '！'
+                    this.$message.warning(warnInfo);
                     return;
                   }
                 }