项目列表权限和清单权限

src/pages/Detail/models/detail.js

@@ -36,7 +36,7 @@ import {
   queryBindClassify,
   ChartTempOSSData,
 } from '@/services/boom';
-import { queryApproval } from '@/services/approval';
+import { queryApproval, queryProjectListUser } from '@/services/approval';
 import { queryRole } from '@/services/SysAdmin';
 import { setCurrentUser } from '@/utils/authority';
 import { queryProjectMenu } from '@/services/SysAdmin';
@@ -88,12 +88,12 @@ export default {
 
   effects: {
     *queryProject({ callback }, { call, put }) {
-      const response = yield call(queryApproval, { pageSize: 99999 });
+      const response = yield call(queryProjectListUser, { pageSize: 99999 });
       if (response) {
         yield put({
           type: 'save',
           payload: {
-            project: response.data,
+            project: { list: response.data },
           },
         });
       }

src/pages/Flow/models/flow.js

@@ -12,7 +12,7 @@ import {
   queryProcessFlows,
   queryDefaultBindClassify,
 } from '@/services/boom';
-import { queryApproval } from '@/services/approval';
+import { queryApproval, queryProjectListUser } from '@/services/approval';
 import { queryRole } from '@/services/SysAdmin';
 import { queryProject } from '@/services/PurchaseList';
 import { message } from 'antd';
@@ -177,12 +177,12 @@ export default {
       });
     },
     *queryProject({ callback }, { call, put }) {
-      const response = yield call(queryApproval, { pageSize: 99999 });
+      const response = yield call(queryProjectListUser, { pageSize: 99999 });
       if (response) {
         yield put({
           type: 'save',
           payload: {
-            projectList: response.data.list,
+            projectList: response.data,
           },
         });
       }

src/pages/List/models/list.js

@@ -1,6 +1,6 @@
 import { queryBindClassify, queryClassify, queryProjectRecord } from '@/services/boom';
 import { queryProject } from '@/services/PurchaseList';
-import { queryApproval } from '@/services/approval';
+import { queryApproval, queryProjectListUser, queryPurchasingList } from '@/services/approval';
 import { message } from 'antd';
 import { commitSheet, queryVersionsList, queryAuditExcel, queryAuditRecord } from '@/services/boom';
 
@@ -21,7 +21,7 @@ export default {
 
   effects: {
     *queryProjectRecord({ payload = {}, callback }, { call, put }) {
-      const { data } = yield call(queryProjectRecord, payload);
+      const { data } = yield call(queryProjectRecord, payload); //queryPurchasingList
       // let temp = {};
       // data.list.forEach(item => {
       //   if (!temp[item.template_id]) {
@@ -42,12 +42,12 @@ export default {
       });
     },
     *queryProject({ callback }, { call, put }) {
-      const response = yield call(queryApproval, { pageSize: 99999 });
+      const response = yield call(queryProjectListUser, { pageSize: 99999 });
       if (response) {
         yield put({
           type: 'save',
           payload: {
-            project: response.data,
+            project: { list: response.data },
           },
         });
       }

src/services/approval.js

@@ -51,7 +51,9 @@ export async function queryAuth(data) {
 
 // 查询立项 id=&pageSize=&currentPage=&user_id=
 export async function queryApproval(data) {
-  return request(`/api/v2/approval/record?${stringify(data)}`);
+  data.stage = 2;
+  return request(`/api/v2/workload/project?${stringify(data)}`);
+  // return request(`/api/v2/approval/record?${stringify(data)}`);
 }
 
 // 提交审核
@@ -115,3 +117,8 @@ export async function deleteMember(data) {
 export async function queryVersionsByProjectId(projectId, params) {
   return request(`/purchase/bom/get-bom-list/${projectId}?${stringify(params)}`);
 }
+
+// 查询采购清单列表---带权限
+export async function queryProjectListUser(data) {
+  return request(`/api/v2/approval/record/user?${stringify(data)}`);
+}