diff --git a/src/app.jsx b/src/app.jsx index 0bfee34..c4ada07 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -72,30 +72,30 @@ export async function getInitialState() { } ], }, - { - code: 'integral', - name: '积分管理', - icon: 'BankFilled', - path: '/integral', - routes: [ - { - code: 'integralConfigure', - name: '积分规则', - icon: 'smile', - path: '/integral/integralConfigure', - component: './integral/integralConfigure', - access: 'k12', - }, - { - name: '规则分发', - icon: 'smile', - path: '/integral/integralDistribute', - component: './integral/integralDistribute', - access: 'k12', - }, - ] + // { + // code: 'integral', + // name: '积分管理', + // icon: 'BankFilled', + // path: '/integral', + // routes: [ + // { + // code: 'integralConfigure', + // name: '积分规则', + // icon: 'smile', + // path: '/integral/integralConfigure', + // component: './integral/integralConfigure', + // access: 'k12', + // }, + // { + // name: '规则分发', + // icon: 'smile', + // path: '/integral/integralDistribute', + // component: './integral/integralDistribute', + // access: 'k12', + // }, + // ] - }, + // }, { code: 'foodMenu', name: '菜谱管理', @@ -271,14 +271,6 @@ export async function getInitialState() { component: './goods/newgoods', access: 'k10', }, - { - code: 'goods-taste', - name: '商品口味', - icon: 'smile', - path: '/goods/goods-taste', - component: './goods/goods-taste', - access: 'k11', - }, { code: 'goods-type', name: '商品小类', @@ -304,6 +296,7 @@ export async function getInitialState() { access: 'k11', }, { + code: 'goodsPractice', name: '做法关联设置', icon: 'smile', path: '/goods/goodsPractice', @@ -311,6 +304,7 @@ export async function getInitialState() { access: 'k9', }, { + code: 'goodsPracticeType', name: '商品做法类别', icon: 'smile', path: '/goods/goodsPracticeType', @@ -318,6 +312,7 @@ export async function getInitialState() { access: 'k9', }, { + code: 'goodsPracticeInfo', name: '商品做法基础信息', icon: 'smile', path: '/goods/goodsPracticeInfo', @@ -619,11 +614,11 @@ export async function getInitialState() { const currentUser = await fetchUserInfo(); var tempMenu = await queryMenuData(); //创建菜单 - // await syncMenus(tempMenu); - // if (!isDev) { - // var data = await dymicMenus(currentUser.data.id); - // tempMenu = data.data; - // } + //await syncMenus(tempMenu); + if (!isDev) { + var data = await dymicMenus(currentUser.data.id); + tempMenu = data.data; + } return { fetchUserInfo, diff --git a/src/pages/goods/goodsInfo/index.jsx b/src/pages/goods/goodsInfo/index.jsx index 5423faa..3075c74 100644 --- a/src/pages/goods/goodsInfo/index.jsx +++ b/src/pages/goods/goodsInfo/index.jsx @@ -257,21 +257,6 @@ const Advanced = (props) => { } - - - { setGoodsBigTypes(arr); }); } - function initGoodsTaste() { - getgoodsTaste().then((r) => { - var arr = r.data; - arr.forEach((element) => { - element.text = element.tasteClassName; - }); - - setGoodsTaste(arr); - }); - } initGoodsType(); initGoodsBigType(); - initGoodsTaste(); }, []); return ( diff --git a/src/pages/sys/company/components/CreateForm.jsx b/src/pages/sys/company/components/CreateForm.jsx index 089bb18..1dfcb3d 100644 --- a/src/pages/sys/company/components/CreateForm.jsx +++ b/src/pages/sys/company/components/CreateForm.jsx @@ -31,6 +31,7 @@ const CreateForm = (props) => { + @@ -45,6 +46,9 @@ message: '手机号格式不正确' }]}> + + + diff --git a/src/pages/sys/company/components/MenuForm.jsx b/src/pages/sys/company/components/MenuForm.jsx index 5fe6b78..b23ab4a 100644 --- a/src/pages/sys/company/components/MenuForm.jsx +++ b/src/pages/sys/company/components/MenuForm.jsx @@ -6,7 +6,13 @@ import Enumerable from 'linq'; const MenuForm = (props) => { const [load, setLoad] = useState(); const [selectedRowsState, setSelectedRows] = useState(); + const [checkedKeys, setCheckedKeys] = useState(); useEffect(async () => { + var arr = []; + Enumerable.from(props.values).forEach(t => { + arr.push(t.id); + }); + setCheckedKeys(arr) var ret = await api.GetMenu('ALL'); var data = Enumerable.from(ret.data).toArray(); setLoad(data); @@ -15,7 +21,7 @@ const MenuForm = (props) => { const lbl = () => { var arr = []; Enumerable.from(props.values).forEach(t => { - arr.push({t}); + arr.push({t.name}); }); return arr; } @@ -25,20 +31,21 @@ const MenuForm = (props) => { destroyOnClose title={'菜单分配'} visible={props.modalVisible} - onOk={() => props.onSubmit(selectedRowsState)} + onOk={() => props.onSubmit(checkedKeys)} onCancel={() => props.onCancel()} maskClosable={false}> { setSelectedRows(keys) }} + onCheck={(keys, e) => { setCheckedKeys(keys) }} defaultExpandAll={true} + checkedKeys={checkedKeys} checkable />
已选菜单
{props.values == undefined ? '' : ( - lbl() + lbl() )} @@ -47,4 +54,4 @@ const MenuForm = (props) => { return html }; -export default MenuForm; \ No newline at end of file +export default MenuForm; diff --git a/src/pages/sys/company/index.jsx b/src/pages/sys/company/index.jsx index 9471a0f..8f43dd0 100644 --- a/src/pages/sys/company/index.jsx +++ b/src/pages/sys/company/index.jsx @@ -159,6 +159,12 @@ const companyManage = () => { title: '电话', dataIndex: 'phone', }, + { + title: '小程序id', + dataIndex: 'wechatAppId', + hideInSearch:true, + }, + { title: '备注', dataIndex: 'remark', @@ -203,7 +209,7 @@ const companyManage = () => { { api.GetRoleMenu(record.sysRoleId).then((r) => { - setRow(r.data.data); + setRow(r.data); handleUpdateMenuModalVisible(true); }); setStepFormValues(record); diff --git a/src/pages/sys/roles/components/MenuForm.jsx b/src/pages/sys/roles/components/MenuForm.jsx index e5311a3..466ddca 100644 --- a/src/pages/sys/roles/components/MenuForm.jsx +++ b/src/pages/sys/roles/components/MenuForm.jsx @@ -6,7 +6,13 @@ import Enumerable from 'linq'; const MenuForm = (props) => { const [load, setLoad] = useState(); const [selectedRowsState, setSelectedRows] = useState(); + const [checkedKeys, setCheckedKeys] = useState(); useEffect(async () => { + var arr = []; + Enumerable.from(props.values).forEach(t => { + arr.push(t.id); + }); + setCheckedKeys(arr) var ret = await api.SelectTree(); var data = Enumerable.from(ret.data).toArray(); setLoad(data); @@ -15,7 +21,7 @@ const MenuForm = (props) => { const lbl = () => { var arr = []; Enumerable.from(props.values).forEach(t => { - arr.push({t}); + arr.push({t.name}); }); return arr; } @@ -25,15 +31,16 @@ const MenuForm = (props) => { destroyOnClose title={'菜单分配'} visible={props.modalVisible} - onOk={() => props.onSubmit(selectedRowsState)} + onOk={() => props.onSubmit(checkedKeys)} onCancel={() => props.onCancel()} maskClosable={false}> { setSelectedRows(keys) }} - defaultExpandAll={true} - checkable /> + onCheck={(keys, e) => { setCheckedKeys(keys) }} + defaultExpandAll={true} + checkedKeys={checkedKeys} + checkable />
@@ -47,4 +54,4 @@ const MenuForm = (props) => { return html }; -export default MenuForm; \ No newline at end of file +export default MenuForm; diff --git a/src/pages/sys/roles/index.jsx b/src/pages/sys/roles/index.jsx index 8968814..f7d6282 100644 --- a/src/pages/sys/roles/index.jsx +++ b/src/pages/sys/roles/index.jsx @@ -167,7 +167,7 @@ const roleManager = () => { style={{ pointerEvents: record.code =='sys_manager_role' ? 'none' : 'auto' }} onClick={() => { GetRoleMenu(record.id).then(r => { - setRow( r.data.data ); + setRow(r.data); handleUpdateMenuModalVisible(true); }) setStepFormValues(record);