提交 bc7db2df 作者: ZhangLingKun

优化:任务订单接单发单

上级 c311d7f5
流水线 #7377 已通过 于阶段
in 1 分 21 秒
...@@ -630,6 +630,7 @@ export type serviceOrderFormListType = InterItemFunction< ...@@ -630,6 +630,7 @@ export type serviceOrderFormListType = InterItemFunction<
* 发单手机号 * 发单手机号
*/ */
publishPhone?: string; publishPhone?: string;
isPilotOrder?: number;
}, },
{ {
/** /**
......
...@@ -3,7 +3,7 @@ import { searchColumns as searchColumnsType } from '~/components/search-box'; ...@@ -3,7 +3,7 @@ import { searchColumns as searchColumnsType } from '~/components/search-box';
import { Button, Table, Tag } from 'antd'; import { Button, Table, Tag } from 'antd';
import { ColumnsType } from 'antd/es/table/InternalTable'; import { ColumnsType } from 'antd/es/table/InternalTable';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useLocation, useNavigate } from 'react-router-dom';
import { OrderManageAPI } from '~/api'; import { OrderManageAPI } from '~/api';
import { InterDataType, InterListType, PaginationProps } from '~/api/interface'; import { InterDataType, InterListType, PaginationProps } from '~/api/interface';
import { serviceOrderFormListType } from '~/api/interface/orderManageType'; import { serviceOrderFormListType } from '~/api/interface/orderManageType';
...@@ -15,6 +15,7 @@ type demandOrderListType = InterDataType<serviceOrderFormListType>['list']; ...@@ -15,6 +15,7 @@ type demandOrderListType = InterDataType<serviceOrderFormListType>['list'];
type demandOrderListParameterType = InterListType<serviceOrderFormListType>; type demandOrderListParameterType = InterListType<serviceOrderFormListType>;
const DemandOrderList = () => { const DemandOrderList = () => {
const location = useLocation();
// 路由钩子 // 路由钩子
const navigate = useNavigate(); const navigate = useNavigate();
// 表格数据 // 表格数据
...@@ -34,6 +35,7 @@ const DemandOrderList = () => { ...@@ -34,6 +35,7 @@ const DemandOrderList = () => {
OrderManageAPI.getServiceOrderFormList({ OrderManageAPI.getServiceOrderFormList({
pageNo: pagination.pageNo, pageNo: pagination.pageNo,
pageSize: pagination.pageSize, pageSize: pagination.pageSize,
isPilotOrder: Number(location?.pathname?.split('/')?.at(-1)),
...query, ...query,
}).then(({ result }) => { }).then(({ result }) => {
const list = (result.list || [])?.map((i) => ({ const list = (result.list || [])?.map((i) => ({
...@@ -65,7 +67,8 @@ const DemandOrderList = () => { ...@@ -65,7 +67,8 @@ const DemandOrderList = () => {
// 组件挂载 // 组件挂载
useEffect(() => { useEffect(() => {
getServiceOrderFormList(); getServiceOrderFormList();
}, []); // console.log('组件挂载 --->', );
}, [location]);
const searchColumns: searchColumnsType[] = [ const searchColumns: searchColumnsType[] = [
{ {
label: '发单手机号', label: '发单手机号',
...@@ -111,7 +114,7 @@ const DemandOrderList = () => { ...@@ -111,7 +114,7 @@ const DemandOrderList = () => {
<span>{text}</span> <span>{text}</span>
</> </>
), ),
width: 250, width: 260,
}, },
{ {
title: '订单状态', title: '订单状态',
......
...@@ -138,10 +138,10 @@ const CategoryManage = React.lazy(() => import('~/pages/categoryManage/category' ...@@ -138,10 +138,10 @@ const CategoryManage = React.lazy(() => import('~/pages/categoryManage/category'
//执照培训 //执照培训
const InstitutionsListView = React.lazy( const InstitutionsListView = React.lazy(
() => import('~/pages/pilotTraining/ licensureExamination/institutionsList'), () => import('~/pages/pilotTraining/licenseExamination/institutionsList'),
); //机构列表 ); //机构列表
const AddInstitutionsView = React.lazy( const AddInstitutionsView = React.lazy(
() => import('~/pages/pilotTraining/ licensureExamination/addOrEditInstitution'), () => import('~/pages/pilotTraining/licenseExamination/addOrEditInstitution'),
); //机构上传 ); //机构上传
//飞手中心 //飞手中心
...@@ -679,25 +679,23 @@ export const routerList: Array<RouteObjectType> = [ ...@@ -679,25 +679,23 @@ export const routerList: Array<RouteObjectType> = [
}, },
}, },
{ {
path: '/serviceManage/demandOrderList', path: '/serviceManage/demandOrderList/0',
element: withLoadingComponent(<DemandOrderListView />), element: withLoadingComponent(<DemandOrderListView />),
errorElement: <ErrorPage />, errorElement: <ErrorPage />,
meta: { meta: {
id: 630, id: 630,
// title: '任务发单', title: '任务发单',
title: '任务订单',
icon: <CreditCardOutlined />, icon: <CreditCardOutlined />,
}, },
}, },
{ {
path: '/serviceManage/demandOrderList', path: '/serviceManage/demandOrderList/1',
element: withLoadingComponent(<DemandOrderListView />), element: withLoadingComponent(<DemandOrderListView />),
errorElement: <ErrorPage />, errorElement: <ErrorPage />,
meta: { meta: {
id: 640, id: 640,
title: '任务接单', title: '任务接单',
icon: <CreditCardOutlined />, icon: <CreditCardOutlined />,
// develop: true,
}, },
}, },
{ {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论