修改送货单收货单的页面

src/pages/order/constants/label.ts

@@ -3,6 +3,7 @@ export const ReceiptAddLabel = '新增收货单';
 export const ReceiptAbstractLabel = '收货单摘要';
 export const DeliveryAbstractLabel = '送货单摘要';
 export const DeliveryAbstractNoLabel = '送货通知编号';
+export const ReNoLabel = '收货单编号';
 export const DeliveryPanleNoLabel = '送货计划编号'
 export const SupplyMembersLabel = '供应会员';
 export const NoteLabel = '备注';

src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx

@@ -6,15 +6,15 @@
 import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import React, { useEffect, useState } from 'react'
 import {
-  BillsInfo, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
+  BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
   DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel,
   DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel,
   Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel,
-  LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceivingAddress, ReceivingTime
+  LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
 } from '../../constants'
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
 import { Table } from 'antd';
-import { DeliveryNoticeTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
+import { DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
 import { useLocation } from 'umi';
 import NoteFactoryService from '../../assets/handles/DeliveryNoteService';
 
@@ -71,11 +71,15 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
     >
 
       <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
-        <ContentBoxItem label={DeliveryNoLabel}>
-          {info?.deliveryNo}
+        <ContentBoxItem label={ReNoLabel}>
+          {info?.receiveNo}
         </ContentBoxItem>
 
-        <ContentBoxItem label={DeliveryAbstractLabel}>
+        <ContentBoxItem label={BuyerLabel}>
+          {info?.buyerMemberName}
+        </ContentBoxItem>
+
+        <ContentBoxItem label={ReceiptAbstractLabel}>
           {info?.digest}
         </ContentBoxItem>
 
@@ -90,53 +94,66 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
 
       <ContentBox title={Harvest.name} id={Harvest.key}>
-        <ContentBoxItem label={ReceivingTime}>
-          {info?.receiveTime}
-        </ContentBoxItem>
+        <div>
+          <ContentBoxItem label={ReceivingTime}>
+            {info?.receiveTime}
+          </ContentBoxItem>
 
-        <ContentBoxItem label={ConsigneeLabel}>
-          {info?.receiveVO?.consignee}
-        </ContentBoxItem>
-
-        <ContentBoxItem label={ReceivingAddress}>
-          <div>
-            {info?.receiveVO?.provinceName}
-            {info?.receiveVO?.cityName}
-            {info?.receiveVO?.districtName}
-            {info?.receiveVO?.streetName}
-            {info?.receiveVO?.address}
-          </div>
-          <div>
-            {info?.receiveVO?.phone}
+          <ContentBoxItem label={ConsigneeLabel}>
             {info?.receiveVO?.consignee}
-          </div>
+          </ContentBoxItem>
 
-        </ContentBoxItem>
+          <ContentBoxItem label={DeliveryPhoneLabel}>
+            {info?.receiveVO?.phone}
+          </ContentBoxItem>
+        </div>
+
+        <div>
+          <ContentBoxItem label={ReceivingAddress}>
+            <div>
+              {info?.receiveVO?.provinceName}
+              {info?.receiveVO?.cityName}
+              {info?.receiveVO?.districtName}
+              {info?.receiveVO?.streetName}
+              {info?.receiveVO?.address}
+            </div>
+            <div>
+              {info?.receiveVO?.phone}
+              {info?.receiveVO?.consignee}
+            </div>
+
+          </ContentBoxItem>
+        </div>
 
-        <ContentBoxItem label={DeliveryPhoneLabel}>
-          {info?.receiveVO?.phone}
-        </ContentBoxItem>
       </ContentBox>
 
       <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
-        <ContentBoxItem label={ConsigneeTimeLabel}>
-          {info?.sendTime}
-        </ContentBoxItem>
-
-        <ContentBoxItem label={DeliverySlefAddrLabel}>
-          <div>
-            {info?.deliverVO?.provinceName}
-            {info?.deliverVO?.cityName}
-            {info?.deliverVO?.districtName}
-            {info?.deliverVO?.streetName}
-            {info?.deliverVO?.address}
-          </div>
-          <div>
-            {info?.deliverVO?.phone}
-            {info?.deliverVO?.consignee}
-          </div>
 
-        </ContentBoxItem>
+        <div>
+          <ContentBoxItem label={DeliveryNoLabel}>
+            {info?.deliveryNo}
+          </ContentBoxItem>
+
+          <ContentBoxItem label={ConsigneeTimeLabel}>
+            {info?.sendTime}
+          </ContentBoxItem>
+        </div>
+
+        <div>
+          <ContentBoxItem label={DeliverySlefAddrLabel}>
+            <div>
+              {info?.deliverVO?.provinceName}
+              {info?.deliverVO?.cityName}
+              {info?.deliverVO?.districtName}
+              {info?.deliverVO?.streetName}
+              {info?.deliverVO?.address}
+            </div>
+            <div>
+              {info?.deliverVO?.phone}
+              {info?.deliverVO?.consignee}
+            </div>
+          </ContentBoxItem>
+        </div>
 
       </ContentBox>
 
@@ -145,22 +162,28 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
         <ContentBoxItem label={DeliveryTypeLabel}>
           {service.getDeliveryType(info?.deliveryType)}
         </ContentBoxItem>
-        <ContentBoxItem label={LogisticsCarNoLabel}>
-          {info?.executorVO?.carNumbers}
+
+        <ContentBoxItem label={LogisticsNoLabel}>
+          {info?.logisticsNo}
         </ContentBoxItem>
+
         <ContentBoxItem label={LogisticsCompanyLabel}>
           {info?.logisticsCompany}
         </ContentBoxItem>
-        <ContentBoxItem label={LogisticsNoLabel}>
-          {info?.logisticsNo}
+
+        <ContentBoxItem label={LogisticsCarNoLabel}>
+          {info?.executorVO?.carNumbers}
         </ContentBoxItem>
+
       </ContentBox>
 
 
       <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
 
         <Table
-          columns={DeliveryNoticeTableColumn}
+          columns={
+            info?.type == 1 ? DeliveryNoticeTableColumn : DeliveryNoticeTableColumnSRM
+          }
           rowKey="id"
           dataSource={tableDataSource}
           pagination={{

src/pages/order/deliveryNotice/receivingNoteQuery/index.tsx

@@ -75,13 +75,13 @@ const ReceivingNoteQuery: React.FC = () => {
         )
       }
     },
-    {
-      title: '操作',
-      dataIndex: '',
-      key: 'x',
-      align: 'center',
-      render: (record) => renderOptionButton(record)
-    },
+    // {
+    //   title: '操作',
+    //   dataIndex: '',
+    //   key: 'x',
+    //   align: 'center',
+    //   render: (record) => renderOptionButton(record)
+    // },
   ]
 
   const fetchData = (params: unknown) => {

src/pages/order/deliveryNotice/receivingNoteQuery/schema/index.tsx

@@ -2,85 +2,86 @@
  * 订单能力 -送货通知单协同 - 待确认送货通知单 - Schema
  * @author: Gavin
  */
- import { ISchema } from '@formily/antd'
- import { FORM_FILTER_PATH } from '@/formSchema/const'
- 
- export const receivingNoteQuerySchema: ISchema = {
-   type: 'object',
-   properties: {
-     mageLayout: {
-       type: 'object',
-       'x-component': 'mega-layout',
-       properties: {
-         topLayout: {
-           type: 'object',
-           'x-component': 'mega-layout',
-           'x-component-props': {
-             grid: true,
-           },
-           properties: {
-             ctl: {
-               type: 'object',
-               'x-component': 'Children',
-               'x-component-props': {
-                 children: '{{controllerBtns}}',
-               },
-             },
-             receiveNo: {
-               type: 'string',
-               'x-component': 'Search',
-               'x-component-props': {
-                 allowClear: true,
-                 placeholder: '请输入收货单号'
-               },
-             },
-           },
-         },
-         [FORM_FILTER_PATH]: {
-           type: 'object',
-           'x-component': 'flex-layout',
-           'x-component-props': {
-             rowStyle: {
-               flexWrap: 'nowrap',
-             },
-             colStyle: {
-               marginLeft: 20,
-             },
-           },
-           properties: {
-             abstract: {
-               type: 'string',
-               'x-component-props': {
-                 allowClear: true,
-                 placeholder: '收货单摘要'
-               }
-             },
-             '[startDate, endDate]': {
-               type: 'daterange',
-               'x-component-props': {
-                 allowClear: true,
-                 placeholder: ['收货开始日期', '收货结束日期'],
-               },
-             },
-             supplyMember: {
-               type: 'string',
-               'x-component-props': {
-                 allowClear: true,
-                 placeholder: '采购会员'
-               }
-             },
-             submit: {
-               'x-component': 'Submit',
-               'x-mega-props': {
-                 span: 1,
-               },
-               'x-component-props': {
-                 children: '查询',
-               },
-             },
-           }
-         }
-       }
-     }
-   }
- }
\ No newline at end of file
+import { ISchema } from '@formily/antd'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+
+export const receivingNoteQuerySchema: ISchema = {
+  type: 'object',
+  properties: {
+    mageLayout: {
+      type: 'object',
+      'x-component': 'mega-layout',
+      properties: {
+        topLayout: {
+          type: 'object',
+          'x-component': 'mega-layout',
+          'x-component-props': {
+            className: 'useMegaStart'
+          },
+          properties: {
+            ctl: {
+              type: 'object',
+              'x-component': 'Children',
+              'x-component-props': {
+                children: '{{controllerBtns}}',
+              },
+            },
+            receiveNo: {
+              type: 'string',
+              'x-component': 'Search',
+              'x-component-props': {
+                allowClear: true,
+                placeholder: '请输入收货单号'
+              },
+            },
+          },
+        },
+        [FORM_FILTER_PATH]: {
+          type: 'object',
+          'x-component': 'flex-layout',
+          'x-component-props': {
+            rowStyle: {
+              flexWrap: 'nowrap',
+              justifyContent: 'flex-start'
+            },
+            colStyle: {
+              marginRight: 20,
+            },
+          },
+          properties: {
+            abstract: {
+              type: 'string',
+              'x-component-props': {
+                allowClear: true,
+                placeholder: '收货单摘要'
+              }
+            },
+            '[startDate, endDate]': {
+              type: 'daterange',
+              'x-component-props': {
+                allowClear: true,
+                placeholder: ['收货开始日期', '收货结束日期'],
+              },
+            },
+            supplyMember: {
+              type: 'string',
+              'x-component-props': {
+                allowClear: true,
+                placeholder: '采购会员'
+              }
+            },
+            submit: {
+              'x-component': 'Submit',
+              'x-mega-props': {
+                span: 1,
+              },
+              'x-component-props': {
+                children: '查询',
+              },
+            },
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file