From ce12aee28d903dccdee8077bae759782aaf9a4a1 Mon Sep 17 00:00:00 2001
From: wuqun <wu.qun@free-sun.com.cn>
Date: Fri, 2 Dec 2022 14:15:03 +0800
Subject: [PATCH] =?UTF-8?q?(*)=E9=94=80=E5=94=AE=E4=BA=BA=E5=91=98=20?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=20=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../containers/salersDistribution/importSalersModal.js   | 9 +++++----
 .../containers/salersDistribution/salesMemberModal.js    | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js b/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js
index 0a02075..e0d3b99 100644
--- a/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js
+++ b/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js
@@ -144,9 +144,6 @@ const ImportSalersModal = props => {
     }
 
     const judgeLines = (businessLines) => {
-        if (!businessLines) {//可以不填
-            return true;
-        }
         let noMark = 0;
         businessLines?.split('、')?.map(p => {
             if (businessLinesConst.indexOf(p) == -1) {
@@ -241,6 +238,10 @@ const ImportSalersModal = props => {
                                     error(`第${i + 2}行销售区域（市）错误`)
                                     return
                                 }
+                                if (!businessLines) {//业务线 必填
+                                    error(`第${i + 2}行业务线为空，请填写`)
+                                    return
+                                }
                                 let bValid = judgeLines(businessLines);
                                 if (!bValid) {
                                     error(`第${i + 2}行业务线错误`)
@@ -272,7 +273,7 @@ const ImportSalersModal = props => {
                     <div>姓名：必填，若与员工编号对应的项企用户姓名不同，将以项企数据为准；</div>
                     <div>销售区域（省/直辖市）：必填，省或直辖市顿号隔开，如“北京市、江西省、江苏省”；</div>
                     <div>销售区域（市）：非必填，归属所填省的地级市顿号隔开，如“南昌市、镇江市”。</div>
-                    <div>业务线：非必填，顿号隔开，如“智慧城市、工地”。</div>
+                    <div>业务线：必填，顿号隔开，如“智慧城市、工地”。</div>
                 </div>
             </Form>
         </Modal >
diff --git a/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js b/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js
index 09ca6a1..5927511 100644
--- a/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js
+++ b/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js
@@ -238,6 +238,7 @@ const SalesMemberModal = (props) => {
                     label="业务线"
                     field='businessLines'
                     showClear
+                    rules={[{ required: true, message: '请选择业务线' }]}
                     placeholder='请选择业务线'
                     multiple filter
                     style={{ width: '100%' }}