diff --git a/src/pages/company/account/components/CreateForm.jsx b/src/pages/company/account/components/CreateForm.jsx index f3c28d3..fab4c96 100644 --- a/src/pages/company/account/components/CreateForm.jsx +++ b/src/pages/company/account/components/CreateForm.jsx @@ -37,6 +37,22 @@ const CreateForm = (props) => { message: '邮箱格式不正确', }]}> + + diff --git a/src/pages/company/account/components/MenuForm.jsx b/src/pages/company/account/components/MenuForm.jsx index db35e9e..cd21632 100644 --- a/src/pages/company/account/components/MenuForm.jsx +++ b/src/pages/company/account/components/MenuForm.jsx @@ -16,7 +16,9 @@ const MenuForm = (props) => { }); setCheckedKeys(arr) - var ret = await api.GetMenu('ALL'); + console.log("props.values",props.datas) + var parm={getType:'ALL',type:props.datas.type} + var ret = await api.GetMenu(parm); var data = Enumerable.from(ret.data).toArray(); setLoad(data); }, [props.modalVisible]) diff --git a/src/pages/company/account/index.jsx b/src/pages/company/account/index.jsx index 7c3220c..0ce10ce 100644 --- a/src/pages/company/account/index.jsx +++ b/src/pages/company/account/index.jsx @@ -120,7 +120,8 @@ const companyManage = () => { const [row, setRow] = useState(); useEffect(() => { - api.GetMenu().then((r) => { + var parm={getType:'ALL',type:0} + api.GetMenu(parm).then((r) => { if(r.data){ setTreeData(r.data.data); } @@ -164,7 +165,23 @@ const companyManage = () => { dataIndex: 'email', ellipsis: true, }, - + { + title: '所属平台', + dataIndex: 'type', + valueType: 'select', + ellipsis:true, + valueEnum: { + 0: { + text: '团餐', + }, + 1: { + text: '门店', + }, + 2: { + text: '后厨', + }, + }, + }, { title: '电话', dataIndex: 'phone', @@ -423,6 +440,7 @@ const companyManage = () => { }} modalVisible={updateMenuModalVisible} values={row || {}} + datas={stepFormValues || {}} /> ) : null} { - {RadioKey != 0 && props.values.type != 0 ? ( - '' - ) : ( - - + + +