.

src/pages/Machinery/Machinery/edit.jsx

@@ -1,11 +1,14 @@
-import { Form, Input, Card, InputNumber, Select, message, Button } from 'antd';
+import { useState, useEffect } from 'react';
+import { Form, Input, Card, DatePicker, Select, InputNumber, message, Button } from 'antd';
 import { history } from 'umi';
 import ProCard from '@ant-design/pro-card';
-import { useState, useEffect } from 'react';
-// import { getTagList } from '@/services/tag';
-// import { addAttaList, gettaTouristForm, EditaddAttaList } from '@/services/AttaList'
+import { UploadImage, UploadImageList } from '@/components/Upload';
+import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/machinery';
+import { getMachineryTypeList } from '@/services/machineryType';
+import { getRegionList } from '@/services/region';
+import { getCooperativeList } from '@/services/cooperative';
+import moment from 'moment';
 
-const { TextArea } = Input;
 const { Option } = Select;
 const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
 
@@ -17,43 +20,44 @@ export default (props) => {
   const { location } = props;
   const { id } = location.query;
   const [form] = Form.useForm();
-  const [listForm, setListForm] = useState({});
   const [loading, setLoading] = useState(false);
   const [imageList, setImageList] = useState([]);
+  //农机类型列表
+  const [machineryTypeList, setMachineryTypeList] = useState([]);
+  //区域列表
+  const [regionList, setRegionList] = useState([]);
+  //机构列表
+  const [cooperativeList, setCooperativeList] = useState([]);
 
   const Submit = (data) => {
-    const typeList = (data.typeList || []).map((x) => {
-      return { ...x, targetId: id, targetType: 'tourist' };
-    });
+    var newData = { ...data, buyDate: data.buyDate.format('YYYY-MM-DDTHH:mm:ss.SSS[Z]') };
     setLoading(true);
 
-    // if (id) {
-    //   EditaddAttaList(id, { ...listForm, ...data, imageList, typeList }).then(() => {
-    //     setLoading(false);
-    //     message.success('数据更新成功');
-    //     goBack();
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // } else {
-    //   addAttaList({ ...data, imageList, typeList }).then((res) => {
-    //     setLoading(false);
-    //     message.success('数据保存成功');
-    //     history.replace(`/Attractions/Edit?id=${res.touristId}`)
-    //   })
-    //     .catch(err => {
-    //       setLoading(false);
-    //       message.error(err.message || err);
-    //     });
-    // }
+    if (id) {
+      updateMachinery(id, newData)
+        .then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    } else {
+      addMachinery(newData)
+        .then((res) => {
+          setLoading(false);
+          message.success('数据保存成功');
+          goBack();
+        })
+        .catch((err) => {
+          setLoading(false);
+          message.error(err.message || err);
+        });
+    }
   };
 
-  //地址--占位
-  const [newLocName, setLocName] = useState('');
-  const [newAddress, setAddress] = useState('');
-
   const selectTagList = (params) => {
     // return getTagList({
     // }).then((res) => {
@@ -63,7 +67,7 @@ export default (props) => {
     //   }
     // })
   };
-
+  const onDateChange = () => {};
   const imageInput = (image) => {
     return {
       uid: image.imageId,
@@ -74,19 +78,25 @@ export default (props) => {
   const imageOutput = (image) => {
     return {
       imageId: image?.raw?.imageId,
-      shopId: id,
+      targetId: id,
       url: image.url,
     };
   };
   useEffect(() => {
-    selectTagList();
-    // if (id) {
-    //   gettaTouristForm(id).then((res) => {
-    //     setListForm(res)
-    //     form.setFieldsValue(res)
-    //     setImageList(res?.imageList || [])
-    //   })
-    // }
+    getMachineryTypeList().then((res) => {
+      setMachineryTypeList(res.records);
+    });
+    getRegionList().then((res) => {
+      setRegionList(res.records);
+    });
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
+    if (id) {
+      getMachineryDetail(id).then((res) => {
+        form.setFieldsValue({ ...res, buyDate: moment(res.buyDate, 'YYYY-MM-DD') });
+      });
+    }
   }, [id]);
 
   return (
@@ -107,44 +117,75 @@ export default (props) => {
               rules={[{ required: true, message: '请选择农机类型' }]}
             >
               <Select style={{ width: '350px' }}>
-                <Option value="6" key="6">
-                  {6}
-                </Option>
-                <Option value="7" key="7">
-                  {7}
-                </Option>
+                {machineryTypeList.map((item) => (
+                  <Option value={item.typeId} key={item.typeId}>
+                    {item.name}
+                  </Option>
+                ))}
               </Select>
             </FormItem>
+            <FormItem label="主图" name="thumb" rules={[{ required: true, message: '请选择主图' }]}>
+              <UploadImage />
+            </FormItem>
+            <FormItem label="农机图集" name="images">
+              <UploadImageList
+                value={imageList}
+                onChange={setImageList}
+                input={imageInput}
+                output={imageOutput}
+              />
+            </FormItem>
             <FormItem
-              label="农机归属"
+              label="区域"
               name="regionId"
-              rules={[{ required: true, message: '请选择农机归属' }]}
+              rules={[{ required: true, message: '请选择区域' }]}
             >
               <Select style={{ width: '350px' }}>
-                <Option value="6" key="6">
-                  {6}
-                </Option>
-                <Option value="7" key="7">
-                  {7}
-                </Option>
+                {regionList.map((item) => (
+                  <Option value={item.regionId} key={item.regionId}>
+                    {item.name}
+                  </Option>
+                ))}
+              </Select>
+            </FormItem>
+            <FormItem
+              label="归属机构"
+              name="orgId"
+              rules={[{ required: true, message: '请选择归属机构' }]}
+            >
+              <Select style={{ width: '350px' }}>
+                {cooperativeList.map((item) => (
+                  <Option value={item.orgId} key={item.orgId}>
+                    {item.name}
+                  </Option>
+                ))}
               </Select>
             </FormItem>
             <FormItem label="价格" name="price" rules={[{ required: true, message: '请输入价格' }]}>
-              <Input placeholder="请输入价格" style={{ width: '350px' }} />
+              <InputNumber placeholder="请输入价格" style={{ width: '350px' }} />
             </FormItem>
             <FormItem
               label="押金"
               name="deposit"
               rules={[{ required: true, message: '请输入押金' }]}
             >
-              <Input placeholder="请输入押金" style={{ width: '350px' }} />
+              <InputNumber placeholder="请输入押金" style={{ width: '350px' }} />
             </FormItem>
             <FormItem
               label="人工费"
               name="laborCost"
               rules={[{ required: true, message: '请输入人工费' }]}
             >
-              <Input placeholder="请输入人工费" style={{ width: '350px' }} />
+              <InputNumber placeholder="请输入人工费" style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="购买时间" name="buyDate">
+              <DatePicker format="YYYY-MM-DD" onChange={onDateChange} style={{ width: '350px' }} />
+            </FormItem>
+            <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
+              <Select placeholder="请选择是否发布" style={{ width: '350px' }}>
+                <Option value={1}>发布</Option>
+                <Option value={0}>未发布</Option>
+              </Select>
             </FormItem>
             <FormItem label=" " colon={false}>
               <Button type="default" onClick={() => goBack()}>

src/pages/Machinery/Machinery/index.jsx

@@ -1,26 +1,56 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import { history, Link } from 'umi';
-import { Button, Popconfirm, message, Tooltip } from 'antd';
+import { Button, Popconfirm, message, Select, Modal } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-// import { getPersonList, exportPersonList } from '@/services/person';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import moment from 'moment';
 import PageTable from '@/components/PageTable';
+import { getMachineryList, deleteMachinery, updateMachinery } from '@/services/machinery';
 
 const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '';
 };
+const { Option } = Select;
 
 export default (props) => {
+  const actionRef = useRef();
+
+  const gotoEdit = (id) => {
+    const queryStr = id ? `?id=${id}` : '';
+    history.push(`./machinery/edit.jsx${queryStr}`);
+  };
+  const handleDelete = (id) => {
+    deleteMachinery(id).then(() => {
+      message.success('删除成功');
+      actionRef.current.reload();
+    });
+  };
+  //列表切换农机状态方法
+  const handleOK = (record, data) => {
+    const title = record.status
+      ? '您确定要将该农机状态变更为禁用吗? 禁用后该农机将不在移动端显示'
+      : '您确定要将该农机状态变更为启用吗? 启用后该农机可以在移动端显示';
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        updateMachinery(record.machineryId, { ...record, status: record.status === 1 ? 0 : 1 })
+          .then((res) => {
+            message.success('操作成功');
+            actionRef.current.reload();
+          })
+          .catch((err) => {
+            message.error(err);
+          });
+      },
+    });
+  };
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => gotoEdit()}>
       新增农机
     </Button>,
   ];
-  const gotoEdit = (id) => {
-    const queryStr = id ? `?id=${id}` : '';
-    history.push(`./machinery/edit.jsx${queryStr}`);
-  };
   const columns = [
     {
       title: '名称',
@@ -41,53 +71,97 @@ export default (props) => {
       title: '农机价格',
       dataIndex: 'price',
       key: 'price',
+      search: false,
     },
     {
       title: '人工费',
       dataIndex: 'laborCost',
       key: 'laborCost',
+      search: false,
     },
     {
       title: '押金',
       dataIndex: 'deposit',
       key: 'deposit',
+      search: false,
+    },
+    {
+      title: '主图',
+      dataIndex: 'thumb',
+      key: 'thumb',
+      width: 150,
+      render: (t) => <img width={110} src={t} alt="" />,
+      search: false,
     },
     {
       title: '工作状态',
       dataIndex: 'jobStatus',
       key: 'jobStatus',
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            <Option value="1">忙碌</Option>
+            <Option value="0">空闲</Option>
+          </Select>
+        );
+      },
+      render: (_, record) => {
+        return record.jobStatus === 1 ? '忙碌' : '空闲';
+      },
     },
     {
-      title: '状态',
+      title: '发布状态',
       dataIndex: 'status',
       key: 'status',
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            <Option value="1">发布</Option>
+            <Option value="0">未发布</Option>
+          </Select>
+        );
+      },
+      render: (_, record) => {
+        return record.status === 1 ? '发布' : '未发布';
+      },
     },
     {
       title: '操作',
       valueType: 'option',
       render: (_, record) => [
-        <Link key={1} to={`./machinery/edit.jsx`}>
+        <Button style={{ padding: 0 }} type="link" key={1} onClick={() => handleOK(record)}>
+          {record.status === 0 ? '发布' : '取消发布'}
+        </Button>,
+        <Button
+          style={{ padding: 0 }}
+          type="link"
+          key={2}
+          onClick={() => gotoEdit(record.machineryId)}
+        >
           编辑
-        </Link>,
+        </Button>,
         <Popconfirm
-          key={2}
+          key={3}
           title="您是否确认删除 ?"
-          onConfirm={() => handleDelete(record.cooperativeId)}
+          onConfirm={() => handleDelete(record.machineryId)}
           okText="确定"
           cancelText="取消"
         >
-          <a href="#">删除</a>
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
         </Popconfirm>,
       ],
     },
   ];
