Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

src/components/SettingRow/index.jsx

@@ -0,0 +1,48 @@
+import { Input, Button, Tooltip, message } from 'antd';
+import { useState } from 'react';
+import { CheckOutlined, UndoOutlined } from '@ant-design/icons';
+
+const SettingRow = (props) => {
+  const { value, onChange } = props;
+  const [val, setVal] = useState(value.settingValue);
+  const [isShow, setIsShow] = useState(false);
+  const handleInput = () => {
+    setIsShow(true);
+  };
+  const handleClick = () => {
+    if (val) {
+      onChange(value, val);
+    } else {
+      message.info(value.settingDesc + '不能为空');
+      setVal(value.settingValue);
+    }
+  };
+  const handleChange = (e) => {
+    setVal(e.target.value);
+  };
+  const handleReset = () => {
+    setVal(value.settingValue);
+    setIsShow(false);
+  };
+  return (
+    <div style={{ textAlign: 'center' }}>
+      {value.settingDesc}：
+      <Input style={{ width: '400px' }} value={val} onChange={handleChange} onInput={handleInput} />
+      <Button
+        type="text"
+        style={{ color: '#1890ff', visibility: isShow ? 'inherit' : 'hidden' }}
+        icon={<CheckOutlined />}
+        onClick={handleClick}
+      />
+      <Tooltip placement="top" title={'重置' + value.settingDesc}>
+        <Button
+          type="text"
+          style={{ color: 'green', visibility: isShow ? 'inherit' : 'hidden' }}
+          icon={<UndoOutlined />}
+          onClick={handleReset}
+        />
+      </Tooltip>
+    </div>
+  );
+};
+export default SettingRow;

src/pages/Machinery/MachineryType/index.jsx

@@ -1,37 +1,99 @@
-import React from 'react';
-import { history, Link } from 'umi';
-import { Button, Popconfirm, Modal, Form, Input, message, Space, Tooltip } from 'antd';
+import { Button, Popconfirm, Modal, Form, Input, message, Select } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-// import { getPersonList, exportPersonList } from '@/services/person';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
+import {
+  getMachineryTypeList,
+  addMachineryType,
+  updateMachineryType,
+  deleteMachineryType,
+} from '@/services/machineryType';
 
 const formatterTime = (val) => {
-  return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
+  return val ? moment(val).format('YYYY-MM-DD') : '';
 };
 const FormItem = Form.Item;
+const { Option } = Select;
+
 export default (props) => {
   const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
   const actionRef = useRef();
-  const [name, setName] = useState();
   const [selectModal, setSelectModal] = useState(false);
-  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [typeId, setTypeId] = useState();
 
-  const handleName = (val) => {
-    setName(val);
+  //列表切换分类状态方法
+  const handleOK = (record, data) => {
+    const title = record.status
+      ? '您确定要将该分类状态变更为禁用吗? 禁用后该分类将不能登录'
+      : '您确定要将该分类状态变更为启用吗? 启用后该分类可以登录!';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        updateMachineryType(record.typeId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
+      },
+    });
   };
-  const changeWeight = (record) => {
+  const handleChange = (val) => {
     setSelectModal(true);
+    setTypeId(val.typeId);
+    form.setFieldsValue(val);
+  };
+
+  const handleDelete = (val) => {
+    deleteMachineryType(val).then(() => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    });
+  };
 
