소스 검색

fix: 更换项目列表接口

ZhaoJun 1 년 전
부모
커밋
410a3094d7
2개의 변경된 파일10개의 추가작업 그리고 13개의 파일을 삭제
  1. 5 7
      src/components/DDComponents/ProjectField/index.js
  2. 5 6
      src/pages/Detail/FormAndFilesNode.js

+ 5 - 7
src/components/DDComponents/ProjectField/index.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Select } from 'antd';
-import { queryApproval } from '@/services/approval';
+import { queryProjectListUser } from '@/services/approval';
 
 function DDProjectField(props) {
   const { value, disabled = false, onChange } = props;
@@ -9,13 +9,11 @@ function DDProjectField(props) {
 
   const getProjectList = async () => {
     setLoading(true);
-    const res = await queryApproval({ pageSize: 9999 }).catch(err => {
-      console.log(err);
+    const res = await queryProjectListUser({ pageSize: 9999 }).catch(err => {
       setLoading(false);
     });
     if (res.code === 200) {
-      console.log(res.data.list);
-      setProjectList(res.data.list);
+      setProjectList(res.data);
       setLoading(false);
     }
   };
@@ -39,8 +37,8 @@ function DDProjectField(props) {
       }
       options={projectList.map(item => {
         return {
-          label: `${item.Name}(${item.Code})`,
-          value: item.ID,
+          label: `${item.project_name}(${item.project_full_code})`,
+          value: item.id,
         };
       })}
     />

+ 5 - 6
src/pages/Detail/FormAndFilesNode.js

@@ -6,7 +6,7 @@ import { connect } from 'dva';
 import CommentContent from '@/components/CommentContent';
 import AttachmentTable from '@/components/AttachmentTable';
 import DIYTable from '@/components/DDComponents/DIYTable';
-import { queryApproval } from '@/services/approval';
+import { queryProjectListUser } from '@/services/approval';
 
 const { confirm } = Modal;
 const { Panel } = Collapse;
@@ -17,11 +17,11 @@ const FormAndFilesNode = props => {
   const [projectList, setProjectList] = useState([]);
 
   const getProjectList = async () => {
-    const res = await queryApproval({ pageSize: 9999 }).catch(err => {
+    const res = await queryProjectListUser({ pageSize: 9999 }).catch(err => {
       console.log(err);
     });
     if (res.code === 200) {
-      setProjectList(res.data.list);
+      setProjectList(res.data);
     }
   };
 
@@ -79,14 +79,13 @@ const renderFrom = (data, projects) => {
               </Form.Item>
             );
           }
-
           let value = item.value.join(',');
           if (item.id.includes('ProjectField')) {
             if (value) {
               value = Number(value);
-              const project = projects.find(pitem => pitem.ID === value);
+              const project = projects.find(pitem => pitem.id === value);
               if (project) {
-                value = `${project.Name}(${project.Code})`;
+                value = `${project.project_name}(${project.project_full_code})`;
               }
             }
           }