选择成员样式修复

src/pages/PurchaseAdmin/PurchaseList/Approval/ApprovalModal.js

@@ -119,36 +119,6 @@ function AddModal(props) {
     });
   };
 
-  const renderUserSelectTreeNodes = data => {
-    return data.map(item => {
-      if (item.children) {
-        return (
-          <TreeNode
-            title={item.title}
-            key={item.key}
-            value={item.manage || item.value}
-            dataRef={item}
-            selectable={item.selectable}
-          >
-            {renderUserSelectTreeNodes(item.children)}
-          </TreeNode>
-        );
-      }
-      return (
-        <TreeNode
-          title={item.title}
-          key={item.ID}
-          value={item.manage || item.value}
-          selectable={item.selectable}
-        />
-      );
-    });
-  };
-
-  const onChangeManager = e => {
-    console.log(e);
-  };
-
   const renderDetail = () => {
     return (
       <>
@@ -312,10 +282,8 @@ function AddModal(props) {
               filterTreeNode={(input, option) => {
                 return option.props.title === input;
               }}
-              onChange={onChangeManager}
-            >
-              {renderUserSelectTreeNodes(depUserTree)}
-            </TreeSelect>
+              treeData={depUserTree}
+            />
           </Form.Item>
         )}
         {type?.id != 7 && renderDetail()}

src/pages/PurchaseAdmin/PurchaseList/Approval/ExecutionModal.js

@@ -23,37 +23,7 @@ function ExecutionModal(props) {
       });
     });
   };
-
-  const onChangeManager = (id, e) => {
-    console.log(id);
-  };
-
-  const renderUserSelectTreeNodes = data => {
-    return data.map(item => {
-      if (item.children) {
-        return (
-          <TreeNode
-            title={item.title}
-            key={item.key}
-            value={item.manage || item.value}
-            dataRef={item}
-            selectable={item.selectable}
-          >
-            {renderUserSelectTreeNodes(item.children)}
-          </TreeNode>
-        );
-      }
-      return (
-        <TreeNode
-          title={item.title}
-          key={item.ID}
-          value={item.manage || item.value}
-          selectable={item.selectable}
-        />
-      );
-    });
-  };
-
+  
   return (
     <Modal
       title="转执行"
@@ -79,10 +49,8 @@ function ExecutionModal(props) {
             filterTreeNode={(input, option) => {
               return option.props.title === input;
             }}
-            onChange={onChangeManager}
-          >
-            {renderUserSelectTreeNodes(depUserTree)}
-          </TreeSelect>
+            treeData={depUserTree}
+          />
         </Form.Item>
 
         <Form.Item

src/pages/PurchaseAdmin/PurchaseList/Approval/MemberModal.js

@@ -1,27 +1,8 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Modal, TreeSelect, Table, Button } from 'antd';
+import { Form, Modal, TreeSelect, Table, Button, Input } from 'antd';
 import { connect } from 'dva';
 const { TreeNode } = TreeSelect;
 
-//测试用临时数据
-const tempData = [
-  {
-    name: 'aaa',
-    phone: '111',
-    email: 'aaa@a.com',
-  },
-  {
-    name: 'bbb',
-    phone: '222',
-    email: 'bbb@b.com',
-  },
-  {
-    name: 'ccc',
-    phone: '333',
-    email: 'ccc@c.com',
-  },
-];
-
 function MemberModal(props) {
   const { visible, onClose, currentItem, loading, depUserTree, dataSource, dispatch } = props;
   const [form] = Form.useForm();
@@ -51,32 +32,6 @@ function MemberModal(props) {
     },
   ];
 
-  const renderUserSelectTreeNodes = data => {
-    return data.map(item => {
-      if (item.children) {
-        return (
-          <TreeNode
-            title={item.title}
-            key={item.key}
-            value={item.value}
-            dataRef={item}
-            selectable={item.selectable}
-          >
-            {renderUserSelectTreeNodes(item.children)}
-          </TreeNode>
-        );
-      }
-      return (
-        <TreeNode
-          title={item.title}
-          key={item.ID}
-          value={item.value}
-          selectable={item.selectable}
-        />
-      );
-    });
-  };
-
   const onDelete = item => {
     Modal.confirm({
       title: '移除成员',
@@ -99,11 +54,14 @@ function MemberModal(props) {
         type: 'approval/addMember',
         payload: {
           project_code_id: currentItem.id,
-          user_id: memberID,
+          user_id: Number(memberID.split('||')[0]),
+        },
+        callback: () => {
+          form.resetFields();
         },
       });
     });
-    form.resetFields();
+    // form.resetFields();
   };
 
   return (
@@ -125,19 +83,23 @@ function MemberModal(props) {
         layout="inline"
         form={form}
       >
-        <Form.Item label="添加成员" name="memberID" initialValue={null}>
+        <Form.Item
+          label="添加成员"
+          name="memberID"
+          initialValue={null}
+          rules={[{ required: true, message: '请选择成员' }]}
+        >
           <TreeSelect
             showSearch
             allowClear
             style={{ width: 240 }}
             placeholder="请选择项目成员"
             multiple={false}
+            treeData={depUserTree}
             filterTreeNode={(input, option) => {
               return option.props.title === input;
             }}
-          >
-            {renderUserSelectTreeNodes(depUserTree)}
-          </TreeSelect>
+          />
         </Form.Item>
         <Form.Item>
           <Button type="primary" loading={loading} onClick={handleAddMember}>

src/pages/PurchaseAdmin/PurchaseList/Approval/QualityOperateModal.js

@@ -36,36 +36,6 @@ function QualityOperateModal(props) {
     });
   };
 
-  const onChangeManager = (id, e) => {
-    console.log(id);
-  };
-
-  const renderUserSelectTreeNodes = data => {
-    return data.map(item => {
-      if (item.children) {
-        return (
-          <TreeNode
-            title={item.title}
-            key={item.key}
-            value={item.manage || item.value}
-            dataRef={item}
-            selectable={item.selectable}
-          >
-            {renderUserSelectTreeNodes(item.children)}
-          </TreeNode>
-        );
-      }
-      return (
-        <TreeNode
-          title={item.title}
-          key={item.ID}
-          value={item.manage || item.value}
-          selectable={item.selectable}
-        />
-      );
-    });
-  };
-
   return (
     <Modal
       title={qualityOperate ? '转运营' : '转质保'}
@@ -93,10 +63,8 @@ function QualityOperateModal(props) {
             filterTreeNode={(input, option) => {
               return option.props.title === input;
             }}
-            onChange={onChangeManager}
-          >
-            {renderUserSelectTreeNodes(depUserTree)}
-          </TreeSelect>
+            treeData={depUserTree}
+          ></TreeSelect>
         </Form.Item>
       </Form>
     </Modal>

src/pages/PurchaseAdmin/PurchaseList/Approval/models/approval.js

@@ -29,16 +29,15 @@ function getDepUserTree(data) {
 
   if (data.children) {
     data.children.forEach(item => {
-      getDepUserTree(item, false);
+      getDepUserTree(item);
     });
   }
 
   if (data.Users && data.Users.length !== 0) {
     data.Users.forEach(item => {
       item.title = item.CName;
-      item.key = item.ID;
-      item.value = item.ID;
-      item.manage =  item.ID + "||" + data.ID
+      item.key = item.ID + '||' + data.ID;
+      item.value = item.ID + '||' + data.ID;
       item.selectable = true;
       item.DepId = data.ID;
       data.children.push(item);