.

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

@@ -286,6 +286,7 @@ export default (props) => {
       key: 'createDate',
       render: formatterTime,
       search: false,
+      width: 160,
     },
     {
       title: '状态',
@@ -300,17 +301,17 @@ export default (props) => {
     {
       title: '操作',
       valueType: 'option',
-      width: 240,
+      width: 160,
       render: (_, record) => [
-        <a key={1} onClick={() => handleOK(record)}>
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
           {record.status === 0 ? '启用' : '禁用'}
-        </a>,
-        <a key={2} onClick={() => handleEdit(record)}>
+        </Button>,
+        <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="您是否确认删除 ?"
@@ -318,7 +319,9 @@ export default (props) => {
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },

src/pages/SystemManagement/Region/index.jsx

@@ -92,9 +92,9 @@ export default (props) => {
       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="您是否确认删除 ?"
@@ -102,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,16 +336,16 @@ export default (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       render: formatterTime,
-      width: 240,
+      width: 160,
     },
     {
       title: '操作',
       valueType: 'option',
-      width: 240,
+      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="您是否确认删除 ?"
@@ -353,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)}>
+        <Button key={3} style={{ padding: 0 }} type="link" onClick={() => handelEmpower(record)}>
           授权菜单
-        </a>,
+        </Button>,
       ],
     },
   ];

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}`);