-  const handleDelete = () => {};
+
   return (
     <PageHeaderWrapper>
       <PageTable
-        // request={getPersonList}
+        request={getMachineryList}
         // expfunc={exportPersonList}
         toolBarRender={actions}
+        actionRef={actionRef}
         columns={columns}
         rowKey="machineryId"
         options={false}

src/pages/Machinery/MachineryType/index.jsx

@@ -28,8 +28,8 @@ export default (props) => {
   //列表切换分类状态方法
   const handleOK = (record, data) => {
     const title = record.status
-      ? '您确定要将该分类状态变更为禁用吗? 禁用后该分类将不能登录'
-      : '您确定要将该分类状态变更为启用吗? 启用后该分类可以登录!';
+      ? '您确定要将该分类状态变更为禁用吗? 禁用后该分类将不能录入农机'
+      : '您确定要将该分类状态变更为启用吗? 启用后该分类可以录入农机';
     Modal.confirm({
       title: title,
       okText: '确认',

src/services/machinery.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request';
+
+/**
+ * 保存农机
+ * @param {*} data
+ * @returns
+ */
+export const addMachinery = (data) => request('/machinery', { method: 'post', data });
+
+/**
+ * 修改农机
+ * @param {*} data
+ * @returns
+ */
+export const updateMachinery = (id, data) => request(`/machinery/${id}`, { method: 'put', data });
+
+/**
+ * 查询农机列表
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryList = (params) => request('/machinery', { params });
+
+/**
+ * 删除农机
+ * @param {*} data
+ * @returns
+ */
+export const deleteMachinery = (id) => request(`/machinery/${id}`, { method: 'delete' });
+
+/**
+ * 查询农机详情
+ * @param {*} params
+ * @returns
+ */
+export const getMachineryDetail = (id) => request(`/machinery/${id}`);