🔀 合并票 05 前端取消所属组织必填
This commit is contained in:
@@ -133,7 +133,7 @@ export default {
|
|||||||
hide: true,
|
hide: true,
|
||||||
span: 24,
|
span: 24,
|
||||||
order: 55,
|
order: 55,
|
||||||
rules: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
|
// 后端已允许所属组织为空,这里不做必填校验
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '所属组织',
|
label: '所属组织',
|
||||||
|
|||||||
@@ -315,11 +315,6 @@ export default {
|
|||||||
},
|
},
|
||||||
rowSave(row, done, loading) {
|
rowSave(row, done, loading) {
|
||||||
const payload = this.normalizeSubmitRow(row, false);
|
const payload = this.normalizeSubmitRow(row, false);
|
||||||
if (!payload.deptId) {
|
|
||||||
this.$message.warning('请选择所属组织');
|
|
||||||
loading();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
|
if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
|
||||||
this.$message.warning('请选择自定义数据权限组织');
|
this.$message.warning('请选择自定义数据权限组织');
|
||||||
loading();
|
loading();
|
||||||
@@ -336,11 +331,6 @@ export default {
|
|||||||
},
|
},
|
||||||
rowUpdate(row, index, done, loading) {
|
rowUpdate(row, index, done, loading) {
|
||||||
const payload = this.normalizeSubmitRow(row, true);
|
const payload = this.normalizeSubmitRow(row, true);
|
||||||
if (!payload.deptId) {
|
|
||||||
this.$message.warning('请选择所属组织');
|
|
||||||
loading();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
|
if (payload.dataScopeRange === 3 && (!payload.dataScopeDeptIds || !payload.dataScopeDeptIds.length)) {
|
||||||
this.$message.warning('请选择自定义数据权限组织');
|
this.$message.warning('请选择自定义数据权限组织');
|
||||||
loading();
|
loading();
|
||||||
|
|||||||
@@ -861,7 +861,7 @@ export default {
|
|||||||
emergencyContactMobile: [
|
emergencyContactMobile: [
|
||||||
{ required: true, message: '请输入紧急联系人手机号', trigger: 'blur' },
|
{ required: true, message: '请输入紧急联系人手机号', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
|
// 后端已允许所属组织为空,这里不做必填校验
|
||||||
idCardFront: [{ required: true, message: '请上传身份证正面照', trigger: 'change' }],
|
idCardFront: [{ required: true, message: '请上传身份证正面照', trigger: 'change' }],
|
||||||
idCardBack: [{ required: true, message: '请上传身份证反面照', trigger: 'change' }],
|
idCardBack: [{ required: true, message: '请上传身份证反面照', trigger: 'change' }],
|
||||||
drivingLicenseFront: [{ required: true, message: '请上传驾驶证主页', trigger: 'change' }],
|
drivingLicenseFront: [{ required: true, message: '请上传驾驶证主页', trigger: 'change' }],
|
||||||
|
|||||||
@@ -663,7 +663,7 @@ export default {
|
|||||||
businessRelationOptions: ['自有', '管理挂靠', '业务合作'],
|
businessRelationOptions: ['自有', '管理挂靠', '业务合作'],
|
||||||
energyTypeOptions: ['柴油', '汽油', '新能源', '天然气'],
|
energyTypeOptions: ['柴油', '汽油', '新能源', '天然气'],
|
||||||
baseRules: {
|
baseRules: {
|
||||||
organizationName: [{ required: true, message: '请选择所属组织', trigger: 'change' }],
|
// 后端已允许所属组织为空,这里不做必填校验
|
||||||
useDepartment: [{ required: true, message: '请选择使用部门', trigger: 'change' }],
|
useDepartment: [{ required: true, message: '请选择使用部门', trigger: 'change' }],
|
||||||
plateNo: [
|
plateNo: [
|
||||||
{ required: true, message: '请输入车牌号', trigger: 'change' },
|
{ required: true, message: '请输入车牌号', trigger: 'change' },
|
||||||
|
|||||||
Reference in New Issue
Block a user