Renxy 2 年之前
父節點
當前提交
485a20d36f
共有 4 個文件被更改,包括 19 次插入17 次删除
  1. 1 1
      src/pages/Detail/FlowModal.js
  2. 1 1
      src/pages/Detail/Index.js
  3. 3 3
      src/pages/Detail/models/detail.js
  4. 14 12
      src/pages/List/models/list.js

+ 1 - 1
src/pages/Detail/FlowModal.js

@@ -414,7 +414,7 @@ function FlowModal(props) {
         onCancel={onClose}
         onCancel={onClose}
         footer={false}
         footer={false}
         width="98%"
         width="98%"
-        bodyStyle={{ maxHeight: '660px' }}
+        // bodyStyle={{ maxHeight: '660px', overflow: 'auto' }}
       >
       >
         <Row gutter={8}>
         <Row gutter={8}>
           <Col span={14}>
           <Col span={14}>

+ 1 - 1
src/pages/Detail/Index.js

@@ -140,7 +140,7 @@ function Detail(props) {
   const active_audit = flow.active_audit;
   const active_audit = flow.active_audit;
   const isAuditor = useMemo(() => {
   const isAuditor = useMemo(() => {
     const getUserRole = () => {
     const getUserRole = () => {
-      return flow.currentNode.auditor == currentUser.ID;
+      return flow.currentNode?.auditor == currentUser.ID;
       // let roleID = flow.currentNode?.AuditRoleInfo?.ID;
       // let roleID = flow.currentNode?.AuditRoleInfo?.ID;
       // let item = currentUser.roleList.find(role => role.ID == roleID);
       // let item = currentUser.roleList.find(role => role.ID == roleID);
       // if (item) return true;
       // if (item) return true;

+ 3 - 3
src/pages/Detail/models/detail.js

@@ -532,19 +532,19 @@ export default {
     *queryAuditExcel({ payload, callback }, { call, put }) {
     *queryAuditExcel({ payload, callback }, { call, put }) {
       const response = yield call(queryAuditExcel, payload);
       const response = yield call(queryAuditExcel, payload);
       if (response) {
       if (response) {
-        callback && callback(response.data?.all);
+        callback && callback(response.data?.list);
       }
       }
     },
     },
     *queryAuditRecord({ payload, callback }, { call, put }) {
     *queryAuditRecord({ payload, callback }, { call, put }) {
       const response = yield call(queryAuditRecord, payload);
       const response = yield call(queryAuditRecord, payload);
       if (response) {
       if (response) {
-        callback && callback(response.data?.all);
+        callback && callback(response.data?.list);
       }
       }
     },
     },
     *queryDingSchema({ payload, callback }, { call, put }) {
     *queryDingSchema({ payload, callback }, { call, put }) {
       const response = yield call(queryDingSchema, payload);
       const response = yield call(queryDingSchema, payload);
       if (response) {
       if (response) {
-        callback && callback(response.data?.all);
+        callback && callback(response.data?.list);
       }
       }
     },
     },
     *queryDingInstanceDetail({ payload, callback }, { call, put }) {
     *queryDingInstanceDetail({ payload, callback }, { call, put }) {

+ 14 - 12
src/pages/List/models/list.js

@@ -1,8 +1,6 @@
 import { queryBindClassify, queryClassify, queryProjectRecord } from '@/services/boom';
 import { queryBindClassify, queryClassify, queryProjectRecord } from '@/services/boom';
 import { queryProject } from '@/services/PurchaseList';
 import { queryProject } from '@/services/PurchaseList';
-import {
-  queryApproval,
-} from '@/services/approval';
+import { queryApproval } from '@/services/approval';
 import { message } from 'antd';
 import { message } from 'antd';
 import { commitSheet, queryVersionsList, queryAuditExcel, queryAuditRecord } from '@/services/boom';
 import { commitSheet, queryVersionsList, queryAuditExcel, queryAuditRecord } from '@/services/boom';
 
 
@@ -18,7 +16,7 @@ export default {
       pagination: false,
       pagination: false,
     },
     },
     versionList: [],
     versionList: [],
-    typeOptions:[ ],
+    typeOptions: [],
   },
   },
 
 
   effects: {
   effects: {
@@ -44,7 +42,7 @@ export default {
       });
       });
     },
     },
     *queryProject({ callback }, { call, put }) {
     *queryProject({ callback }, { call, put }) {
-      const response = yield call(queryApproval,{pageSize: 99999});
+      const response = yield call(queryApproval, { pageSize: 99999 });
       if (response) {
       if (response) {
         yield put({
         yield put({
           type: 'save',
           type: 'save',
@@ -88,22 +86,24 @@ export default {
     *queryAuditExcel({ payload, callback }, { call, put }) {
     *queryAuditExcel({ payload, callback }, { call, put }) {
       const response = yield call(queryAuditExcel, payload);
       const response = yield call(queryAuditExcel, payload);
       if (response) {
       if (response) {
-        callback && callback(response.data?.all);
+        callback && callback(response.data?.list);
       }
       }
     },
     },
     *queryAuditRecord({ payload, callback }, { call, put }) {
     *queryAuditRecord({ payload, callback }, { call, put }) {
       const response = yield call(queryAuditRecord, payload);
       const response = yield call(queryAuditRecord, payload);
       if (response) {
       if (response) {
-        callback && callback(response.data?.all);
+        callback && callback(response.data?.list);
       }
       }
     },
     },
-    *queryClassify ({ payload, callback }, { call, put }) {
+    *queryClassify({ payload, callback }, { call, put }) {
       const data = yield call(queryClassify, payload);
       const data = yield call(queryClassify, payload);
       if (data) {
       if (data) {
-         yield put({
+        yield put({
           type: 'save',
           type: 'save',
           payload: {
           payload: {
-            typeOptions: data?.map(item=>{return {...item, label:item.name, value:item.id}}),
+            typeOptions: data?.map(item => {
+              return { ...item, label: item.name, value: item.id };
+            }),
           },
           },
         });
         });
       }
       }
@@ -111,10 +111,12 @@ export default {
     *queryBindClassify({ payload, callback }, { call, put }) {
     *queryBindClassify({ payload, callback }, { call, put }) {
       const data = yield call(queryBindClassify, payload);
       const data = yield call(queryBindClassify, payload);
       if (data) {
       if (data) {
-         yield put({
+        yield put({
           type: 'save',
           type: 'save',
           payload: {
           payload: {
-            typeOptions: data?.map(item=>{return {...item, label:item.name, value:item.id}}),
+            typeOptions: data?.map(item => {
+              return { ...item, label: item.name, value: item.id };
+            }),
           },
           },
         });
         });
       }
       }