Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

落日与鲸

2025-02-25 3e40a02e2d8aeb0e822849bb63b70f7e3cadf154

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

 H5/pages/list/list.vue

@@ -54,7 +54,7 @@
                        {{ statusObj[item.status] }}

                    </view>

                </view>

                <view v-if="['5','6'].includes(item.status)" class="mt-40 fs-23 pl-40 pr-40">

                <view v-if="[5,6].includes(item.status)" class="mt-40 fs-23 pl-40 pr-40">

                    <view class="flex j-between a-center">

                        <view class="color4">

                            上报人：<text class="color5">{{ item.reporter || '' }}</text>

@@ -123,7 +123,7 @@
                    <view class="txt-center fs-23 mt-27 color6">

                        创建时间：{{ item.createTime | formatTime }}

                    </view>

                    <view v-if="!(['3','5','7'].includes(item.status))" class="flex a-center j-center fs-23 mt-29 txt-center">

                    <view v-if="!([3,5,7].includes(item.status))" class="flex a-center j-center fs-23 mt-29 txt-center">

                        <view @click.stop="addProgress(item.id)" class="h-58 lh-58 bgColor5 w-192 br-29 color10">

                            添加办理进度

                        </view>


 management/src/pages/setting/user/components/addAndEdit.jsx

@@ -243,12 +243,11 @@
                        </Form.Item>
                    </Col>
                    <Col span={16}>
                        {/* <div style={{ display: "flex",flex:1 }}> */}
                        <Form.Item
                            label="是否管理员"
                            labelCol={{ span: 4 }}
                            wrapperCol={{ span: 20 }}
                            style={{marginBottom:0}}
                            style={{ marginBottom: 0 }}
                        >
                            <div style={{ display: "flex", flex: 1 }}>
                                <Form.Item
@@ -258,7 +257,7 @@
                                    <Select
                                        key="searchSelect"
                                        allowClear
                                        style={{width:'280px'}}
                                        style={{ width: '280px' }}
                                        placeholder="请选择"
                                        dataSource={levelList}
                                        fieldNames={{ label: 'name', value: 'id' }}
@@ -266,14 +265,9 @@
                                    >
                                    </Select >
                                </Form.Item>
                                <div style={{fontSize:'12px',Color:"rgba(0,0,0,0.5)"}}>管理员主要用于接收实现临期提醒，以及上级端登录</div>
                                <div style={{ fontSize: '12px', Color: "rgba(0,0,0,0.5)" }}>管理员主要用于接收实现临期提醒，以及上级端登录</div>
                            </div>


                        </Form.Item>

                        {/* <div>管理员主要用于接收实现临期提醒，以及上级端登录</div>
                        </div> */}
                    </Col>
                </Row>
                <Row>
@@ -331,18 +325,51 @@
                </Row>
                <Row>
                    <Col span={16}>
                        <div style={{ display: 'flex' }}>

                        </div>
                        <Form.Item
                            label="联系方式"
                            labelCol={{ span: 4 }}
                            wrapperCol={{ span: 20 }}
                            style={{ marginBottom: 0 }}
                        >
                            <div style={{ display: "flex", flex: 1 }}>
                                <Form.Item
                                    name="name"
                                    rules={[{ required: true, message: '请输入联系方式' }]}
                                >
                                    <Input disabled={detailType} placeholder='请输入联系方式' />
                                </Form.Item>
                                <div style={{ fontSize: '12px', Color: "rgba(0,0,0,0.5)" }}>联系方式将作为登录账号使用</div>
                            </div>
                        </Form.Item>
                    </Col>

                </Row>
                <Row>
                    <Col span={8}>
                        <Form.Item
                            name="name"
                             label="登录密码"
                            rules={[{ required: true, message: '请输入登录密码' }]}
                        >
                            <Input disabled={detailType} placeholder='请输入' />
                        </Form.Item>
                    </Col>
                    <Col span={8}>
                    </Col>
                    <Col span={8}>
                    <Col span={16}>
                        <Form.Item
                            label="确认密码"
                            labelCol={{ span: 4 }}
                            wrapperCol={{ span: 20 }}
                            style={{ marginBottom: 0 }}
                        >
                            <div style={{ display: "flex", flex: 1 }}>
                                <Form.Item
                                    name="name"
                                    rules={[{ required: true, message: '请输入确认密码' }]}
                                >
                                    <Input disabled={detailType} placeholder='请输入' />
                                </Form.Item>
                                <div style={{ fontSize: '12px', Color: "rgba(0,0,0,0.5)" }}>联系方式将作为登录账号使用</div>
                            </div>
                        </Form.Item>
                    </Col>
                </Row>


 management/src/pages/setting/user/index.jsx