-    // setWeight(record.weight || 0)
-    // setEditDetail(record)
+  const Submit = (data) => {
+    setLoading(true);
+    if (typeId) {
+      updateMachineryType(typeId, data)
+        .then(() => {
+          message.success(`修改成功`);
+          setLoading(false);
+          onCancel();
+          actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addMachineryType(data)
+        .then(() => {
+          message.success(`添加成功`);
+          setLoading(false);
+          onCancel();
+          actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
+  };
+  const onCancel = () => {
+    form.resetFields();
+    setSelectModal(false);
+    setTypeId();
   };
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={selectModalOpen}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setSelectModal(true)}>
       新增农机分类
     </Button>,
   ];
@@ -42,68 +104,67 @@ export default (props) => {
       key: 'name',
     },
     {
-      title: '操作',
-      key: 'option',
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: formatterTime,
+      search: false,
+      width: 240,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      width: 80,
+      search: false,
       render: (_, record) => {
-        return (
-          <Space>
-            <Button key={1} onClick={() => changeWeight(record)} type="link">
-              编辑
-            </Button>
-            <Popconfirm
-              key={2}
-              title="您是否确认删除 ?"
-              onConfirm={() => handleDelete(record.cooperativeId)}
-              okText="确定"
-              cancelText="取消"
-            >
-              <a href="#">删除</a>
-            </Popconfirm>
-          </Space>
-        );
+        return record.status === 1 ? '发布' : '未发布';
       },
-      search: false,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 160,
+      render: (_, record) => [
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '发布' : '取消发布'}
+        </Button>,
+        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => handleChange(record)}>
+          编辑
+        </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.typeId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
     },
   ];
-  const handleDelete = () => { };
-
-  const Submit = () => {
-    setLoading(true);
-    editRecommend({ ...editdetail, weight }, editdetail.serialNo).then(() => {
-      message.success(`修改成功`);
-      setLoading(false);
-      onCancel();
-      setName();
-      actionRef.current.reload();
-    });
-  };
-  const selectModalOpen = () => {
-    setSelectModal(true);
-  };
-  const onCancel = () => {
-    form.resetFields();
-    setSelectModal(false);
-  };
-
-  useEffect(() => {
-    form.setFieldsValue({ targetName: '' });
-    // setPackageList();
-    // getResource({ pageSize: 100 }).then((res) => {
-    //   setMachineryTypeList(res.records || []);
-    // });
-  }, []);
   return (
     <PageHeaderWrapper>
       <Modal
-        title="修改"
+        forceRender
+        title="农机分类"
         visible={selectModal}
         onCancel={onCancel}
         destroyOnClose={true}
         footer={null}
       >
         <Form {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="分类名" name="name" initialValue={name}>
-            <Input onChange={handleName} style={{ width: '100%' }} placeholder="请输入分类名" />
+          <FormItem label="分类名" name="name">
+            <Input placeholder="请输入分类名" />
+          </FormItem>
+          <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
+            <Select placeholder="请选择是否发布">
+              <Option value={1}>发布</Option>
+              <Option value={0}>未发布</Option>
+            </Select>
           </FormItem>
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={onCancel}>
@@ -115,15 +176,16 @@ export default (props) => {
               htmlType="Submit"
               style={{ marginLeft: '4em' }}
             >
-              修改
+              确定
             </Button>
           </FormItem>
         </Form>
       </Modal>
       <PageTable
-        // request={getPersonList}
+        request={getMachineryTypeList}
         // expfunc={exportPersonList}
         toolBarRender={actions}
+        actionRef={actionRef}
         columns={columns}
         rowKey="typeId"
         options={false}

src/pages/SystemManagement/Administrator/index.jsx

@@ -1,5 +1,20 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Button, Popconfirm, Modal, Form, Input, message, Radio, Select, Checkbox } from 'antd';
+import {
+  Button,
+  Popconfirm,
+  Modal,
+  Form,
+  Input,
+  message,
+  Radio,
+  Select,
+  List,
+  Row,
+  Col,
+  Card,
+  Tree,
+  Checkbox,
+} from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { getCooperativeList } from '@/services/cooperative';
 import {
@@ -16,6 +31,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
 import moment from 'moment';
 import Search from '@/components/CooperativeSearch';
+import './index.less';
 
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -39,7 +55,32 @@ export default (props) => {
   const [currentCheckbox, setCurrentCheckbox] = useState();
   //列表数据
   const actionRef = useRef();
+  const [data, setData] = useState([]);
+  const [orgId, setOrgId] = useState();
 
+  // 动态生成树
+  const handelNode = (item) => {
+    let node = (
+      <div
+        key={item.orgId}
+        style={{
+          justifyContent: 'space-between',
+          display: 'flex',
+          padding: '8px 0',
+        }}
+      >
+        <span>{item.title}</span>
+      </div>
+    );
+    return node;
+  };
+  const onSelect = (checkedKeys, info) => {
+    if (info.selected) {
+      setOrgId(info.node.key);
+    } else {
+      setOrgId();
+    }
+  };
   // 编辑弹窗的表单提交
   const Submit = (values) => {
     const newData = { ...values };
@@ -182,6 +223,10 @@ export default (props) => {
     //获取机构列表数据
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
+      const list = res.records?.map((item) => {
+        return { title: item.name, key: item.orgId };
+      });
+      setData(list);
     });
     //获取角色列表数据
     getRoleList().then((res) => {
@@ -233,6 +278,7 @@ export default (props) => {
       title: '邮箱',
       dataIndex: 'email',
       key: 'email',
+      search: false,
     },
     {
       title: '注册时间',
@@ -240,19 +286,14 @@ export default (props) => {
       key: 'createDate',
       render: formatterTime,
       search: false,
+      width: 160,
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
-      renderFormItem: () => {
-        return (
-          <Select placeholder="请选择">
-            <Option value={1}>启用</Option>
-            <Option value={0}>禁用</Option>
-          </Select>
-        );
-      },
+      width: 80,
+      search: false,
       render: (_, record) => {
         return record.status === 1 ? '启用' : '未启用';
       },
@@ -260,16 +301,17 @@ export default (props) => {
     {
       title: '操作',
       valueType: 'option',
+      width: 160,
       render: (_, record) => [
-        <Button type="link" key={1} onClick={() => handleOK(record)}>
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
           {record.status === 0 ? '启用' : '禁用'}
         </Button>,
-        <a key={2} onClick={() => handleEdit(record)}>
+        <Button style={{ padding: 0 }} type="link" key={2} onClick={() => handleEdit(record)}>
           编辑
-        </a>,
-        <a key={3} onClick={() => handleRole(record)}>
+        </Button>,
+        <Button style={{ padding: 0 }} type="link" key={3} onClick={() => handleRole(record)}>
           授权角色
-        </a>,
+        </Button>,
         <Popconfirm
           key={4}
           title="您是否确认删除 ?"
@@ -277,7 +319,9 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },
@@ -285,16 +329,31 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <PageTable
-        request={getUserList}
-        // expfunc={exportPersonList}
-        columns={columns}
-        actionRef={actionRef}
-        rowKey="userId"
-        options={false}
-        toolBarRender={actions}
-        scroll={{ x: 1000 }}
-      />
+      <Row gutter={16}>
+        <Col span={6}>
+          <Card title="机构列表">
+            <Tree
+              onSelect={onSelect}
+              className="treeClass"
+              titleRender={(data) => handelNode(data)}
+              treeData={data}
+            />
+          </Card>
+        </Col>
+        <Col span={18}>
+          <PageTable
+            request={getUserList}
+            params={{ org_id: orgId }}
+            // expfunc={exportPersonList}
+            columns={columns}
+            actionRef={actionRef}
+            rowKey="userId"
+            options={false}
+            toolBarRender={actions}
+            scroll={{ x: 1000 }}
+          />
+        </Col>
+      </Row>
       <Modal
         forceRender
         title={userId ? '人员编辑' : '人员新增'}
@@ -310,7 +369,7 @@ export default (props) => {
             <Input placeholder="请输入" />
           </FormItem>
           <FormItem label="性别" name="sex">
-            <Radio.Group name="sex" defaultValue={1}>
+            <Radio.Group>
               <Radio value={1}>男</Radio>
               <Radio value={0}>女</Radio>
             </Radio.Group>
@@ -371,7 +430,7 @@ export default (props) => {
       </Modal>
       <Modal
         forceRender
-        title="角色授权"
+        title="授权角色"
         visible={editRoleModal}
         onCancel={onRoleCancel}
         keyboard={false}
@@ -385,14 +444,14 @@ export default (props) => {
           value={currentCheckbox}
           onChange={handleCheckboxChange}
         >
-          {roleList.map((item) => {
-            return (
-              <div key={item.roleId}>
+          <List
+            dataSource={roleList}
+            renderItem={(item) => (
+              <List.Item>
                 <Checkbox value={item.roleId}>{item.name}</Checkbox>
-                <br />
-              </div>
-            );
-          })}
+              </List.Item>
+            )}
+          />
         </Checkbox.Group>
       </Modal>
     </PageHeaderWrapper>

src/pages/SystemManagement/Administrator/index.less

@@ -0,0 +1,15 @@
+@import (reference) '~antd/es/style/themes/index';
+
+.treeClass {
+  .ant-tree-list {
+    & div {
+      width: 100% !important;
+      .ant-tree-switcher-noop {
+        display: none !important;
+      }
+      span:nth-child(3) {
+        width: 100%;
+      }
+    }
+  }
+}

src/pages/SystemManagement/BasicParameters/index.jsx

@@ -1,41 +1,35 @@
-import { Input, Card, InputNumber, Button, message } from "antd"
-import { useEffect, useState } from 'react'
-import { Form } from "antd";
-import { history } from 'umi';
-import ProCard from '@ant-design/pro-card'
+import { Card, message } from 'antd';
+import { useEffect, useState } from 'react';
+import ProCard from '@ant-design/pro-card';
+import { getSetting, updateSetting } from '@/services/setting';
+import SettingRow from '@/components/SettingRow';
 
-
-const FormItem = Form.Item
 export default (props) => {
+  const [data, setData] = useState([]);
 
-  const [form] = Form.useForm()
-  const [loading, setLoading] = useState(false)
-
-  const formItemLayout = {
-    //布局
-    labelCol: { span: 6 },
-    wrapperCol: { span: 14 },
-  };
-
-  const Submit = values => {
-    console.log("🚀 ~ file: index.jsx ~ line 21 ~ values", values)
+  const handleChange = (item, val) => {
+    updateSetting(item.settingId, { ...item, settingValue: val })
+      .then(() => {
+        message.success('修改' + item.settingDesc + '成功');
+      })
+      .catch((err) => {
+        message.error(err.message || err);
+      });
   };
-
+  useEffect(() => {
+    getSetting().then((res) => {
+      setData(res.records);
+    });
+  }, []);
   return (
-    <Card >
+    <Card>
       <ProCard tabs={{ type: 'card' }} style={{ marginTop: '16px' }}>
         <ProCard.TabPane key={1} tab="基本参数">
-          <Form {...formItemLayout} onFinish={Submit} form={form} >
-            <FormItem label="平台联系电话" name="shopName" rules={[{ required: true, message: '请输入' }]}>
-              <Input placeholder="请输入" type={"number"} maxLength={11} style={{ width: '350px' }} />
-            </FormItem>
-
-            <FormItem label=" " colon={false} >
-              <Button type='primary' loading={loading} htmlType="Submit" style={{ marginLeft: '4em' }}>保存</Button>
-            </FormItem>
-          </Form>
+          {data.map((item) => {
+            return <SettingRow key={item.settingId} value={item} onChange={handleChange} />;
+          })}
         </ProCard.TabPane>
       </ProCard>
     </Card>
-  )
-}
+  );
+};

src/pages/SystemManagement/Cooperative/index.jsx

@@ -62,12 +62,11 @@ export default (props) => {
       });
   };
   // 动态生成树
-
   const handelNode = (item) => {
     let node = (
       <div
         key={item.orgId}
-        style={{ justifyContent: 'space-between', display: 'flex', width: '100%' }}
+        style={{ justifyContent: 'space-between', display: 'flex', padding: '8px 0' }}
         onClick={() => handleslect(item.key)}
       >
         <span>{item.title}</span>

src/pages/SystemManagement/Region/index.jsx

@@ -85,14 +85,16 @@ export default (props) => {
       key: 'createDate',
       render: formatterTime,
       search: false,
+      width: 240,
     },
     {
       title: '操作',
       valueType: 'option',
+      width: 160,
       render: (_, record) => [
-        <a key={1} onClick={() => handelEdit(record)}>
+        <Button type="link" style={{ padding: 0 }} key={1} onClick={() => handelEdit(record)}>
           编辑
-        </a>,
+        </Button>,
         <Popconfirm
           key={2}
           title="您是否确认删除 ?"
@@ -100,7 +102,9 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },

src/pages/SystemManagement/UserRights/index.jsx

@@ -336,14 +336,16 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: formatterTime,
+      width: 160,
     },
     {
       title: '操作',
       valueType: 'option',
+      width: 160,
       render: (_, record) => [
-        <a key={1} onClick={() => handelEdit(record)}>
+        <Button key={1} style={{ padding: 0 }} type="link" onClick={() => handelEdit(record)}>
           编辑
-        </a>,
+        </Button>,
         <Popconfirm
           key={2}
           title="您是否确认删除 ?"
@@ -351,11 +353,13 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
-        <a key={3} onClick={() => handelEmpower(record)}>
-          角色授权
-        </a>,
+        <Button key={3} style={{ padding: 0 }} type="link" onClick={() => handelEmpower(record)}>
+          授权菜单
+        </Button>,
       ],
     },
   ];
@@ -402,7 +406,7 @@ export default (props) => {
         </Form>
       </Modal>
       <Modal
-        title="角色授权"
+        title="授权菜单"
         visible={showModal}
         onCancel={onEmpowerCancel}
         keyboard={false}

src/services/machineryType.js

@@ -0,0 +1,37 @@
+import request from '@/utils/request';
+
+/**
+ * 保存农机类型
+ * @param {*} data
+ * @returns
+ */
+export const addMachineryType = (data) => request('/machinery-type', { method: 'post', data });
+
+/**
+ * 修改农机类型
+ * @param {*} data
+ * @returns
+ */
+export const updateMachineryType = (id, data) =>
+  request(`/machinery-type/${id}`, { method: 'put', data });
+
+/**
+ * 查询农机类型列表
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryTypeList = (params) => request('/machinery-type', { params });
+
+/**
+ * 删除农机类型
+ * @param {*} data
+ * @returns
+ */
+export const deleteMachineryType = (id) => request(`/machinery-type/${id}`, { method: 'delete' });
+
+/**
+ * 查询农机类型详情
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryTypeDetail = (id) => request(`/machinery-type/${id}`);

src/services/setting.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request';
+/**
+ * 系统基本数据更新
+ * @param {*} data
+ * @returns
+ */
+export const updateSetting = (id, data) => request(`/setting/${id}`, { method: 'put', data });
+
+/**
+ * 查询系统基本信息
+ * @param {*} params
+ * @returns
+ */
+export const getSetting = (params) => request('/setting', { params });