模型送审

src/model/datamodel.js

@@ -720,8 +720,8 @@ export function* getForkEasyDataModelerDataModelDistributions(payload) {
   return yield call(datamodelerService.getForkEasyDataModelerDataModelDistributions, payload)
 }
 
-export function* getCooperationUsers() {
-  return yield call(datamodelerService.getCooperationUsers)
+export function* getCooperationUsers(payload) {
+  return yield call(datamodelerService.getCooperationUsers, payload)
 }
 
 export function* getCooperatorCandidates(payload) {

src/service/datamodeler.js

@@ -709,8 +709,8 @@ export function approvalDeleteFile(payload) {
 }
 
 /*协同工作*/
-export function getCooperationUsers() {
-  return GetJSON("/datamodeler/easyDataModelerCooperation/users")
+export function getCooperationUsers(payload) {
+  return GetJSON("/datamodeler/easyDataModelerCooperation/users", payload)
 }
 
 //权限共享

src/view/Manage/Model/Component/start-flow.jsx

@@ -92,9 +92,6 @@ export default FC
 
 const Basic = React.forwardRef(function ({}, ref) {
   const [uploading, setUploading] = React.useState(false)
-  const [loadingUsers, setLoadingUsers] = React.useState(false)
-  const [users, setUsers] = React.useState()
-
   const [form] = Form.useForm()
 
   React.useImperativeHandle(ref, () => ({
@@ -108,27 +105,9 @@ const Basic = React.forwardRef(function ({}, ref) {
     uploading,
   }), [form, uploading])
 
-  React.useEffect(() => {
-    getUsers()
-  }, [])
-
   const marginBottom = React.useMemo(() => {
     return 15
   }, [])
-
-  const getUsers = () => {
-    setLoadingUsers(true)
-    dispatch({
-      type: 'datamodel.getCooperationUsers',
-      callback: data => {
-        setLoadingUsers(false)
-        setUsers(data)
-      },
-      error: () => {
-        setLoadingUsers(false)
-      }
-    })
-  }
  
   const onValuesChange = (changedValues, allValues) => {
 
@@ -187,7 +166,7 @@ const Basic = React.forwardRef(function ({}, ref) {
         style={{ marginBottom }}
         rules={[{ required: true, message: '请选择设计评审人员!' }]}
       >
-        <DesignUsersItem loading={loadingUsers} users={users} />
+        <DesignUsersItem />
       </Form.Item>
 
       <Form.Item
@@ -210,7 +189,7 @@ const Basic = React.forwardRef(function ({}, ref) {
           }
         }]}
       >
-        <RuleReviewItem loading={loadingUsers} users={users} />
+        <RuleReviewItem />
       </Form.Item>
 
       <Form.Item
@@ -232,21 +211,40 @@ const Basic = React.forwardRef(function ({}, ref) {
   )
 })
 
-const RuleReviewItem = ({ value = {}, onChange, loading, users }) => {
+const RuleReviewItem = ({ value = {}, onChange }) => {
+  const [loading, setLoading] = React.useState(false)
   const [ruleReviewSelected, setRuleReviewSelected] = React.useState()
   const [searchValue, setSearchValue] = React.useState()
   const [options, setOptions] = React.useState()
 
   useDebounceEffect(() => {
-    setOptions(
-      (users??[])
-        .filter(item => !searchValue|| (item.name??'').indexOf(searchValue)!==-1 || (item.dname??'').indexOf(searchValue)!==-1)
-        .map(item => ({
-          label: item.name,
-          value: item.name,
-        }))
-    )
-  }, [searchValue, users], { wait: 300 })
+    if (searchValue) {
+      getUsers()
+    }
+  }, [searchValue], { wait: 300 })
+
+  const getUsers = () => {
+    setLoading(true)
+    dispatch({
+      type: 'datamodel.getCooperationUsers',
+      payload: {
+        match: searchValue,
+      },
+      callback: data => {
+        setLoading(false)
+        setOptions(
+          (data??[]).map(item => ({
+            label: `${item.dname}(${item.name})`,
+            value: item.name,
+            ...item
+          }))
+        )
+      },
+      error: () => {
+        setLoading(false)
+      }
+    })
+  }
 
   const triggerChange = (changedValue) => {
     onChange?.({
@@ -279,7 +277,7 @@ const RuleReviewItem = ({ value = {}, onChange, loading, users }) => {
             options={options}
             onChange={(val) => {
               triggerChange({
-                standardApprovalUserList: (users??[])
+                standardApprovalUserList: (options??[])
                 .filter(item => val===item.name)
               })
             }}
@@ -392,20 +390,39 @@ const List = React.forwardRef(function ({ items }, ref) {
   )
 })
 
-const DesignUsersItem = ({ value, onChange, loading, users }) => {
+const DesignUsersItem = ({ value, onChange }) => {
+  const [loading, setLoading] = React.useState(false)
   const [searchValue, setSearchValue] = React.useState()
   const [options, setOptions] = React.useState()
 
   useDebounceEffect(() => {
-    setOptions(
-      (users??[])
-        .filter(item => !searchValue|| (item.name??'').indexOf(searchValue)!==-1 || (item.dname??'').indexOf(searchValue)!==-1)
-        .map(item => ({
-          label: item.name,
-          value: item.name,
-        }))
-    )
-  }, [searchValue, users], { wait: 300 })
+    if (searchValue) {
+      getUsers()
+    }
+  }, [searchValue], { wait: 300 })
+
+  const getUsers = () => {
+    setLoading(true)
+    dispatch({
+      type: 'datamodel.getCooperationUsers',
+      payload: {
+        match: searchValue,
+      },
+      callback: data => {
+        setLoading(false)
+        setOptions(
+          (data??[]).map(item => ({
+            label: `${item.dname}(${item.name})`,
+            value: item.name,
+            ...item
+          }))
+        )
+      },
+      error: () => {
+        setLoading(false)
+      }
+    })
+  }
 
   return (
     <Select showSearch loading={loading} allowClear
@@ -422,7 +439,7 @@ const DesignUsersItem = ({ value, onChange, loading, users }) => {
       options={options}
       onChange={(val) => {
         onChange?.(
-          (users??[])
+          (options??[])
           .filter(item => val===item.name)
         )
       }}

src/view/Manage/ModelReview/index.jsx

@@ -126,8 +126,8 @@ const FC = (props) => {
             <h3>模型评审流程</h3>
           </div>
           <Descriptions bordered size='small' column={2}>
-            <Descriptions.Item label="流程名称">{data?.creator?.userName?`${data?.creator?.userName}发起的物理模型评审流程`:''}</Descriptions.Item>
-            <Descriptions.Item label="送审人">{data?.creator?.userName}</Descriptions.Item>
+            <Descriptions.Item label="流程名称">{data?.creator?.userName?`${data?.creator?.userCnName}(${data?.creator?.userName})发起的物理模型评审流程`:''}</Descriptions.Item>
+            <Descriptions.Item label="送审人">{`${data?.creator?.userCnName}(${data?.creator?.userName})`}</Descriptions.Item>
             <Descriptions.Item label="当前环节">{type==='design'?'设计评审':'规范评审'}</Descriptions.Item>
             <Descriptions.Item label="送审时间">{data?.createdTs?new Date(data?.createdTs).toLocaleString():''}</Descriptions.Item>
             <Descriptions.Item label="送审说明">{data?.sendReviewExplain}</Descriptions.Item>