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 => {
姓名:必填,若与员工编号对应的项企用户姓名不同,将以项企数据为准;
销售区域(省/直辖市):必填,省或直辖市顿号隔开,如“北京市、江西省、江苏省”;
销售区域(市):非必填,归属所填省的地级市顿号隔开,如“南昌市、镇江市”。
- 业务线:非必填,顿号隔开,如“智慧城市、工地”。
+ 业务线:必填,顿号隔开,如“智慧城市、工地”。
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%' }}
diff --git a/web/config.js b/web/config.js
index 232fca0..1e6e55c 100644
--- a/web/config.js
+++ b/web/config.js
@@ -15,7 +15,7 @@ args.option(['u', 'api-url'], 'webapi的URL');
args.option('apiHrUrl', 'webapi的URL 外网可访问');
args.option('apiEmisUrl', '企业管理 api');
args.option('webPepUrl', '企业管理 web');
-args.option(['d', 'domain'], 'web domain');
+args.option(['d', 'domain'], '项企 domain');
// 七牛
@@ -33,7 +33,7 @@ const flags = args.parse(process.argv);
const API_URL = process.env.API_URL || flags.apiUrl;
const API_HR_URL = process.env.API_HR_URL || flags.apiHrUrl;
-const FS_HR_DOMAIN = process.env.FS_HR_DOMAIN || flags.domain;
+const FS_PEP_DOMAIN = process.env.FS_PEP_DOMAIN || flags.domain;
const API_EMIS_URL = process.env.API_EMIS_URL || flags.apiEmisUrl;
const WEB_PEP_URL = process.env.WEB_PEP_URL || flags.webPepUrl;
@@ -49,7 +49,8 @@ const ANXINCLOUD_WEEKLY_SERVICES = process.env.ANXINCLOUD_WEEKLY_SERVICES || fla
if (
!API_URL
|| !API_HR_URL
- || !FS_HR_DOMAIN
+ || !FS_PEP_DOMAIN
+ || !WEB_PEP_URL
|| !ANXINCLOUD_QINIU_AK || !ANXINCLOUD_QINIU_SK || !ANXINCLOUD_QINIU_BUCKET_RESOURCE || !ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE
) {
console.log('缺少启动参数,异常退出');
@@ -90,7 +91,7 @@ const product = {
service: {
weekly: ANXINCLOUD_WEEKLY_SERVICES
},
- domain: FS_HR_DOMAIN,
+ domain: FS_PEP_DOMAIN,
webPepUrl: WEB_PEP_URL
}
}, {