#

luxiaotao1123

2024-02-28 b19394294d6c10b72f52fcb88b7b4200708a2613

#

 zy-asrs-flow/src/locales/en-US.ts

@@ -19,6 +19,14 @@
  'page.export':'Export',
  'page.selected':' has been selected',
  'page.delete.batch':'Batch Delete',
  'page.assigning':'Assigning',
  'page.assign.success':'Assignment Successful',
  'page.assign.fail':'Assignment failed, please try again!',
  'page.assign.permission':'Assign',
  'page.permission.menu':'Menu',
  'page.role.assign.ec':'Expand/Collapse',
  'page.role.assign.sd':'Select All/Deselect All',
  '':'',
  '':'',
  '':'',
  'personal.base.setting':'Basic Settings',

 zy-asrs-flow/src/pages/system/dept/components/edit.jsx

@@ -72,7 +72,6 @@
                                return props.treeData;
                            }}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, message: "上级部门不能为空" }]}
                            fieldProps={{
                                treeDefaultExpandedKeys: [0]
@@ -82,7 +81,6 @@
                            name="name"
                            label="部门名称"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "部门名称不能为空！" }]}
                        />
                    </ProForm.Group>
@@ -91,14 +89,12 @@
                            name="leader"
                            label="负责人"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                        <ProFormDigit
                            name="sort"
                            label="排序"
                            colProps={{ md: 12, xl: 12 }}
                            fieldProps={{ precision: 0 }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>
                    <ProForm.Group>
@@ -106,7 +102,6 @@
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },
@@ -116,7 +111,6 @@
                            name="memo"
                            label=" 备注"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>


 zy-asrs-flow/src/pages/system/menu/components/edit.jsx

@@ -78,7 +78,6 @@
                                return props.treeData;
                            }}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            rules={[{ required: true, message: "上级菜单不能为空" }]}
                            fieldProps={{
                                treeDefaultExpandedKeys: [0]
@@ -88,7 +87,6 @@
                            name="name"
                            label="菜单名称"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "菜单名称不能为空！" }]}
                        />
                    </ProForm.Group>
@@ -97,13 +95,11 @@
                            name="route"
                            label="路由地址"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                        <ProFormText
                            name="component"
                            label="页面组件"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>
                    <ProForm.Group>
