Bladeren bron

替换写日志接口

Renxy 1 jaar geleden
bovenliggende
commit
eafaab33c4

+ 1 - 1
src/pages/PurchaseAdmin/PurchaseList/DailyRecord/components/RecordDetail.js

@@ -25,7 +25,7 @@ const RecordDetailModal = ({
   const RenderItem = item => {
     return (
       <Space key={item.id} direction="vertical" className={styles.itemCon}>
-        <div>项目名称:{item.code_id}</div>
+        <div>项目名称:{item.project_name}</div>
         <div>日志概述:{item.title}</div>
         <div>日志详情:{item.content}</div>
       </Space>

+ 2 - 2
src/pages/PurchaseAdmin/PurchaseList/DailyRecord/components/WriteRecordModal.js

@@ -115,7 +115,7 @@ const RenderItem = ({ idx, data, showDeleteIcon, projects, onChange, onDelete })
   const [form] = Form.useForm();
 
   const projectName = useMemo(() => {
-    return projects.find(item => item.ID == data.code_id)?.Name || '';
+    return projects.find(item => item.id == data.code_id)?.project_name || '';
   }, [data.code_id]);
 
   return (
@@ -138,7 +138,7 @@ const RenderItem = ({ idx, data, showDeleteIcon, projects, onChange, onDelete })
               <Select
                 // style={{ width: 120 }}
                 options={projects?.map(item => {
-                  return { label: item.Name, value: item.ID };
+                  return { label: item.project_name, value: item.id };
                 })}
                 onChange={id => onChange(idx, { ...data, code_id: id })}
                 filterOption={(input, option) => {

+ 3 - 2
src/pages/PurchaseAdmin/PurchaseList/DailyRecord/models/record.js

@@ -8,6 +8,7 @@ import {
   queryProject,
   deleteWorkHour,
 } from '@/services/workHours';
+import { queryOwnProjects } from '@/services/Daily';
 import { queryDepV2 } from '@/services/approval';
 import { message } from 'antd';
 import moment from 'moment';
@@ -45,12 +46,12 @@ export default {
       });
     },
     *queryProject({ payload = {}, callback }, { call, put }) {
-      const res = yield call(queryProject, payload);
+      const res = yield call(queryOwnProjects, payload);
       if (res) {
         yield put({
           type: 'save',
           payload: {
-            projects: res.data.list,
+            projects: res.data,
           },
         });
         callback && callback();

+ 9 - 6
src/services/Daily.js

@@ -1,5 +1,5 @@
-import request from "@/utils/request";
-import {stringify} from "qs";
+import request from '@/utils/request';
+import { stringify } from 'qs';
 
 export async function getList(params) {
   return request(`/daily/list/${params.ProjectId}?${stringify(params)}`);
@@ -9,20 +9,20 @@ export async function getDaily(params) {
 }
 
 export async function addDaily(params) {
-  return request(`/daily/item`, {method:'POST', body:{...params}});
+  return request(`/daily/item`, { method: 'POST', body: { ...params } });
 }
 
 export async function updateDaily(params = {}) {
   return request(`/daily/item`, {
     method: 'PUT',
     body: {
-      ...params
+      ...params,
     },
   });
 }
 
 export async function removeDaily(params) {
-  return request(`/daily/item/${params.Id}`, {method: 'DELETE'});
+  return request(`/daily/item/${params.Id}`, { method: 'DELETE' });
 }
 
 export async function getDetail(params) {
@@ -38,10 +38,13 @@ export async function getDailyFiles(params) {
 }
 
 export async function removeDailyFile(params) {
-  return request(`/daily/file/${params.Id}`, {method: 'DELETE'});
+  return request(`/daily/file/${params.Id}`, { method: 'DELETE' });
 }
 
 export async function downloadSource(params) {
   return request(`/excel/project-daily/${params.detailId}?${stringify(params)}`);
 }
 
+export async function queryOwnProjects() {
+  return request(`/api/v2/approval/list/simple`);
+}