feats

src/pages/Machinery/Machinery/Edit/components/BasicInfo.jsx

@@ -9,6 +9,7 @@ import { addMachinery, updateMachinery, getMachineryDetail } from '@/services/ma
 import { getMachineryTypeList } from '@/services/machineryType';
 import { getRegionList } from '@/services/region';
 import { getCooperativeList } from '@/services/cooperative';
+import { getUserList } from '@/services/user';
 
 const { Option } = Select;
 const FormItem = Form.Item;
@@ -30,6 +31,10 @@ export default (props) => {
   const [regionList, setRegionList] = useState([]);
   //合作社列表
   const [cooperativeList, setCooperativeList] = useState([]);
+  // 当前选择合作社
+  const [orgId, setOrgId] = useState();
+  //
+  const [userList, setUserList] = useState([]);
 
   const onSubmit = (data) => {
     var newData = { ...data };
@@ -101,6 +106,14 @@ export default (props) => {
       });
   }, []);
 
+  useEffect(() => {
+    if (orgId) {
+      getUserList({ orgId, pageSize: 100 }).then((res) => {
+        setUserList(res.records || []);
+      });
+    }
+  }, [orgId]);
+
   useEffect(() => {
     if (id) {
       //编辑时获取基本信息内容
@@ -110,6 +123,7 @@ export default (props) => {
             ...res,
             buyDate: res.buyDate ? moment(res.buyDate, 'YYYY-MM-DD') : null,
           });
+          setOrgId(res.orgId);
         })
         .catch((err) => {
           console.log(err.message);
@@ -160,7 +174,7 @@ export default (props) => {
         name="orgId"
         rules={[{ required: true, message: '请选择归属合作社' }]}
       >
-        <Select style={{ width: '350px' }}>
+        <Select style={{ width: '350px' }} onChange={setOrgId}>
           {cooperativeList.map((item) => (
             <Option value={item.orgId} key={item.orgId}>
               {item.name}
@@ -168,6 +182,15 @@ export default (props) => {
           ))}
         </Select>
       </FormItem>
+      <FormItem label="归属人" name="ownerId">
+        <Select style={{ width: '350px' }}>
+          {userList.map((item) => (
+            <Option value={item.userId} key={item.userId}>
+              {item.userName}
+            </Option>
+          ))}
+        </Select>
+      </FormItem>
       <FormItem label="单价" name="price" rules={[{ required: true, message: '请输入价格' }]}>
         <Money style={{ width: '350px' }} />
       </FormItem>

src/pages/Machinery/Person/index.jsx

@@ -1,20 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react';
-import {
-  Button,
-  Popconfirm,
-  Modal,
-  Form,
-  message,
-  Row,
-  Col,
-} from 'antd';
+import { Button, Popconfirm, Modal, Form, message, Row, Col } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
-import {
-  getUserList,
-  deleteUser,
-  updateUser,
-  getUserDetail,
-} from '@/services/user';
+import { getUserList, deleteUser, updateUser, getUserDetail } from '@/services/user';
 import { getUserRoleList } from '@/services/userRole';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable';
@@ -52,7 +39,7 @@ export default (props) => {
   const handleEdit = (val) => {
     setuserId(val.userId);
     if (!userId && orgId) {
-      form.setFieldsValue({ orgId: orgId })
+      form.setFieldsValue({ orgId: orgId });
     }
     setEditModal(true);
   };
@@ -119,7 +106,7 @@ export default (props) => {
         });
     } else {
       if (orgId) {
-        form.setFieldsValue({ orgId: orgId })
+        form.setFieldsValue({ orgId: orgId });
       } else {
         form.resetFields();
       }
@@ -225,7 +212,7 @@ export default (props) => {
         <Col span={18}>
           <PageTable
             request={getUserList}
-            params={{ org_id: orgId }}
+            params={{ orgId }}
             // expfunc={exportPersonList}
             columns={columns}
             actionRef={actionRef}
@@ -236,8 +223,22 @@ export default (props) => {
           />
         </Col>
       </Row>
-      <UserModal editModal={editModal} onCancel={onCancel} actionRef={actionRef} form={form} orgId={orgId} userId={userId} />
-      <RoleModel rUserId={rUserId} setRUserId={setRUserId} currentCheckbox={currentCheckbox} setCurrentCheckbox={setCurrentCheckbox} editRoleModal={editRoleModal} setEditRoleModal={setEditRoleModal} />
+      <UserModal
+        editModal={editModal}
+        onCancel={onCancel}
+        actionRef={actionRef}
+        form={form}
+        orgId={orgId}
+        userId={userId}
+      />
+      <RoleModel
+        rUserId={rUserId}
+        setRUserId={setRUserId}
+        currentCheckbox={currentCheckbox}
+        setCurrentCheckbox={setCurrentCheckbox}
+        editRoleModal={editRoleModal}
+        setEditRoleModal={setEditRoleModal}
+      />
     </PageHeaderWrapper>
   );
 };

src/pages/OrderManage/dispatch.jsx

@@ -94,7 +94,7 @@ export default (props) => {
           .catch((err) => {
             console.log(err.message);
           });
-        getUserList({ org_id: res.orgId, pageSize: 999 })
+        getUserList({ orgId: res.orgId, pageSize: 999 })
           .then((res3) => {
             setUserList(res3.records);
           })