From 7ab8c936472312766f4d3985c0f6c9ba304a4790 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 14 Dec 2021 23:37:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=95=86=E5=93=81=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=97=B6=E5=80=99=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E6=89=B9=E5=8F=B7=E5=8F=AA=E8=83=BD=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=B8=80=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/material/modules/MaterialModal.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue
index 64f527fe..f91a5b3f 100644
--- a/jshERP-web/src/views/material/modules/MaterialModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialModal.vue
@@ -569,6 +569,10 @@
           this.$message.warning('抱歉，请输入条码信息！');
           return;
         }
+        if(formData.enableSerialNumber === '1' && formData.enableBatchNumber === '1') {
+          this.$message.warning('抱歉，序列号和批号只能选择一项！');
+          return;
+        }
         //校验商品是否存在，通过校验商品的名称、型号、规格、颜色、单位、制造商等
         let param = {
           id: this.model.id?this.model.id:0,