提交 9f4989d9 作者: ZhangLingKun

优化:任务订单详情优化

上级 66a52329
流水线 #7420 已通过 于阶段
in 1 分 8 秒
......@@ -757,6 +757,18 @@ export type serviceOrderFormDetailsType = InterFunction<
decisionContent: null;
duty: null;
};
orderReceive: {
userAccountId: number;
userName: string;
phoneNum: string;
nickName: string;
};
orderRelease: {
userAccountId: number;
userName: string;
phoneNum: string;
nickName: string;
};
}
>;
// 需求订单-进度条
......
......@@ -246,8 +246,14 @@ const DemandOrderDetail = () => {
<Descriptions.Item label='平台收益'>
{demandDetail?.serviceOrderFormDetailsDTO?.orderEarnings.toFixed(2).toLocaleString()}
</Descriptions.Item>
<Descriptions.Item label='发单方'>-</Descriptions.Item>
<Descriptions.Item label='接单方'>-</Descriptions.Item>
<Descriptions.Item label='发单方'>
{demandDetail?.orderRelease?.phoneNum}
{demandDetail?.orderRelease?.userName || demandDetail?.orderRelease?.nickName}
</Descriptions.Item>
<Descriptions.Item label='接单方'>
{demandDetail?.orderReceive?.phoneNum}
{demandDetail?.orderReceive?.userName || demandDetail?.orderReceive?.nickName}
</Descriptions.Item>
</Descriptions>
{demandDetail?.serviceArriveSceneDTO && (
<>
......
......@@ -28,6 +28,8 @@ const DemandOrderList = () => {
});
// 搜索数据
const [query, setQuery] = useState<demandOrderListParameterType>();
// 订单状态列表
const [orderStatusList, setOrderStatusList] = useState<{ label: string; value: string }[]>([]);
// 刷新子组件
// const [refresh, setRefresh] = useState<boolean>(true);
// 获取需求订单列表
......@@ -64,13 +66,38 @@ const DemandOrderList = () => {
pagination.pageSize = 10;
getServiceOrderFormList(value);
};
// 获取订单进度条字典
const getFlowDictionary = async () => {
const res = await OrderManageAPI.getFlowDictionary();
if (res && res.code === '200') {
setOrderStatusList(
res.result
?.map((i) => ({ value: i.orderStatus, label: i.waiting }))
?.sort((a, b) => Number(a.value) - Number(b.value)),
);
}
};
// 组件挂载
useEffect(() => {
getFlowDictionary().then();
getServiceOrderFormList();
// console.log('组件挂载 --->', );
}, [location]);
const searchColumns: searchColumnsType[] = [
{
label: '订单编号',
name: 'publisherNumber',
type: 'input',
placeholder: '请输入订单编号',
},
{
label: '订单状态',
name: 'orderStatus',
type: 'Select',
placeholder: '请选择订单状态',
options: orderStatusList,
},
{
label: '发单手机号',
name: 'publishPhone',
type: 'input',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论