基础搭建

src/models/user.js

@@ -1,8 +1,6 @@
-import {
-  query as queryUsers,
-} from '@/services/user';
+import { query as queryUsers } from '@/services/user';
 import { queryDepV2 } from '@/services/approval';
-import {  queryRole } from '@/services/SysAdmin';
+import { queryRole } from '@/services/SysAdmin';
 
 function getDepUserTree(data) {
   data.title = `${data.Name}`;
@@ -12,13 +10,13 @@ function getDepUserTree(data) {
   if (!data.children) data.children = new Array();
 
   if (data.children) {
-    data.children.forEach(item => {
+    data.children.forEach((item) => {
       getDepUserTree(item);
     });
   }
 
   if (data.Users && data.Users.length !== 0) {
-    data.Users.forEach(item => {
+    data.Users.forEach((item) => {
       item.title = item.CName;
       item.id = item.ID + '||' + data.ID;
       item.value = item.ID + '||' + data.ID;
@@ -30,10 +28,10 @@ function getDepUserTree(data) {
   return data;
 }
 
-const getRoleList = data => {
+const getRoleList = (data) => {
   let roleList = [];
-  (data || []).forEach(dep => {
-    (dep.Role || []).forEach(role => {
+  (data || []).forEach((dep) => {
+    (dep.Role || []).forEach((role) => {
       roleList.push(role);
     });
 
@@ -67,6 +65,27 @@ export default {
         });
       }
     },
+    *getRoleList({ payload }, { call, put }) {
+      const response = yield call(queryRole, payload);
+      if (response) {
+        yield put({
+          type: 'saveState',
+          payload: { roleList: response.data.list },
+        });
+      }
+    },
+    *fetchDepV2({ payload, callback }, { call, put }) {
+      const response = yield call(queryDepV2, { pageSize: 999999 });
+      if (response) {
+        const depUserTree = response.data.list.map((item) => {
+          return getDepUserTree(item);
+        });
+        yield put({
+          type: 'saveState',
+          payload: { depUserTree },
+        });
+      }
+    },
     // *fetchCurrent(_, { call, put }) {
     //   const response = yield call(queryCurrent);
     //   if (response) {
@@ -137,28 +156,6 @@ export default {
     //   console.log(payload);
     //   yield call(SetNotificationRead, payload);
     // },
-
-    *getRoleList({ payload }, { call, put }) {
-      const response = yield call(queryRole, payload);
-      if (response) {
-        yield put({
-          type: 'saveState',
-          payload: { roleList: response.data.list },
-        });
-      }
-    },
-    *fetchDepV2({ payload, callback }, { call, put }) {
-      const response = yield call(queryDepV2, { pageSize: 999999 });
-      if (response) {
-        const depUserTree = response.data.list.map(item => {
-          return getDepUserTree(item);
-        });
-        yield put({
-          type: 'saveState',
-          payload: { depUserTree },
-        });
-      }
-    },
   },
 
   reducers: {

src/pages/Flow/models/flow.js

@@ -1,46 +1,46 @@
 import {
   queryAuditList,
   addAudit,
-  addAuditNode,
-  addFlow,
-  queryBoomFlowDetail,
-  updateNode,
-  queryFlowList,
-  queryDingTemplateList,
-  saveAuditFlowInfo,
-  queryDepV2,
   queryProcessFlows,
-  queryDefaultBindClassify,
+  saveAuditFlowInfo,
+  // addAuditNode,
+  // addFlow,
+  // queryBoomFlowDetail,
+  // updateNode,
+  // queryFlowList,
+  // queryDingTemplateList,
+  // queryDepV2,
+  // queryDefaultBindClassify,
 } from '@/services/boom';
-import { queryApproval } from '@/services/approval';
-import { queryRole } from '@/services/SysAdmin';
+// import { queryApproval } from '@/services/approval';
+// import { queryRole } from '@/services/SysAdmin';
 import { message } from 'antd';
 
-function getDepUserTree(data) {
-  data.title = `${data.Name}`;
-  data.id = data.ID;
-  data.value = data.ID;
-  // data.selectable = false;
-  if (!data.children) data.children = new Array();
+// function getDepUserTree(data) {
+//   data.title = `${data.Name}`;
+//   data.id = data.ID;
+//   data.value = data.ID;
+//   // data.selectable = false;
+//   if (!data.children) data.children = new Array();
 
-  if (data.children) {
-    data.children.forEach((item) => {
-      getDepUserTree(item);
-    });
-  }
+//   if (data.children) {
+//     data.children.forEach((item) => {
+//       getDepUserTree(item);
+//     });
+//   }
 
-  if (data.Users && data.Users.length !== 0) {
-    data.Users.forEach((item) => {
-      item.title = item.CName;
-      item.id = item.ID + '||' + data.ID;
-      item.value = item.ID + '||' + data.ID;
-      // item.selectable = true;
-      item.DepId = data.ID;
-      data.children.push(item);
-    });
-  }
-  return data;
-}
+//   if (data.Users && data.Users.length !== 0) {
+//     data.Users.forEach((item) => {
+//       item.title = item.CName;
+//       item.id = item.ID + '||' + data.ID;
+//       item.value = item.ID + '||' + data.ID;
+//       // item.selectable = true;
+//       item.DepId = data.ID;
+//       data.children.push(item);
+//     });
+//   }
+//   return data;
+// }
 
 const getFlowDetail = (data) => {
   const groups = {
@@ -148,6 +148,59 @@ export default {
   },
 
   effects: {
+    *queryAuditList({ payload }, { call, put }) {
+      try {
+        const response = yield call(queryAuditList, payload);
+        yield put({
+          type: 'save',
+          payload: {
+            auditList: response.data.map((item) => ({
+              ...item,
+              id: item.list.id,
+            })),
+          },
+        });
+      } catch (error) {}
+    },
+    *addAudit({ payload, callback }, { call, put }) {
+      try {
+        yield call(addAudit, payload);
+        message.success('新增成功');
+        callback && callback();
+        yield put({
+          type: 'queryAuditList',
+          payload: {},
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    *queryProcessFlows({ payload }, { call, put }) {
+      const data = yield call(queryProcessFlows, payload);
+      if (data && data.length > 0) {
+        yield put({
+          type: 'save',
+          payload: {
+            flowDetail: data[0].process_json
+              ? getFlowDetail(JSON.parse(data[0].process_json))
+              : { nodes: [], edges: [] },
+            formData: data[0].form_json ? JSON.parse(data[0].form_json) : [],
+            simpleFlowDteail: data[0].process_simple_json,
+          },
+        });
+      }
+    },
+    *saveAuditFlowInfo({ payload, callback }, { call, put }) {
+      try {
+        yield call(saveAuditFlowInfo, payload);
+        message.success('保存成功');
+        callback && callback();
+        yield put({
+          type: 'flow/queryProcessFlows',
+          payload: { ids: Number(payload.id) },
+        });
+      } catch (error) {}
+    },
     // *addFlow({ payload, callback }, { call, put }) {
     //   const res = yield call(addFlow, payload);
     //   if (res) {
@@ -199,33 +252,6 @@ export default {
     //   message.success('修改成功');
     //   callback && callback();
     // },
-    *queryAuditList({ payload }, { call, put }) {
-      const response = yield call(queryAuditList, payload);
-      if (response) {
-        yield put({
-          type: 'save',
-          payload: {
-            auditList: response.data.map((item) => ({
-              ...item,
-              id: item.list.id,
-            })),
-          },
-        });
-      }
-    },
-    *addAudit({ payload, callback }, { call, put }) {
-      try {
-        yield call(addAudit, payload);
-        message.success('新增成功');
-        callback && callback();
-        yield put({
-          type: 'queryAuditList',
-          payload: {},
-        });
-      } catch (error) {
-        console.log(error);
-      }
-    },
     // *addAuditNode({ payload, callback }, { call, put }) {
     //   const response = yield call(addAuditNode, payload);
     //   if (response) {
@@ -242,13 +268,6 @@ export default {
     //     });
     //   }
     // },
-    // *saveAuditFlowInfo({ payload, callback }, { call, put }) {
-    //   const response = yield call(saveAuditFlowInfo, payload);
-    //   if (response) {
-    //     message.success('保存成功');
-    //     callback && callback();
-    //   }
-    // },
     // *fetchDepV2({ payload, callback }, { call, put }) {
     //   const response = yield call(queryDepV2, { pageSize: 999999 });
     //   if (response) {
@@ -262,21 +281,6 @@ export default {
     //     });
     //   }
     // },
-    // *queryProcessFlows({ payload }, { call, put }) {
-    //   const data = yield call(queryProcessFlows, payload);
-    //   if (data && data.length > 0) {
-    //     yield put({
-    //       type: 'save',
-    //       payload: {
-    //         flowDetail: data[0].process_json
-    //           ? getFlowDetail(JSON.parse(data[0].process_json))
-    //           : { nodes: [], edges: [] },
-    //         formData: data[0].form_json ? JSON.parse(data[0].form_json) : [],
-    //         simpleFlowDteail: data[0].process_simple_json,
-    //       },
-    //     });
-    //   }
-    // },
     // *queryDefaultBindClassify({ payload }, { call, put }) {
     //   const data = yield call(queryDefaultBindClassify, payload);
     //   if (data) {

src/services/SysAdmin.js

@@ -1,6 +1,9 @@
 import {request }from 'umi';
 import { stringify } from 'qs';
 
+export async function queryRole(params) {
+  return request(`/api/v1/role?${stringify(params)}`);
+}
 // export async function queryRes(params) {
 //   return request(`/res?${stringify(params)}`);
 // }
@@ -70,9 +73,6 @@ import { stringify } from 'qs';
 //   });
 // }
 
-export async function queryRole(params) {
-  return request(`/api/v1/role?${stringify(params)}`);
-}
 
 // export async function queryProjectRole(params) {
 //   return request(`/api/v2/project/roles/get?${stringify(params)}`);

src/services/approval.js

@@ -1,6 +1,11 @@
 import {request }from 'umi';
 import { stringify } from 'qs';
 
+//获取部门结构
+export async function queryDepV2(params) {
+  return request(`/api/v2/dep?${stringify(params)}`);
+}
+
 // export async function queryType() {
 //   return request(`/api/v2/approval/type/dic`);
 // }
@@ -62,10 +67,6 @@ import { stringify } from 'qs';
 //   });
 // }
 
-//获取部门结构
-export async function queryDepV2(params) {
-  return request(`/api/v2/dep?${stringify(params)}`);
-}
 
 // //添加项目成员
 // export async function addMember(data) {

src/services/boom.js

@@ -1,10 +1,35 @@
-import {request }from 'umi';
+import { request } from 'umi';
 import { stringify } from 'qs';
 
+export async function queryAuditList(params) {
+  return request(`/api/v1/purchase/flow/info?${stringify(params)}`);
+}
+
+export async function addAudit(data) {
+  return request(`/api/v1/purchase/flow/info`, {
+    method: 'POST',
+    data,
+  });
+}
+export async function queryProcessFlows(params) {
+  let res = await request(
+    `/api/v1/purchase/process/get-flows?${stringify(params)}`,
+    {
+      method: 'GET',
+    },
+  );
+  return res.data;
+}
+export async function saveAuditFlowInfo(data) {
+  return request(`/api/v1/purchase/flow/info`, {
+    method: 'POST',
+    data,
+  });
+}
 // /**
 //   project_id
 //   version_id	大版本id
-//   template_id	
+//   template_id
 //   template_node_id	查询某流程和某节点下最新版本的数据记录
 //   node_id	查询某审批流程和某审批节点下最新版本的数据记录
 //  */
@@ -158,7 +183,7 @@ import { stringify } from 'qs';
 //   return request(`/api/v1/purchase/bom/project/record?${stringify(params)}`);
 // }
 // /** 查看版本列表
-//  *  project_id		
+//  *  project_id
 //     template_id		流程id
 //     template_node_id	流程节点id
 //  */
@@ -286,16 +311,6 @@ import { stringify } from 'qs';
 //   });
 // }
 
-export async function queryAuditList(params) {
-  return request(`/api/v1/purchase/flow/info?${stringify(params)}`);
-}
-
-export async function addAudit(data) {
-  return request(`/api/v1/purchase/flow/info`, {
-    method: 'POST',
-    data,
-  });
-}
 // export async function addFlow(data) {
 //   return request(`/api/v1/purchase/bom/flow/info`, {
 //     method: 'POST',
@@ -378,25 +393,11 @@ export async function addAudit(data) {
 //   return res.data;
 // }
 
-// export async function saveAuditFlowInfo(data) {
-//   return request(`/api/v1/purchase/flow/info`, {
-//     method: 'POST',
-//     body: data,
-//   });
-// }
-
 // //获取部门结构
 // export async function queryDepV2(params) {
 //   return request(`/api/v2/dep?${stringify(params)}`);
 // }
 
-// export async function queryProcessFlows(params) {
-//   let res = await request(`/api/v1/purchase/process/get-flows?${stringify(params)}`, {
-//     method: 'GET',
-//   });
-//   return res.data;
-// }
-
 // export async function queryUserListByRoleID(params) {
 //   let res = await request(`/api/v1/purchase/process/get-role-user?${stringify(params)}`, {
 //     method: 'GET',

src/services/user.js

@@ -4,6 +4,17 @@ export async function query() {
   return request('/api/v1/user');
 }
 
+export async function queryDepList(userName) {
+  return request(`/api/v2/user/dep`, {
+    params: { userName },
+  });
+}
+export async function Login(data) {
+  return request('/api/v2/user/login', {
+    method: 'POST',
+    data,
+  });
+}
 // export async function queryCurrent() {
 //   return request('/api/v1/user/current-user', { method: 'GET' });
 // }
@@ -44,14 +55,3 @@ export async function query() {
 // export async function queryDepV2(params) {
 //   return request(`/api/v2/dep?${stringify(params)}`);
 // }
-export async function queryDepList(userName) {
-  return request(`/api/v2/user/dep`, {
-    params: { userName },
-  });
-}
-export async function Login(data) {
-  return request('/api/v2/user/login', {
-    method: 'POST',
-    data,
-  });
-}