Przeglądaj źródła

修改项目经理调整

XuZinan 2 lat temu
rodzic
commit
e1ab7e8ff2

+ 7 - 1
src/pages/PurchaseAdmin/PurchaseList/Approval/List.js

@@ -28,6 +28,7 @@ function List(props) {
     data,
     flowList,
     currentUser,
+    permission,
     dispatch,
     loading,
     depUserTree,
@@ -462,7 +463,11 @@ function List(props) {
         修改项目经理
       </a>
     );
-    if (project_status === 0 || project_status === 5) dividerPush(modifyManager, toReturn);
+    if (
+      (project_status === 0 || project_status === 1) &&
+      (permission['func-01-point-pm-list-change'] || currentUser.IsSuper)
+    )
+      dividerPush(modifyManager, toReturn);
     return toReturn;
   };
 
@@ -581,6 +586,7 @@ export default connect(({ approval, user, loading }) => ({
   flowList: approval.flowList,
   industryList: approval.industryList,
   currentUser: user.currentUser,
+  permission: user.currentUser.Permission,
   loading: loading.models.approval,
   depUserTree: approval.depUserTree,
   member: approval.member,

+ 5 - 3
src/pages/PurchaseAdmin/PurchaseList/Approval/ModifyManagerModal.js

@@ -11,14 +11,16 @@ function ModifyManagerModal(props) {
   // }, []);
   const handleOk = () => {
     form.validateFields().then(({ managerID }) => {
-      console.log(managerID,currentItem);
+      console.log(managerID, currentItem);
       const [user_id, dep_id] = managerID.split('||');
       dispatch({
         type: 'approval/modifyManager',
         payload: {
           user_id: Number(user_id),
-          flag: Number(currentItem?.project_status),
-          project_id: Number(currentItem?.id)
+          //project_status为0时为售前项目,flag填5
+          //project_status为1时为执行项目,flag填0
+          flag: currentItem?.project_status == 0 ? 5 : 0,
+          project_id: Number(currentItem?.id),
         },
         callback: () => onOk?.(),
       });