.

config/routes.js

@@ -79,16 +79,16 @@ export default [
     component: '../layouts/BasicLayout',
     routes: [
       {
-        path: '/Machinery/GPS',
-        name: '设备管理',
-        access: 'device',
-        component: './Machinery/GPS',
+        path: '/Machinery/Org',
+        name: '合作社列表',
+        access: 'org',
+        component: './Machinery/Org',
       },
       {
-        path: '/Machinery/GPS/edit.jsx',
-        name: '设备编辑',
-        component: './Machinery/GPS/edit.jsx',
-        hideInMenu: true,
+        path: '/Machinery/Person',
+        name: '人员管理',
+        access: 'user',
+        component: './Machinery/Person',
       },
       {
         path: '/Machinery/MachineryType',
@@ -108,6 +108,18 @@ export default [
         component: './Machinery/Machinery/edit.jsx',
         hideInMenu: true,
       },
+      {
+        path: '/Machinery/GPS',
+        name: '设备管理',
+        access: 'device',
+        component: './Machinery/GPS',
+      },
+      {
+        path: '/Machinery/GPS/edit.jsx',
+        name: '设备编辑',
+        component: './Machinery/GPS/edit.jsx',
+        hideInMenu: true,
+      },
       {
         path: '/Machinery/GIS',
         name: '农机GIS',
@@ -240,24 +252,12 @@ export default [
         access: 'region',
         component: './SystemManagement/Region',
       },
-      {
-        path: '/SystemManagement/Cooperative',
-        name: '机构列表',
-        access: 'org',
-        component: './SystemManagement/Cooperative',
-      },
       {
         path: '/SystemManagement/UserRights',
         name: '角色管理',
         access: 'role',
         component: './SystemManagement/UserRights',
       },
-      {
-        path: '/SystemManagement/Administrator',
-        name: '人员管理',
-        access: 'user',
-        component: './SystemManagement/Administrator',
-      },
       {
         path: '/SystemManagement/BasicParameters',
         name: '基本参数',

src/pages/JobStatistics/Order/index.jsx

@@ -38,7 +38,7 @@ export default (props) => {
   }, []);
   const columns = [
     {
-      title: '机构',
+      title: '合作社',
       dataIndex: 'orgId',
       key: 'orgId',
       hideInTable: true,
@@ -83,7 +83,7 @@ export default (props) => {
       }
     },
     {
-      title: '机构名',
+      title: '合作社名',
       dataIndex: 'orgName',
       key: 'orgName',
       search: false
@@ -102,8 +102,8 @@ export default (props) => {
     },
     {
       title: '下单人',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'personName',
+      key: 'personName',
     },
     {
       title: '手机号',
@@ -144,7 +144,8 @@ export default (props) => {
       valueType: 'select',
       valueEnum: {
         0: { text: '待付款' },
-        1: { text: '已付款' }
+        1: { text: '已付款' },
+        '-1': { text: '已退单' }
       },
     },
     {

src/pages/Machinery/Machinery/edit.jsx

@@ -28,7 +28,7 @@ export default (props) => {
   const [machineryTypeList, setMachineryTypeList] = useState([]);
   //区域列表
   const [regionList, setRegionList] = useState([]);
-  //机构列表
+  //合作社列表
   const [cooperativeList, setCooperativeList] = useState([]);
 
   const Submit = (data) => {
@@ -145,9 +145,9 @@ export default (props) => {
               </Select>
             </FormItem>
             <FormItem
-              label="归属机构"
+              label="归属合作社"
               name="orgId"
-              rules={[{ required: true, message: '请选择归属机构' }]}
+              rules={[{ required: true, message: '请选择归属合作社' }]}
             >
               <Select style={{ width: '350px' }}>
                 {cooperativeList.map((item) => (

src/pages/Machinery/Machinery/index.jsx

@@ -6,12 +6,14 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
 import { getMachineryList, deleteMachinery, updateMachinery } from '@/services/machinery';
 import { getMachineryTypeList } from '@/services/machineryType';
+import { getCooperativeList } from '@/services/cooperative';
 
 const { Option } = Select;
 
 export default (props) => {
   const actionRef = useRef();
   const [machineryTypeList, setMachineryTypeList] = useState([]);
+  const [cooperativeList, setCooperativeList] = useState([]);
 
   const gotoEdit = (id) => {
     const queryStr = id ? `?id=${id}` : '';
@@ -45,6 +47,9 @@ export default (props) => {
     });
   };
   useEffect(() => {
+    getCooperativeList().then((res) => {
+      setCooperativeList(res.records);
+    });
     getMachineryTypeList().then((res) => {
       setMachineryTypeList(res.records);
     });
@@ -55,11 +60,34 @@ export default (props) => {
     </Button>,
   ];
   const columns = [
+    {
+      title: '合作社',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      hideInTable: true,
+      renderFormItem: (item, field, form) => {
+        return (
+          <Select>
+            {cooperativeList.map((item) => (
+              <Option value={item.orgId} key={item.orgId}>
+                {item.name}
+              </Option>
+            ))}
+          </Select>
+        )
+      }
+    },
     {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
     },
+    {
+      title: '合作社',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false
+    },
     {
       title: '农机类型',
       dataIndex: 'typeId',

src/pages/SystemManagement/Cooperative/index.jsx → src/pages/Machinery/Org/index.jsx

@@ -23,17 +23,17 @@ export default (props) => {
   //列表数据
   const [data, setData] = useState([]);
 
-  //机构Id
+  //合作社Id
   const [orgId, setOrgId] = useState('');
   const [form] = Form.useForm();
-  //机构表单数据
+  //合作社表单数据
   const [listForm, setListForm] = useState({});
   //确定按钮loading框防连点
   const [loading, setLoading] = useState(false);
   //记录定位信息
   const [newLocName, setLocName] = useState('');
   const [newAddress, setAddress] = useState('');
-  //机构所属区域列表
+  //合作社所属区域列表
   const [regionList, setRegionList] = useState([]);
 
   //选中左侧列表右侧显示详情
@@ -152,9 +152,9 @@ export default (props) => {
           <Card
             title="列表"
             extra={
-              <a href="#" onClick={() => setOrgId()}>
+              <Button type='link' onClick={() => setOrgId()}>
                 添加
-              </a>
+              </Button>
             }
           >
             <Tree className="treeClass" titleRender={(data) => handelNode(data)} treeData={data} />
@@ -164,12 +164,12 @@ export default (props) => {
           <Card title="详情">
             <Form {...formItemLayout} onFinish={Submit} form={form}>
               <FormItem
-                label="机构名"
+                label="合作社名"
                 name="name"
-                rules={[{ required: true, message: '请输入机构名称16个字符以内' }]}
+                rules={[{ required: true, message: '请输入合作社名称16个字符以内' }]}
               >
                 <Input
-                  placeholder="请输入机构名称16个字符以内"
+                  placeholder="请输入合作社名称16个字符以内"
                   maxLength="16"
                   style={{ width: '350px' }}
                 />

src/pages/SystemManagement/Administrator/index.jsx → src/pages/Machinery/Person/index.jsx

@@ -120,8 +120,8 @@ export default (props) => {
     form.resetFields();
     setEditModal(false);
   };
-  // 弹窗表单中机构搜索框改变事件目前没用
-  const handelChange = () => {};
+  // 弹窗表单中合作社搜索框改变事件目前没用
+  const handelChange = () => { };
 
   // 列表点击编辑按钮
   const handleEdit = (val) => {
@@ -220,7 +220,7 @@ export default (props) => {
     getDefaultPassword().then((res) => {
       setPassWord(res);
     });
-    //获取机构列表数据
+    //获取合作社列表数据
     getCooperativeList().then((res) => {
       setCooperativeList(res.records);
       const list = res.records?.map((item) => {
@@ -331,7 +331,7 @@ export default (props) => {
     <PageHeaderWrapper>
       <Row gutter={16}>
         <Col span={6}>
-          <Card title="机构列表">
+          <Card title="合作社列表">
             <Tree
               onSelect={onSelect}
               className="treeClass"
@@ -392,10 +392,10 @@ export default (props) => {
               <span style={{ opacity: '0.7' }}>默认密码{password}</span>
             </Input.Group>
           </FormItem>
-          <FormItem label="所属机构" name="orgId" rules={[{ required: true, message: '请输入' }]}>
-            <Search placeholder="请选择机构" onChange={handelChange} />
+          <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
+            <Search placeholder="请选择合作社" onChange={handelChange} />
             {/* <Select
-              placeholder="请选择机构"
+              placeholder="请选择合作社"
               showSearch
               onSearch={handelFormSearch}
               onChange={handelFormSearch}

src/pages/OrderManage/OrderList/index.jsx

@@ -25,7 +25,9 @@ const orderStates = (item) => {
     return '待评价'
   } if (item.workStatus === 3 && item.isEvaluated === 1) {
     return '已完成'
-  } else if (item.payStatus === 1 && item.workStatus === 0 && item.isRefund === 1) {
+  } else if (item.payStatus === 3) {
+    return '退单申请中'
+  } else if (item.status === 9) {
     return '已退单'
   } else {
     return '异常'
@@ -44,7 +46,7 @@ export default (props) => {
   }, []);
   const columns = [
     {
-      title: '机构',
+      title: '合作社',
       dataIndex: 'orgId',
       key: 'orgId',
       hideInTable: true,
@@ -89,7 +91,7 @@ export default (props) => {
       }
     },
     {
-      title: '机构名',
+      title: '合作社名',
       dataIndex: 'orgName',
       key: 'orgName',
       search: false
@@ -108,8 +110,8 @@ export default (props) => {
     },
     {
       title: '下单人',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'personName',
+      key: 'personName',
     },
     {
       title: '手机号',

src/pages/OrderManage/dispatch.jsx

@@ -105,7 +105,7 @@ export default (props) => {
             <FormItem label="预约时间">
               {dispatch?.appointmentDate}
             </FormItem>
-            <FormItem label="机构名">
+            <FormItem label="合作社名">
               {dispatch?.orgName}
             </FormItem>
             <FormItem label="农机类型">

src/pages/OrderManage/index.jsx

@@ -45,7 +45,7 @@ export default (props) => {
   }, []);
   const columns = [
     {
-      title: '机构',
+      title: '合作社',
       dataIndex: 'orgId',
       key: 'orgId',
       hideInTable: true,
@@ -74,7 +74,7 @@ export default (props) => {
     },
 
     {
-      title: '机构名',
+      title: '合作社名',
       dataIndex: 'orgName',
       key: 'orgName',
       search: false
@@ -149,7 +149,6 @@ export default (props) => {
       key: 'dispatchStatus',
       valueType: 'select',
       valueEnum: {
-        '': { text: '不限', status: 'Default' },
         0: { text: '待调度' },
         1: { text: '已调度' }
       },

src/services/cooperative.js

@@ -1,35 +1,35 @@
 import request from '@/utils/request';
 
 /**
- * 保存组织机构
+ * 保存组织合作社
  * @param {*} data
  * @returns
  */
 export const addCooperative = (data) => request('/org', { method: 'post', data });
 
 /**
- * 修改组织机构
+ * 修改组织合作社
  * @param {*} data
  * @returns
  */
 export const updateCooperative = (id, data) => request(`/org/${id}`, { method: 'put', data });
 
 /**
- * 查询组织机构列表
+ * 查询组织合作社列表
  * @param {*} params
  * @returns
  */
 export const getCooperativeList = (params) => request('/org', { params });
 
 /**
- * 删除组织机构
+ * 删除组织合作社
  * @param {*} data
  * @returns
  */
 export const deleteCooperative = (id) => request(`/org/${id}`, { method: 'delete' });
 
 /**
- * 查询组织机构详情
+ * 查询组织合作社详情
  * @param {*} params
  * @returns
  */