@@ -111,7 +107,6 @@
                            name="type"
                            label="类型"
                            colProps={{ md: 10, xl: 610 }}
                            placeholder="请选择"
                            options={[
                                { label: '菜单', value: 0 },
                                { label: '按钮', value: 1 },
@@ -128,14 +123,12 @@
                            label="权限标识"
                            hidden={menuType !== 1}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                        <ProFormSelect
                            name="icon"
                            label="菜单图标"
                            hidden={menuType !== 0}
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            valueEnum={{}}
                            addonBefore={createIcon(menuIconName)}
                            fieldProps={{
@@ -151,13 +144,11 @@
                            label="排序"
                            colProps={{ md: 12, xl: 12 }}
                            fieldProps={{ precision: 0 }}
                            placeholder="请输入"
                        />
                        <ProFormSelect
                            name="status"
                            label="状态"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请选择"
                            options={[
                                { label: '正常', value: 1 },
                                { label: '禁用', value: 0 },

 zy-asrs-flow/src/pages/system/role/components/edit.jsx

@@ -38,7 +38,11 @@
    return (
        <>
            <Modal
                title="Edit"
                title={
                    Object.keys(props.values).length > 0
                        ? intl.formatMessage({ id: 'page.edit', defaultMessage: '编辑' })
                        : intl.formatMessage({ id: 'page.add', defaultMessage: '添加' })
                }
                width={640}
                forceRender
                destroyOnClose
@@ -63,14 +67,12 @@
                            name="name"
                            label="角色名称"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "请输入角色名称！" }]}
                        />
                        <ProFormText
                            name="code"
                            label="角色标识"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                            rules={[{ required: true, message: "请输入角色标识！" }]}
                        />
                    </ProForm.Group>
@@ -89,7 +91,6 @@
                            name="memo"
                            label="备注"
                            colProps={{ md: 12, xl: 12 }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>
                </ProForm>

 zy-asrs-flow/src/pages/system/role/components/scope.jsx

@@ -60,7 +60,7 @@
    return (
        <>
            <Drawer
                title={`分配权限 - ${name ? name : '-'}`}
                title={`${intl.formatMessage({ id: 'page.assign.permission', defaultMessage: '分配权限' })} - ${name ? name : '-'}`}
                width={640}
                forceRender
                destroyOnClose
@@ -96,15 +96,15 @@

                        <ProForm.Item
                            name="deptIds"
                            label="权限菜单"
                            label={intl.formatMessage({ id: 'page.permission.menu', defaultMessage: '权限菜单' })}
                            colProps={{ md: 24, xl: 24 }}
                        >
                            <Row gutter={[16, 16]}>
                                <Col md={24}>
                                    <Checkbox.Group
                                        options={[
                                            { label: '展开/折叠', value: 'expandAll' },
                                            { label: '全选/全不选', value: 'checkAll' },
                                            { label: intl.formatMessage({ id: 'page.role.assign.ec', defaultMessage: '展开/折叠' }), value: 'expandAll' },
                                            { label: intl.formatMessage({ id: 'page.role.assign.sd', defaultMessage: '全选/全不选' }), value: 'checkAll' },
                                        ]}
                                        defaultValue={['expandAll']}
                                        onChange={(values) => {

 zy-asrs-flow/src/pages/system/role/index.jsx

@@ -19,18 +19,18 @@
const TABLE_KEY = "pro-table-role";

const handleSave = async (val, intl) => {
    const hide = message.loading('正在添加');
    const hide = message.loading(intl.formatMessage({ id: 'page.adding', defaultMessage: '正在添加' }));
    try {
        const resp = await Http.doPost('api/role/save', val);
        if (resp.code === 200) {
            message.success('添加成功');
            message.success(intl.formatMessage({ id: 'page.add.success', defaultMessage: '添加成功' }));
            return true;
        } else {
            message.error(resp.msg);
            return false;
        }
    } catch (error) {
        message.error('添加失败请重试！');
        message.error(intl.formatMessage({ id: 'page.add.fail', defaultMessage: '添加失败请重试！' }));
        return false;
    } finally {
        hide();
@@ -38,18 +38,18 @@
};

const handleUpdate = async (val, intl) => {
    const hide = message.loading('正在更新');
    const hide = message.loading(intl.formatMessage({ id: 'page.updating', defaultMessage: '正在更新' }));
    try {
        const resp = await Http.doPost('api/role/update', val);
        if (resp.code === 200) {
            message.success('更新成功');
            message.success(intl.formatMessage({ id: 'page.update.success', defaultMessage: '更新成功' }));
            return true;
        } else {
            message.error(resp.msg);
            return false;
        }
    } catch (error) {
        message.error('配置失败请重试！');
        message.error(intl.formatMessage({ id: 'page.update.fail', defaultMessage: '更新失败请重试！' }));
        return false;
    } finally {
        hide();
@@ -58,18 +58,18 @@

const handleRemove = async (rows, intl) => {
    if (!rows) return true;
    const hide = message.loading('正在删除');
    const hide = message.loading(intl.formatMessage({ id: 'page.deleting', defaultMessage: '正在删除' }));
    try {
        const resp = await Http.doPost('api/role/remove/' + rows.map((row) => row.id).join(','));
        if (resp.code === 200) {
            message.success('删除成功');
            message.success(intl.formatMessage({ id: 'page.delete.success', defaultMessage: '删除成功' }));
            return true;
        } else {
            message.error(resp.msg);
            return false;
        }
    } catch (error) {
        message.error('删除失败，请重试');
        message.error(intl.formatMessage({ id: 'page.delete.fail', defaultMessage: '删除失败，请重试！' }));
        return false;
    } finally {
        hide();
@@ -77,15 +77,15 @@
};

const handleExport = async (intl) => {
    const hide = message.loading('正在导出');
    const hide = message.loading(intl.formatMessage({ id: 'page.exporting', defaultMessage: '正在导出' }));
    try {
        const resp = await Http.doPostBlob('api/role/export');
        const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
        window.location.href = window.URL.createObjectURL(blob);
        message.success('导出成功');
        message.success(intl.formatMessage({ id: 'page.export.success', defaultMessage: '导出成功' }));
        return true;
    } catch (error) {
        message.error('导出失败，请重试');
        message.error(intl.formatMessage({ id: 'page.export.fail', defaultMessage: '导出失败，请重试' }));
        return false;
    } finally {
        hide();
@@ -93,18 +93,18 @@
};

const handleScope = async (val) => {
    const hide = message.loading('正在分配');
    const hide = message.loading(intl.formatMessage({ id: 'page.assigning', defaultMessage: '正在分配' }));
    try {
        const resp = await Http.doPost('api/role/scope/update', val);
        if (resp.code === 200) {
            message.success('分配成功');
            message.success(intl.formatMessage({ id: 'page.assign.success', defaultMessage: '分配成功' }));
            return true;
        } else {
            message.error(resp.msg);
            return false;
        }
    } catch (error) {
        message.error('分配失败请重试！');
        message.error(intl.formatMessage({ id: 'page.assign.fail', defaultMessage: '分配失败请重试！' }));
        return false;
    } finally {
        hide();
@@ -129,7 +129,10 @@

    const columns = [
        {
            title: 'No',
            title: intl.formatMessage({
                id: 'page.table.no',
                defaultMessage: 'No'
            }),
            dataIndex: 'index',
            valueType: 'indexBorder',
            width: 60,
@@ -229,7 +232,7 @@
                        setCurrentRow(record);
                    }}
                >
                    编辑
                    <FormattedMessage id='page.edit' defaultMessage='编辑' />
                </Button>,
                <Button
                    type="link"
@@ -244,7 +247,7 @@
                        });
                    }}
                >
                    分配权限
                    <FormattedMessage id='page.assign.permission' defaultMessage='分配权限' />
                </Button>,
                <Button
                    type="link"
@@ -252,8 +255,8 @@
                    key="batchRemove"
                    onClick={async () => {
                        Modal.confirm({
                            title: '删除',
                            content: '确定删除该项吗？',
                            title: intl.formatMessage({ id: 'page.delete', defaultMessage: '删除' }),
                            content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '确定删除该项吗？' }),
                            onOk: async () => {
                                const success = await handleRemove([record], intl);
                                if (success) {
@@ -265,7 +268,7 @@
                        });
                    }}
                >
                    删除
                    <FormattedMessage id='page.delete' defaultMessage='删除' />
                </Button>,
            ],
        },
@@ -316,7 +319,7 @@
                                }}
                            >
                                <PlusOutlined />
                                添加
                                <FormattedMessage id='page.add' defaultMessage='添加' />
                            </Button>,
                            <Button
                                key="export"
@@ -325,7 +328,7 @@
                                }}
                            >
                                <ExportOutlined />
                                导出
                                <FormattedMessage id='page.export' defaultMessage='导出' />
                            </Button>,
                        ],
                    }}
@@ -360,9 +363,8 @@
                <FooterToolbar
                    extra={
                        <div>
                            已选择
                            <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
                            项
                            <FormattedMessage id='page.selected' defaultMessage=' 项已选择' />
                        </div>
                    }
                >
@@ -371,8 +373,8 @@
                        danger
                        onClick={async () => {
                            Modal.confirm({
                                title: '删除',
                                content: '确定删除该项吗？',
                                title: intl.formatMessage({ id: 'page.delete', defaultMessage: '删除' }),
                                content: intl.formatMessage({ id: 'page.delete.confirm', defaultMessage: '确定删除该项吗？' }),
                                onOk: async () => {
                                    const success = await handleRemove(selectedRows, intl);
                                    if (success) {
@@ -383,7 +385,7 @@
                            });
                        }}
                    >
                        批量删除
                        <FormattedMessage id='page.delete.batch' defaultMessage='批量删除' />
                    </Button>
                </FooterToolbar>
            )}