.

src/pages/ContentManagementSystem/InformationClassification/index.jsx

@@ -1,53 +1,75 @@
-import { history, Link } from 'umi';
-import { useRef } from 'react';
-import { Button, Modal, message, Popconfirm, Tooltip } from 'antd';
-import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import React, { useState, useEffect, useRef } from 'react';
+import { Button, Popconfirm, Modal, Form, Input, message } from 'antd';
+import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import ProTable, { TableDropdown } from '@ant-design/pro-table';
+import moment from 'moment';
+import PageTable from '@/components/PageTable';
+import { getNewsTypeList, addNewsType, deleteNewsType, updateNewsType } from '@/services/newsType';
 
-export default (props) => {
-  const dataSource = [
-    {
-      id: 9,
-      key: '1',
-      name: '胡彦斌',
-      age: 32,
-      zz: '西湖区湖底公园1号',
-    },
-  ];
-
-  // 测试内容👆-------------------------
+const formatterTime = (val) => {
+  return val && val !== '-' ? moment(val).format('YYYY-MM-DD') : '-';
+};
+const FormItem = Form.Item;
 
+export default (props) => {
+  const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+  const [form] = Form.useForm();
+  const [editModal, setEditModal] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [typeId, setTypeId] = useState();
   const actionRef = useRef();
-  const gotoDetail = (id) => {
-    history.push(`InformationClassification/InformationClassificationEdit`);
-  };
-
-  const handleDelete = (e) => {
-    deleteNote(e.noteId).then((res) => {
-      message.success('删除成功');
-      actionRef.current.reload();
-    });
-  };
 
-  const handleOK = (record, data) => {
-    const titleCourse = record.status
-      ? '您确定要禁用该用户吗? 禁用后该用户不能在后台登陆!'
-      : '您确定要启用该用户吗? 启用后该用户将允许在后台登陆!';
-    Modal.confirm({
-      title: titleCourse,
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        publishNote(record.noteId, record.status ? 'off' : 'on').then((res) => {
-          message.success('操作成功');
+  const Submit = (values) => {
+    setLoading(true);
+    if (typeId) {
+      updateNewsType(typeId, values).then(() => {
+        setLoading(false);
+        message.success(`修改成功`);
+        onCancel();
+        actionRef.current.reload();
+      });
+    } else {
+      addNewsType(values)
+        .then(() => {
+          setLoading(false);
+          message.success(`保存成功`);
+          onCancel();
           actionRef.current.reload();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
         });
-      },
-    });
+    }
+  };
+  const handelEdit = (val) => {
+    setTypeId(val.typeId);
+    form.setFieldsValue(val);
+    setEditModal(true);
+  };
+  const onCancel = () => {
+    setTypeId();
+    form.resetFields();
+    setEditModal(false);
   };
+  const handleDelete = (id) => {
+    deleteNewsType(id)
+      .then(() => {
+        message.success('删除成功');
+        actionRef.current.reload();
+      })
+      .catch((err) => {
+        message.error(err);
+      });
+  };
+  useEffect(() => {
+    if (typeId) {
+    } else {
+      form.resetFields();
+    }
+  }, [typeId]);
   const actions = () => [
-    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoDetail()}>
+    <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
       新增
     </Button>,
   ];
@@ -56,45 +78,33 @@ export default (props) => {
       title: '分类名',
       dataIndex: 'name',
       key: 'name',
-      search: false,
     },
-
     {
-      title: (
-        <>
-          创建时间
-          <Tooltip placement="top">
-            <QuestionCircleOutlined style={{ marginLeft: 4 }} />
-          </Tooltip>
-        </>
-      ),
-      // hideInTable: true,
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: formatterTime,
       search: false,
-
-      key: 'createdAt',
-      dataIndex: 'createdAt',
-      valueType: 'date',
-      // render: (t) => formatterTime(t),
-      sorter: (a, b) => a.createdAt - b.createdAt, //时间排序
+      width: 240,
     },
     {
       title: '操作',
       valueType: 'option',
-      key: 'option',
-      ellipsis: true,
-      width: 200,
+      width: 160,
       render: (_, record) => [
-        <Link key={2} to={`InformationClassification/InformationClassificationEdit`}>
+        <Button type="link" style={{ padding: 0 }} key={1} onClick={() => handelEdit(record)}>
           编辑
-        </Link>,
+        </Button>,
         <Popconfirm
-          key={3}
+          key={2}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record)}
+          onConfirm={() => handleDelete(record.typeId)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },
@@ -102,16 +112,44 @@ export default (props) => {
 
   return (
     <PageHeaderWrapper>
-      <ProTable
-        dataSource={dataSource}
+      <PageTable
+        request={getNewsTypeList}
         columns={columns}
-        // request={getNoteList} 请求
-        // rowKey="noteId"
-        search={false}
+        actionRef={actionRef}
+        rowKey="typeId"
         options={false}
         toolBarRender={actions}
-        actionRef={actionRef}
+        scroll={{ x: 1000 }}
       />
+      <Modal
+        forceRender
+        title={typeId ? '分类编辑' : '分类新增'}
+        visible={editModal}
+        onCancel={onCancel}
+        keyboard={false}
+        maskClosable={false}
+        destroyOnClose={true}
+        footer={null}
+      >
+        <Form {...formItemLayout} onFinish={Submit} form={form}>
+          <FormItem label="分类名" name="name" rules={[{ required: true, message: '请输入' }]}>
+            <Input placeholder="请输入" />
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            <Button type="default" onClick={onCancel}>
+              取消
+            </Button>
+            <Button
+              type="primary"
+              loading={loading}
+              htmlType="Submit"
+              style={{ marginLeft: '4em' }}
+            >
+              确认
+            </Button>
+          </FormItem>
+        </Form>
+      </Modal>
     </PageHeaderWrapper>
   );
 };

src/pages/Machinery/Machinery/index.jsx

@@ -1,15 +1,17 @@
-import React, { useRef } from 'react';
+import React, { useRef, useEffect, useState } from 'react';
 import { history } from 'umi';
 import { Button, Popconfirm, message, Select, Modal } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
 import { getMachineryList, deleteMachinery, updateMachinery } from '@/services/machinery';
+import { getMachineryTypeList } from '@/services/machineryType';
 
 const { Option } = Select;
 
 export default (props) => {
   const actionRef = useRef();
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
 
   const gotoEdit = (id) => {
     const queryStr = id ? `?id=${id}` : '';
@@ -42,6 +44,11 @@ export default (props) => {
       },
     });
   };
+  useEffect(() => {
+    getMachineryTypeList().then((res) => {
+      setMachineryTypeList(res.records);
+    });
+  }, []);
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
       新增农机
@@ -53,15 +60,34 @@ export default (props) => {
       dataIndex: 'name',
       key: 'name',
     },
+    {
+      title: '农机类型',
+      dataIndex: 'typeId',
+      key: 'typeId',
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select style={{ width: '350px' }}>
+            {machineryTypeList.map((item) => (
+              <Option value={item.typeId} key={item.typeId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        );
+      },
+      hideInTable: true,
+    },
     {
       title: '农机类型',
       dataIndex: 'typeName',
       key: 'typeName',
+      search: false,
     },
     {
-      title: '农机归属',
+      title: '区域',
       dataIndex: 'regionName',
       key: 'regionName',
+      search: false,
     },
     {
       title: '农机价格',
@@ -93,14 +119,7 @@ export default (props) => {
       title: '工作状态',
       dataIndex: 'jobStatus',
       key: 'jobStatus',
-      renderFormItem: (item, field, form) => {
-        return (
-          <Select>
-            <Option value="1">忙碌</Option>
-            <Option value="0">空闲</Option>
-          </Select>
-        );
-      },
+      search: false,
       render: (_, record) => {
         return record.jobStatus === 1 ? '忙碌' : '空闲';
       },
@@ -109,14 +128,7 @@ export default (props) => {
       title: '发布状态',
       dataIndex: 'status',
       key: 'status',
-      renderFormItem: (item, field, form) => {
-        return (
-          <Select>
-            <Option value="1">发布</Option>
-            <Option value="0">未发布</Option>
-          </Select>
-        );
-      },
+      search: false,
       render: (_, record) => {
         return record.status === 1 ? '发布' : '未发布';
       },

src/pages/SystemManagement/Cooperative/index.jsx

@@ -223,7 +223,7 @@ export default (props) => {
                   ))}
                 </Select>
               </FormItem>
-              <FormItem
+              {/* <FormItem
                 label="身份"
                 name="role"
                 rules={[{ required: true, message: '请选择身份' }]}
@@ -232,7 +232,7 @@ export default (props) => {
                   <Option value="合作社" key="合作社" />
                   <Option value="个体户" key="个体户" />
                 </Select>
-              </FormItem>
+              </FormItem> */}
               <FormItem label="员工数">{listForm?.workerNum || 0}</FormItem>
               <FormItem label="农机数">{listForm?.machineryNum || 0}</FormItem>
               <FormItem label="订单完成数">{listForm?.orderNum || 0}</FormItem>

src/services/newsType.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request';
+
+/**
+ * 保存资讯分类
+ * @param {*} data
+ * @returns
+ */
+export const addNewsType = (data) => request('/news-type', { method: 'post', data });
+
+/**
+ * 修改资讯分类
+ * @param {*} data
+ * @returns
+ */
+export const updateNewsType = (id, data) => request(`/news-type/${id}`, { method: 'put', data });
+
+/**
+ * 查询资讯分类列表
+ * @param {*} params
+ * @returns
+ */
+export const getNewsTypeList = (params) => request('/news-type', { params });
+
+/**
+ * 删除资讯分类
+ * @param {*} data
+ * @returns
+ */
+export const deleteNewsType = (id) => request(`/news-type/${id}`, { method: 'delete' });
+
+/**
+ * 查询资讯分类详情
+ * @param {*} params
+ * @returns
+ */
+export const getNewsTypeDetail = (id) => request(`/news-type/${id}`);