13404089107
2025-02-25 cb3b4feddf9190a6664ba62a99db331c0ea13fe2
三个身边职位管理及工单事项配置对接口
6个文件已修改
1个文件已添加
104 ■■■■■ 已修改文件
management/src/components/RightContent/AvatarDropdown.tsx 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/setting/career/components/addAndEdit.jsx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/setting/career/index.jsx 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/setting/career/service.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/work-order-setting/index.jsx 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/pages/work-order-setting/service.js 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/utils/antdUtils.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/src/components/RightContent/AvatarDropdown.tsx
@@ -25,13 +25,13 @@
  const [unreadCount, setUnreadCount] = useState(0);
  useEffect(() => {
    const timer = setInterval(() => {
      getUnreadCount().then((res: any) => {
        setUnreadCount(res.data || 0);
      });
    }, 1000 * 5)
    // const timer = setInterval(() => {
    //   getUnreadCount().then((res: any) => {
    //     setUnreadCount(res.data || 0);
    //   });
    // }, 1000 * 5)
    return () => clearInterval(timer);
    // return () => clearInterval(timer);
  }, []);
management/src/pages/setting/career/components/addAndEdit.jsx
@@ -16,8 +16,8 @@
   */
  const okHandle = () => {
    form.validateFields().then((values) => {
      if (editData.deptId) {
        values.deptId = editData.deptId;
      if (editData.id) {
        values.id = editData.id;
        onUpdate(values);
      } else {
        onSave(values);
@@ -57,7 +57,7 @@
    >
      <Form layout="horizontal" {...formItemLayout} form={form} initialValues={{ isAuctioneer: 1 }}>
        <Form.Item
          name="deptName"
          name="name"
          required
          label="职位名称"
          rules={[{ required: true, message: '请输入职位名称' }]}
management/src/pages/setting/career/index.jsx
@@ -4,7 +4,7 @@
import { useRef, useState } from 'react';
import { Access, useAccess } from 'umi';
import AddAndEdit from './components/addAndEdit';
import { add, edit, del, getList, updateStatus, resetPaswword } from './service';
import { add, edit, del, getList } from './service';
const Account = () => {
  const actionRef = useRef();
  const addViewRef = useRef();
@@ -14,7 +14,7 @@
  const columns = [
    {
      title: '职位名称',
      dataIndex: 'deptName',
      dataIndex: 'name',
    },
    {
      title: '操作',
@@ -70,7 +70,7 @@
          columns={columns}
          pagination={false}
          request={async (params) => {
            return await buildProTableDataSource(getList, params);
            return  buildProTableDataSource(getList, params);
          }}
          toolBarRender={(action, selectRows) => [
            <Space>
management/src/pages/setting/career/service.js
@@ -1,16 +1,18 @@
import { request } from '@umijs/max';
// 分页获取部门列表
export const getList = async (data) => {
    return request(`/system/dept/list`, {
export const getList = async (params) => {
    console.log('111111111111',params);
    return request(`/api/huacheng-sangeshenbian/systemPost/list`, {
        method: 'GET',
        params:data
        params
    });
}
// 新增部门
export const add = async (data) => {
    return request('/system/dept', {
    return request('/api/huacheng-sangeshenbian/systemPost/add', {
        method: 'POST',
        data,
    });
@@ -18,15 +20,15 @@
// 修改部门
export const edit = async (data) => {
    return request('/system/dept', {
        method: 'PUT',
    return request('/api/huacheng-sangeshenbian/systemPost/edit', {
        method: 'POST',
        data
    });
}
// 删除部门管理
export const del = async (data) => {
    return request(`/system/dept/${data}`, {
    return request(`/api/huacheng-sangeshenbian/systemPost/delete/${data.id}`, {
        method: 'DELETE',
    });
}
management/src/pages/work-order-setting/index.jsx
@@ -7,7 +7,7 @@
// import AddAndEdit from './components/addAndEdit';
// import { getConfig, saveConfig } from './service';
import { getSetting, addSetting } from './service';
// const TabPane = Tabs.TabPane;
const Account = () => {
    const actionRef = useRef();
@@ -15,20 +15,26 @@
    const addViewRef1 = useRef();
    const [form] = Form.useForm();
    const [tab, setTab] = useState('1');
    const [modalVisible, handleModalVisible] = useState(false);
    const [selectedRowKeys, setSelectedRowKeys] = useState([]);
    const changeStatusRef = useRef();
    const [addWarnVisible, handleAddWarnVisible] = useState(false);
    const [dataSource, setDataSource] = useState([]);
    const [data, setData] = useState([]);
    const access = useAccess();
    useEffect(() => {
        getSetting().then(res => {
            if (res.code === 200) {
                setData(res.data);
                form.setFieldsValue(res.data);
            }
        })
    }, [])
    const save = () => {
        form.validateFields().then(async (values) => {
                values.id = 1
                sendRequest(addSetting, values).then(res => {
                    if (res.code === 200) {
                    }
                })
        });
    };
@@ -49,29 +55,29 @@
                            </span><span style={{ marginLeft: 8, color: '#a5a5a5' }}>超过时间未处理诉求,系统自动对该事件承办者发送短信提醒,并知会至上一级管理层进行督办。
                                </span></div>
                            <Space style={{ marginTop: 20, display: 'flex', flexWrap: 'wrap' }}>
                                <Form.Item label="市级账号" name="isAuctioneer" rules={
                                <Form.Item label="市级账号" name="cityHandlingTime" rules={
                                    [{ required: true, message: '请输入市级账号' }]
                                }>
                                    <InputNumber controls={false} precision={0} min={0} addonAfter="天内"  ></InputNumber>
                                </Form.Item>
                                <Form.Item label="区县账号" name="isAuctioneer" rules={
                                <Form.Item label="区县账号" name="districtHandlingTime" rules={
                                    [{ required: true, message: '请输入区县账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="街道账号" name="isAuctioneer" rules={
                                <Form.Item label="街道账号" name="streetHandlingTime" rules={
                                    [{ required: true, message: '请输入街道账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="社区账号" name="isAuctioneer" rules={
                                <Form.Item label="社区账号" name="communityHandlingTime" rules={
                                    [{ required: true, message: '请输入社区账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="党员账号" name="isAuctioneer" rules={
                                <Form.Item label="党员账号" name="partyMemberHandlingTime" rules={
                                    [{ required: true, message: '请输入党员账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
@@ -84,29 +90,29 @@
                                </span></div>
                            <Space style={{ marginTop: 20, display: 'flex', flexWrap: 'wrap' }}>
                                <Form.Item label="市级账号" name="isAuctioneer" rules={
                                <Form.Item label="市级账号" name="cityDeadlineReminder" rules={
                                    [{ required: true, message: '请输入市级账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="区县账号" name="isAuctioneer" rules={
                                <Form.Item label="区县账号" name="districtDeadlineReminder" rules={
                                    [{ required: true, message: '请输入区县账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="街道账号" name="isAuctioneer" rules={
                                <Form.Item label="街道账号" name="streetDeadlineReminder" rules={
                                    [{ required: true, message: '请输入街道账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="社区账号" name="isAuctioneer" rules={
                                <Form.Item label="社区账号" name="communityDeadlineReminder" rules={
                                    [{ required: true, message: '请输入社区账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
                                </Form.Item>
                                <Form.Item label="党员账号" name="isAuctioneer" rules={
                                <Form.Item label="党员账号" name="partyMemberDeadlineReminder" rules={
                                    [{ required: true, message: '请输入党员账号' }]
                                }>
                                    <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
@@ -117,7 +123,7 @@
                            <div style={{ marginBottom: 20 }}><span style={{ fontSize: '14px', fontWeight: 600 }}>*诉求处理时间:
                            </span><span style={{ marginLeft: 8, color: '#a5a5a5' }}>超过时间未处理诉求,系统自动对该事件承办者发送短信提醒,并知会至上一级管理层进行督办。
                                </span></div>
                            <Form.Item label="添加后处理时间" name="isAuctioneer" rules={
                            <Form.Item label="添加后处理时间" name="demandProcessingTime" rules={
                                [{ required: true, message: '请输入添加后处理时间' }]
                            }>
                                <InputNumber precision={0} min={0} addonAfter="天内" controls={false}></InputNumber>
@@ -125,7 +131,7 @@
                        </Card>
                        <Access accessible={access['/work_order_transaction_management/work_order_item_configuration/save'] || false}>
                            <div style={{ marginTop: 20, display: 'flex', justifyContent: 'center' }}>
                                <Button type="primary" htmlType="submit" style={{ marginRight: 20 }}>
                                <Button type="primary" htmlType="submit" style={{ marginRight: 20 }} onClick={() => {save()}} >
                                    保存
                                </Button>
                            </div>
management/src/pages/work-order-setting/service.js
New file
@@ -0,0 +1,17 @@
import { request } from '@umijs/max';
// 获取工单事项配置
export const getSetting = async (data) => {
    return request(`/api/huacheng-sangeshenbian/workOrderItemConfig/getWorkOrderItemConfigInfo`, {
        method: 'GET',
        params:data
    });
}
// 配置工单事项配置
export const addSetting = async (data) => {
    return request(`/api/huacheng-sangeshenbian/workOrderItemConfig/addWorkOrderItemConfig`, {
        method: 'POST',
        data
    });
}
management/src/utils/antdUtils.js
@@ -103,7 +103,8 @@
}
export async function buildProTableDataSource(fun, params) {
  params.pageNum = params.current;
  params.pageNum = params.current || 1;
  params.pageSize = params.pageSize || 10
  delete params.current
  const response = await fun(params);
  const data = Promise.resolve({