@@ -1,22 +1,57 @@
import { buildProTableDataSource, sendRequest, showDelConfirm } from '@/utils/antdUtils';
import { DeleteOutlined, EditOutlined, PlusOutlined } from '@ant-design/icons';
import { PageContainer, ProFormText, ProTable, QueryFilter } from '@ant-design/pro-components';
import { Button, Col, Row, Menu ,Space } from 'antd';
import { useRef, useState } from 'react';
import { Button, Col, Menu, Row, Space } from 'antd';
import { useEffect, useRef, useState } from 'react';
import { Access, useAccess } from 'umi';
import AddAndEdit from './components/addAndEdit';
import { AppstoreOutlined, MailOutlined, SettingOutlined } from '@ant-design/icons';
import { add, del, edit, getList } from './service';
import { add, del, edit, getList, getUnitList } from './service';

const Role = () => {
  const actionRef = useRef();
  const addViewRef = useRef();
  const [modalVisible, handleModalVisibles] = useState(true);
  const access = useAccess();
  useEffect(() => {
    getUnitList().then((res) => {
      console.log(res);
    });
  }, []);
  const items = [
    {
      key: '1',
      icon: <MailOutlined />,
      label: 'Navigation One',
      icon: (
        <div
          style={{
            display: 'flex',
            alignItems: 'center',
            justifyContent: 'space-between',
            width: '100%',
          }}
        >
          <span>组织部</span>
          <div>
            <PlusOutlined
              onClick={(e) => {
                e.stopPropagation();
                console.log(e);
              }}
            />
            <EditOutlined
              onClick={(e) => {
                e.stopPropagation();
                console.log(e);
              }}
            />
            <DeleteOutlined
              onClick={(e) => {
                e.stopPropagation();
                console.log(e);
              }}
            />
          </div>
        </div>
      ),
      children: [
        {
          key: '11',
@@ -32,80 +67,6 @@
        },
        {
          key: '14',
          label: 'Option 4',
        },
      ],
    },
    {
      key: '2',
      icon: <AppstoreOutlined />,
      label: 'Navigation Two',
      children: [
        {
          key: '21',
          label: 'Option 1',
        },
        {
          key: '22',
          label: 'Option 2',
        },
        {
          key: '23',
          label: 'Submenu',
          children: [
            {
              key: '231',
              label: 'Option 1',
            },
            {
              key: '232',
              label: 'Option 2',
            },
            {
              key: '233',
              label: 'Option 3',
            },
          ],
        },
        {
          key: '24',
          label: 'Submenu 2',
          children: [
            {
              key: '241',
              label: 'Option 1',
            },
            {
              key: '242',
              label: 'Option 2',
            },
            {
              key: '243',
              label: 'Option 3',
            },
          ],
        },
      ],
    },
    {
      key: '3',
      icon: <SettingOutlined />,
      label: 'Navigation Three',
      children: [
        {
          key: '31',
          label: 'Option 1',
        },
        {
          key: '32',
          label: 'Option 2',
        },
        {
          key: '33',
          label: 'Option 3',
        },
        {
          key: '34',
          label: 'Option 4',
        },
      ],
@@ -186,7 +147,8 @@
            mode="inline"
            defaultSelectedKeys={['231']}
            style={{
            //   width: 256,
              //   width: 256,
              height: '100%',
            }}
            items={items}
          />
@@ -201,7 +163,7 @@
              showQuickJumper: true,
              defaultPageSize: 10,
            }}
            request={(params) => buildProTableDataSource(getList, params)}
            // request={(params) => buildProTableDataSource(getList, params)}
            toolBarRender={(action, selectRows) => [
              <Access accessible={access['/system_setting/role_management/add']}>
                <Space>

 management/src/pages/setting/user/service.js

@@ -8,6 +8,15 @@
    });
}


// 单位列表
export const getUnitList = async (params) => {
    return request(`/api/huacheng-sangeshenbian/department/list`, {
        method: 'GET',
        params
    });
}

// 编辑获取角色权限树
export const getTree = async (id) => {
    return request(`/api/huacheng-sangeshenbian/systemRole/getSystemRoleInfo/${id}`, {