From 8816823ee8eacd90b32590196a814d09bd556172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 1 Dec 2021 23:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=85=A5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/modules/UnitModal.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue
index c1948256..6c29b21b 100644
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -116,18 +116,23 @@
               that.confirmLoading = false;
               return;
             }
-            if(!formData.ratio) {
-              that.$message.warning('抱歉，此时比例不能为空！');
+            if(formData.otherUnit && !formData.ratio) {
+              that.$message.warning('抱歉，比例不能为空！');
               that.confirmLoading = false;
               return;
             }
             if(formData.otherUnitTwo && !formData.ratioTwo) {
-              that.$message.warning('抱歉，此时比例2不能为空！');
+              that.$message.warning('抱歉，比例2不能为空！');
               that.confirmLoading = false;
               return;
             }
             if(formData.otherUnitThree && !formData.ratioThree) {
-              that.$message.warning('抱歉，此时比例3不能为空！');
+              that.$message.warning('抱歉，比例3不能为空！');
+              that.confirmLoading = false;
+              return;
+            }
+            if(!formData.otherUnitTwo && formData.otherUnitThree) {
+              that.$message.warning('抱歉，需要先输入副单位2再输入副单位3！');
               that.confirmLoading = false;
               return;
             }