#

luxiaotao1123

2024-02-22 375fe2e4859a3948b00a52df829ba7972b1a72a0

#

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

@@ -328,7 +328,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="dept"

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

@@ -219,7 +219,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="host"

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

@@ -431,7 +431,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="menu"

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

@@ -83,26 +83,13 @@
                            ]}
                            rules={[{ required: true, message: "请选择状态！" }]}
                        />
                        <ProFormDateTimePicker
                            name="updateTime"
                            label="修改时间"
                         <ProFormText
                            name="memo"
                            label="备注"
                            colProps={{ md: 12, xl: 12 }}
                            transform={(value) => {
                                return moment(value).toISOString();
                            }}
                            placeholder="请输入"
                        />
                    </ProForm.Group>
                    <ProFormSelect
                        name="hostId"
                        label="机构"
                        colProps={{ md: 12, xl: 12 }}
                        showSearch
                        debounceTime={300}
                        request={async ({ keyWords }) => {
                            const resp = await Http.doPostForm('api/host/query', { condition: keyWords });
                            return resp.data;
                        }}
                    />
                </ProForm>
            </Modal>
        </>

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

@@ -1,6 +1,6 @@

import React, { useState, useRef, useEffect } from 'react';
import { Button, message, Modal } from 'antd';
import { Button, message, Modal, Tag } from 'antd';
import {
    FooterToolbar,
    PageContainer,
@@ -11,6 +11,7 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { statusMap } from '@/utils/enum-util'

const handleSave = async (val) => {
    const hide = message.loading('正在添加');
@@ -104,13 +105,12 @@
            title: 'No',
            dataIndex: 'index',
            valueType: 'indexBorder',
            width: 48,
            width: 60,
        },
        {
            title: '姓名',
            dataIndex: 'name',
            valueType: 'text',
            copyable: true,
            filterDropdown: (props) => <TextFilter
                name='name'
                {...props}
@@ -122,6 +122,7 @@
            title: '标识',
            dataIndex: 'code',
            valueType: 'text',
            copyable: true,
            filterDropdown: (props) => <TextFilter
                name='code'
                {...props}
@@ -130,12 +131,12 @@
            />,
        },
        {
            title: '机构',
            dataIndex: 'hostId$',
            title: '修改时间',
            dataIndex: 'updateTime$',
            valueType: 'text',
            filterDropdown: (props) => <LinkFilter
                name='hostId'
                major='host'
            width: 300,
            filterDropdown: (props) => <DatetimeRangeFilter
                name='updateTime'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
@@ -145,6 +146,7 @@
            title: '状态',
            dataIndex: 'status$',
            valueType: 'text',
            width: 160,
            filterDropdown: (props) => <SelectFilter
                name='status'
                {...props}
@@ -155,13 +157,18 @@
                    { label: '禁用', value: 0 },
                ]}
            />,
            render: (_, record) => {
                const status = statusMap[record.status]
                return <Tag color={status.color}>{status.text}</Tag>
            },
        },
        {
            title: '修改时间',
            dataIndex: 'updateTime$',
            title: '备注',
            dataIndex: 'memo',
            valueType: 'text',
            filterDropdown: (props) => <DatetimeRangeFilter
                name='updateTime'
            hidden: false,
            filterDropdown: (props) => <TextFilter
                name='memo'
                {...props}
                actionRef={actionRef}
                setSearchParam={setSearchParam}
@@ -209,7 +216,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="role"

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

@@ -242,7 +242,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="userLogin"

 zy-asrs-framework/src/main/resources/templates/react/Index.txt

@@ -11,6 +11,7 @@
import Http from '@/utils/http';
import Edit from './components/edit'
import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
import { statusMap } from '@/utils/enum-util'

const handleSave = async (val) => {
    const hide = message.loading('正在添加');
@@ -149,7 +150,11 @@
    ];

    return (
        <PageContainer>
        <PageContainer
            header={{
                breadcrumb: {},
            }}
        >
            <div style={{ width: '100%', float: 'right' }}>
                <ProTable
                    key="@{SIMPLEENTITYNAME}"