diff --git a/src/pages/pms/partPlan/PlanShipping/api.ts b/src/pages/pms/partPlan/PlanShipping/api.ts index 6b7927d..013f016 100644 --- a/src/pages/pms/partPlan/PlanShipping/api.ts +++ b/src/pages/pms/partPlan/PlanShipping/api.ts @@ -36,10 +36,91 @@ export interface Item { otherRatio?: number; // 对方责任占比(几成) againCnt?: number; // 补发数量 } +export interface Detail { + brandId?:number + // int64 + // 品牌ID + // 510 + brandName?: + string + // 品牌名称 +// opal.prohaska +supplierId?:number +// int64 +// 供应商id +// 950 +partKind?:number +// int32 +// 配件种类 +// 863 +supplierName?: +string +// 供应商名称 +// opal.prohaska +shopId?:number +// int64 +// 服务站id +// 705/ +shopName?: +string +// 门店名称 +// opal.prohaska +storageId?:number +// int64 +// 库房id +// 563 +storageName?: +string +// 库房名称 +// opal.prohaska +groupId?:number +// int64 +// 集团ID +// 33/ +shippingNo?: +string +// 发运单号 +// zt910g +shippingDate?: +string +// 发运日期?; +// 2023 - 05 - 23 +totalAmount?: +number +// 总金额 +// 904 +payToken?: +string +// 待付token +// wywo3x +importUserName?: +string +// 导入人员 +// opal.prohaska +inStorageUserName?: +string +// 入库人员 +// opal.prohaska +status?:number +// enum + // 状态0待确认1待入库2已完成9作废(See: 配件发运单状态 +// create at 2020-03 - 18) + +settleDealerId?:number +// int64 +// 结算商家/Id +// 115 +settleDealerName?: +string +// 结算商家名称 + settleShopId?:number + settleShopName?:string + list?: DetailItem[] +} /** * 明细 */ -export interface Detail { +export interface DetailItem { supplierName?: string; // 供应商名称 partId?: number; // 配件ID partName?: string; // 配件名称 @@ -68,8 +149,8 @@ export function getList(params?: Params): http.PromisePageResp { /** * 查询明细 */ -export function getDetail(shippingNo?: string): http.PromiseResp { - return request.get(`${PMS_HOST}/app/part/shipping/detail`, { params: {shippingNo} }); +export function getDetail(shippingNo?: string): http.PromiseResp { + return request.get(`${PMS_HOST}/app/part/shipping/part/detail`, { params: {shippingNo} }); } /** diff --git a/src/pages/pms/partPlan/PlanShipping/components/ConfirmDetailModal.tsx b/src/pages/pms/partPlan/PlanShipping/components/ConfirmDetailModal.tsx index de4be13..5d833ea 100644 --- a/src/pages/pms/partPlan/PlanShipping/components/ConfirmDetailModal.tsx +++ b/src/pages/pms/partPlan/PlanShipping/components/ConfirmDetailModal.tsx @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; -import { Button, message, Modal, Table } from 'antd'; -import { confirmApi, getDetail, Detail, Item } from "../api"; +import { Button, message, Modal, Table, Descriptions } from 'antd'; +import { confirmApi, getDetail, Detail, Item, DetailItem } from "../api"; import useInitail from "@/hooks/useInitail"; import _ from "lodash"; @@ -16,7 +16,7 @@ const { Column } = Table; export default function Index(props: Props) { const { visible, onCancel, fetchList, item, confirm } = props; const [delay, setDelay] = useState(true); - const { data, setParams, loading: aloading} = useInitail(getDetail, [], item.shippingNo, delay); + const { data, setParams, loading: aloading} = useInitail(getDetail, {}, item.shippingNo, delay); const [loading, setLoading] = useState(false); useEffect(() => { @@ -54,13 +54,19 @@ export default function Index(props: Props) { ] : []} > - `${v.partId}`} scroll={{y: 500, x: 1200}} dataSource={data || []} pagination={false}> + + {data.brandName} + {data.supplierName} + {data.storageName} + {data.settleShopName} + +
`${v.partId}`} scroll={{y: 500, x: 1200}} dataSource={data.list || []} pagination={false}> - ((_.price || 0) * (_.partCount || 0) || '--')} /> + ((_.price || 0) * (_.partCount || 0) || '--')} /> {!confirm && (t || '--')} />} {!confirm && (t || '--')} />} {!confirm && (t || '--')} />} diff --git a/src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx b/src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx index d17a18a..6b62254 100644 --- a/src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx +++ b/src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx @@ -107,7 +107,7 @@ export default function UploadExcel({ getList, importVisible, setImportVisible, onChange={supplierId => setParam({ ...param, supplierId })} /> setParam({ ...param, storageId })} /> ({}); const { data: shops } = useInitial(api.getShopApi, [], {}); + const menu = ( + 通用模板, + key: '0', + }, + { + label: 长安模板, + key: '1', + }, + ] + } + /> +); + return ( @@ -56,13 +74,10 @@ export default function PartPriceCoefficient() { />