发运增加下载模板和发运导入确认增加展示的信息

jiangwei
1 parent 8546c12e
Showing 4 changed files with 120 additions and 18 deletions
src/pages/pms/partPlan/PlanShipping/api.ts
src/pages/pms/partPlan/PlanShipping/components/ConfirmDetailModal.tsx
src/pages/pms/partPlan/PlanShipping/components/UploadExcel.tsx
src/pages/pms/partPlan/PlanShipping/index.tsx
@@ -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&lt;Item&gt; {
 /**
  * 查询明细
  */
-export function getDetail(shippingNo?: string): http.PromiseResp<Detail[]> {
-  return request.get(`${PMS_HOST}/app/part/shipping/detail`, { params: {shippingNo} });
+export function getDetail(shippingNo?: string): http.PromiseResp<Detail> {
+  return request.get(`${PMS_HOST}/app/part/shipping/part/detail`, { params: {shippingNo} });
 }
  
 /**
 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<Detail[], string | undefined>(getDetail, [], item.shippingNo, delay);
+  const { data, setParams, loading: aloading} = useInitail<Detail, string | undefined>(getDetail, {}, item.shippingNo, delay);
   const [loading, setLoading] = useState(false);
  
   useEffect(() => {
@@ -54,13 +54,19 @@ export default function Index(props: Props) {
         <Button key="2" type="primary" loading={loading} disabled={loading} onClick={() => submit(true)}>确认</Button>
       ] : [<Button key="1" loading={loading} onClick={() => onCancel()}>取消</Button>]}
     >
-      <Table loading={aloading} rowKey={(v: Detail) => `${v.partId}`} scroll={{y: 500, x: 1200}} dataSource={data || []} pagination={false}>
+      <Descriptions column={3}>
+        <Descriptions.Item label="品牌">{data.brandName}</Descriptions.Item>
+        <Descriptions.Item label="供应商" span={2}>{data.supplierName}</Descriptions.Item>
+        <Descriptions.Item label="库房">{data.storageName}</Descriptions.Item>
+        <Descriptions.Item label="结算门店" span={2}>{data.settleShopName}</Descriptions.Item>
+      </Descriptions>
+      <Table loading={aloading} rowKey={(v: DetailItem) => `${v.partId}`} scroll={{y: 500, x: 1200}} dataSource={data.list || []} pagination={false}>
         <Column title="配件名称" dataIndex="partName" />
         <Column title="配件编码" dataIndex="partCode" />
         <Column title="配件件号" dataIndex="partNo" />
         <Column title="发运数量" dataIndex="partCount" />
         <Column title="采购单价" dataIndex="price" />
-        <Column title="总金额(元)" dataIndex="totalAmount" render={(t: number, _:Detail) => ((_.price || 0) * (_.partCount || 0) || '--')} />
+        <Column title="总金额(元)" dataIndex="totalAmount" render={(t: number, _: DetailItem) => ((_.price || 0) * (_.partCount || 0) || '--')} />
         {!confirm && <Column title="入库数量" dataIndex="storageCnt" render={(t: number) => (t || '--')} />}
         {!confirm && <Column title="遗漏数量" dataIndex="omitCnt" render={(t: number) => (t || '--')} />}
         {!confirm && <Column title="破损数量" dataIndex="damagedCnt" render={(t: number) => (t || '--')} />}
@@ -107,7 +107,7 @@ export default function UploadExcel({ getList, importVisible, setImportVisible, 
           onChange={supplierId => setParam({ ...param, supplierId })}
         />
         <SelectRow
-          title="库房"
+          title="发运库房"
           value={param.storageId}
           data={storages}
           id="id"
@@ -115,7 +115,7 @@ export default function UploadExcel({ getList, importVisible, setImportVisible, 
           onChange={storageId => setParam({ ...param, storageId })}
         />
         <SelectRow
-          title="结算门店"
+          title="提报门店"
           value={param.settleShopId}
           data={shops}
           id="id"
 import React, { useState } from "react";
-import { Card, ConfigProvider, DatePicker, Divider, Table } from 'antd';
+import { Card, ConfigProvider, DatePicker, Divider, Table, Dropdown, Menu } from 'antd';
+import { DownOutlined } from '@ant-design/icons';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import usePagination from "@/hooks/usePagination";
 import DetailModal from './components/ConfirmDetailModal';
@@ -23,6 +24,23 @@ export default function PartPriceCoefficient() {
   const [item, setItem] = useState<Item>({});
   const { data: shops } = useInitial<PmsStoragePartShop.Option[], {}>(api.getShopApi, [], {});
  
+  const menu = (
+    <Menu
+      items={
+      [
+        {
+          label: <a href="/api/pms/erp/part/template/shipping">通用模板</a>,
+          key: '0',
+        },
+        {
+          label: <a href="/api/pms/erp/part/template/shipping/ca">长安模板</a>,
+          key: '1',
+        },
+      ]
+    }
+    />
+);
+
   return (
     <PageHeaderWrapper title="发运单">
       <ConfigProvider locale={zhCN}>
@@ -56,13 +74,10 @@ export default function PartPriceCoefficient() {
               />
             </div>
             <div style={{ display: 'flex', flexDirection: 'row'}}>
-              <a
-                href={`/api/pms/erp/part/template/shipping?t=${moment().valueOf()}`}
-                style={{ marginRight: 20 }}
-              >
-                下载模板
-              </a>
-              <a onClick={() => { setImportVisible(true); }}>导入数据</a>
+              <Dropdown overlay={menu} trigger={['click']} placement="bottomLeft" arrow overlayStyle={{width: 120}}>
+                <a style={{display: 'flex', alignItems: 'center'}}>导入模板<DownOutlined style={{fontSize: 14, marginLeft: 3}} /></a>
+              </Dropdown>
+              <div style={{marginLeft: 20}}><a onClick={() => { setImportVisible(true); }}>导入数据</a></div>
             </div>
           </div>
           <Table