人员管理优化1.1

config/proxy.js

@@ -12,7 +12,7 @@ export default {
     '/api/': {
       // 要代理的地址
       // target: 'http://127.0.0.1:7080',
-      target: 'http://192.168.89.147:7080',
+      target: 'http://192.168.89.25:7080',
       // target: 'http://machine.njyunzhi.com',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie

src/components/CooperativeSearch/index.jsx

@@ -4,7 +4,7 @@ import { getCooperativeList, getCooperativeDetail } from '@/services/cooperative
 
 const Option = Select.Option;
 export default (props) => {
-  const { value, onChange, ...otherProps } = props;
+  const { value, onChange, disabled, ...otherProps } = props;
 
   const [list, setList] = useState([]);
 
@@ -42,6 +42,7 @@ export default (props) => {
       onSearch={handleSearch}
       onChange={onChange}
       notFoundContent={null}
+      disabled={disabled}
       {...otherProps}
     >
       {list.map((item) => {

src/pages/Machinery/Person/index.jsx

@@ -136,7 +136,7 @@ export default (props) => {
     setEditModal(false);
   };
   // 弹窗表单中合作社搜索框改变事件目前没用
-  const handelChange = () => {};
+  const handelChange = () => { };
 
   // 列表点击编辑按钮
   const handleEdit = (val) => {
@@ -196,6 +196,7 @@ export default (props) => {
     form.resetFields();
     setEditRoleModal(false);
   };
+  //授权角色弹窗点击保存按钮
   const handelOk = () => {
     if (!currentCheckbox) {
       message.info('请选择角色');
@@ -264,6 +265,7 @@ export default (props) => {
         console.log(err.message);
       });
   }, []);
+  //监控
   useEffect(() => {
     if (userId) {
       getUserDetail(userId)
@@ -278,9 +280,13 @@ export default (props) => {
           console.log(err.message);
         });
     } else {
-      form.resetFields();
+      if (orgId) {
+        form.setFieldsValue({ orgId: orgId })
+      } else {
+        form.resetFields();
+      }
     }
-  }, [userId]);
+  }, [orgId, userId]);
 
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={() => setEditModal(true)}>
@@ -413,7 +419,7 @@ export default (props) => {
           <FormItem label="用户名" name="userName" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="性别" name="sex">
+          <FormItem label="性别" name="sex" rules={[{ required: true, message: '请选择' }]}>
             <Radio.Group>
               <Radio value={1}>男</Radio>
               <Radio value={0}>女</Radio>
@@ -436,7 +442,7 @@ export default (props) => {
             <span style={{ opacity: '0.7' }}>默认密码{password}</span>
           </FormItem>
           <FormItem label="所属合作社" name="orgId" rules={[{ required: true, message: '请输入' }]}>
-            <Search placeholder="请输入合作社" onChange={handelChange} />
+            <Search placeholder="请输入合作社" disabled={orgId && !userId ? true : false} onChange={handelChange} />
           </FormItem>
           {userId && (
             <FormItem