Skip to content

J
jinfa-platform
Commit 74899f33 authored by 前端-甘科's avatar 前端-甘科
Browse files
Options

Merge branch 'jinfa-0618' into 'jinfa-0618'

Jinfa 0618 See merge request project/jinfa-platform!151
parents d9e4e20e 880140bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 212 deletions
src/pages/commodity/material/materialPendingAdd/schema/roles.ts
View file @ 74899f33
......@@ -766,61 +766,115 @@ export function getContactPerson() {
const roleType = getAuth().memberRoleType
map.set(RoleEnum.Purchaser, {
chargeUserId: {
title: intl.formatMessage({ id: 'material.sourceList.column.123456789', defaultMessage: '负责人' }),
type: "string",
enum: [],
'x-rules': [
{
required: true, message: '请选择负责人'
chargeName: {
title: intl.formatMessage({ id: 'material.chargeName', defaultMessage: '负责人' }),
type: 'string',
'x-component-props': {
addonAfter:"{{Requisitioner}}",
showSearch: true,
},
]
// display: false,
},
chargeName: {
title: intl.formatMessage({ id: 'material.sourceList.column.123456789', defaultMessage: '负责人' }),
type: "string",
enum: [],
display: false,
},
chargeAccount: {
title: intl.formatMessage({ id: 'material.sourceList.column.chargeAccount', defaultMessage: '负责人账号' }),
type: "string",
enum: [],
display: false,
},
chargeRoleName: {
title: intl.formatMessage({ id: 'material.sourceList.column.chargeRoleName', defaultMessage: '负责人所属角色' }),
type: "string",
enum: [],
display: false,
},
// 占位
occupy: {
title: '',
type: "object",
},
contactMemberName: {
title: intl.formatMessage({ id: 'material.123456789', defaultMessage: '联系人' }),
type: 'string',
'x-rules': [
{ required: true, message: '联系人不能为空' },
{ limitByte: true, maxByte: 40, }
]
},
// 占位
occupy2: {
title: '',
type: "object",
},
contactMemberPhone: {
title: intl.formatMessage({ id: 'material.123456789', defaultMessage: '联系人电话' }),
type: 'string',
'x-rules': [
{ required: true, message: '联系人电话不能为空' },
{ limitByte: true, maxByte: 40, }
]
},
'x-rules':[
{
required: true,
message: intl.formatMessage({ id: 'material.chargeName.required', defaultMessage: '请输入' })
}]
},
chargeUserId: {
title: intl.formatMessage({ id: 'material.chargeUserId', defaultMessage: '负责人用户id' }),
type: "string",
display: false,
},
chargeAccount: {
title: intl.formatMessage({ id: 'material.chargeAccount', defaultMessage: '负责人账号' }),
type: "string",
display: false,
},
chargeRoleName: {
title: intl.formatMessage({ id: 'material.chargeRoleName', defaultMessage: '负责人所属角色' }),
type: "string",
display: false,
},
// 占位
occupy: {
title: '',
type: "object",
},
contactMemberName: {
title: intl.formatMessage({ id: 'material.contactMemberName', defaultMessage: '联系人' }),
type: 'string',
'x-rules': [
{ required: true, message: '联系人不能为空' },
{ limitByte: true, maxByte: 40, }
]
},
// 占位
occupy2: {
title: '',
type: "object",
},
contactMemberPhone: {
title: intl.formatMessage({ id: 'material.contactMemberPhone', defaultMessage: '联系人电话' }),
type: 'string',
'x-rules': [
{ required: true, message: '联系电话不能为空' },
{ limitByte: true, maxByte: 40, }
]
},
// chargeUserId: {
// title: intl.formatMessage({ id: 'material.sourceList.column.123456789', defaultMessage: '负责人' }),
// type: "string",
// enum: [],
// 'x-rules': [
// {
// required: true, message: '请选择负责人'
// },
// ]
// // display: false,
// },
// chargeName: {
// title: intl.formatMessage({ id: 'material.sourceList.column.123456789', defaultMessage: '负责人' }),
// type: "string",
// enum: [],
// display: false,
// },
// chargeAccount: {
// title: intl.formatMessage({ id: 'material.sourceList.column.chargeAccount', defaultMessage: '负责人账号' }),
// type: "string",
// enum: [],
// display: false,
// },
// chargeRoleName: {
// title: intl.formatMessage({ id: 'material.sourceList.column.chargeRoleName', defaultMessage: '负责人所属角色' }),
// type: "string",
// enum: [],
// display: false,
// },
// // 占位
// // occupy: {
// // title: '',
// // type: "object",
// // },
// contactMemberName: {
// title: intl.formatMessage({ id: 'material.123456789', defaultMessage: '联系人' }),
// type: 'string',
// 'x-rules': [
// { required: true, message: '联系人不能为空' },
// { limitByte: true, maxByte: 40, }
// ]
// },
// // 占位
// // occupy2: {
// // title: '',
// // type: "object",
// // },
// contactMemberPhone: {
// title: intl.formatMessage({ id: 'material.123456789', defaultMessage: '联系人电话' }),
// type: 'string',
// 'x-rules': [
// { required: true, message: '联系人电话不能为空' },
// { limitByte: true, maxByte: 40, }
// ]
// },
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment