添加从某某角色中选择人

src/pages/PurchaseAdmin/PurchaseList/Detail/ApprovalProcess.tsx

@@ -13,11 +13,10 @@ enum TYPR {
 }
 
 const ApprovalProcess = props => {
-  const { id, approvalProcess, userList, onChange } = props;
+  const { id, approvalProcess, userList, onChange, roleList = [] } = props;
   const [selectUserList, setSelectUserList] = useState([]);
   const [curNodeIdx, setCurNodeIdx] = useState(-1);
   const [loading, setLoading] = useState(false);
-  // console.log(approvalProcess);
 
   const list = approvalProcess[id];
   list?.forEach(item => {
@@ -85,7 +84,9 @@ const ApprovalProcess = props => {
               ) : null
               // <PlusOutlined />
             }
-            title={item[0]?.name}
+            title={
+              item[0]?.name || `从${roleList?.find(cur => cur.ID == item[0]?.value)?.Name}选择`
+            }
           />
         ))}
       </Steps>
@@ -97,4 +98,5 @@ const ApprovalProcess = props => {
 };
 export default connect(({ xflow, detail, user }) => ({
   userList: user.list,
+  roleList: user.roleList,
 }))(ApprovalProcess);

src/pages/PurchaseAdmin/PurchaseList/Detail/CommitAuditModal.js

@@ -509,7 +509,7 @@ function CommitAuditModal(props) {
           <TabPane tab={item.name} key={`${idx}_${item.title}`}>
             <Row>
               <Col span={17}>{item.FormComponents}</Col>
-              <Col offset={1} span={4}>
+              <Col offset={1} span={6}>
                 {!approvalProcess[item.nodeId] ? ( //!formComponentValues[item.nodeId] ||
                   <Empty description="请先填写表单" />
                 ) : (
@@ -518,15 +518,7 @@ function CommitAuditModal(props) {
                     approvalProcess={approvalProcess}
                     onChange={setApprovalProcess}
                   />
-                )
-                // <AuditFlow
-                //   processCode={item.formCode}
-                //   formComponentValues={formComponentValues[item.nodeId]}
-                //   direction={'vertical'}
-                //   deptId={'14237557'}
-                //   userId={currentUser.DingUserId || getCurrentUser()?.DingUserId}
-                // />
-                }
+                )}
               </Col>
             </Row>
           </TabPane>

src/pages/PurchaseAdmin/PurchaseList/Detail/Index.js

@@ -950,7 +950,9 @@ function Detail(props) {
       callback,
     });
   };
-
+  dispatch({
+    type: 'user/getRoleList',
+  });
   useEffect(() => {
     dispatch({
       type: 'detail/queryProjectRecord',

src/pages/PurchaseAdmin/PurchaseList/Flow/models/flow.js

@@ -255,6 +255,8 @@ export default {
     },
     *queryProcessFlows({ payload }, { call, put }) {
       const data = yield call(queryProcessFlows, payload);
+      console.log(data);
+      console.log(JSON.parse(data[0].form_json));
       if (data && data.length > 0) {
         yield put({
           type: 'save',