修改文案

src/pages/order/constants/anchors.ts

@@ -97,7 +97,7 @@ const Remarks: AnchorsItem = {
 
 const DeliveryNoteQuery: AnchorsItem[] = [
   BillsInfo,
-  Distribution,
+  Harvest,
   DeliveryInfo,
   LogisticsInfo,
 ]

src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitB2B/components/AddEditContent/index.tsx

@@ -87,6 +87,7 @@ const DeliveryNoticeManagementAwaitB2BDetails: React.FC<PropsType> = ({ type, id
         if (code === 1000) {
           // history.goBack()
           // 兼容从送货计划协同跳转生成送货通知单
+          handleLeave(false)
           history.push('/memberCenter/order/deliveryNoticeManagement/query')
         }
       }).finally(() => {

src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitSRM/components/AddEditContent/index.tsx

@@ -86,6 +86,7 @@ const DeliveryNoticeManagementAwaitSRMDetails: React.FC<PropsType> = ({ type, id
       setLoading(true)
       requestApi(params).then(({ code, data }) => {
         if (code === 1000) {
+          handleLeave(false)
           history.goBack()
         }
       }).finally(() => {

src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx

@@ -279,7 +279,7 @@ function DeliveryNoticeFromCreate() {
                     render: (t, rcode, index) => {
                       return (
                         <HarvestMaterialInput
-                          value={rcode[OrderNumColumn.key]}
+                          value={rcode?.deliveryCount}
                           index={index}
                           keyup="deliveryCount"
                           disabled={true}

src/pages/order/receivingNote/deliveryNoteManage/details.tsx

@@ -6,7 +6,7 @@
 import React, { useEffect, useState } from 'react'
 import AnchorPage from '@/components/AnchorPage'
 import { BaseInfo as ListInfo } from '@/components/BaseInfo'
-import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, Distribution, ExternalRoamRecord, Harvest, LogisticsInfo, Material } from '../../constants'
+import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, Distribution, ExternalRoamRecord, Harvest, HarvestMaterial, LogisticsInfo, Material } from '../../constants'
 import { Space, Spin, Table, Tag } from 'antd';
 import ReceiveNoteFacotry from '../../assets/handles/ReceiveNotePage';
 import { useLocation } from 'umi';
@@ -45,9 +45,9 @@ const DeliveryNoteManageDetails: React.FC = () => {
       setAnchors([
         ...anchors,
         {
-          ...Material,
+          ...HarvestMaterial,
           ...{
-            name: `${Material.name}(${values[1].totalCount})`
+            name: `${HarvestMaterial.name}(${values[1].totalCount})`
           }
         },
         {
@@ -69,11 +69,11 @@ const DeliveryNoteManageDetails: React.FC = () => {
       >
 
         <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key}>
-          <ListInfoItem className="mt-16" label='收货单号'>
+          <ListInfoItem className="mt-16" label='收货单编号'>
             {info?.receiveNo}
           </ListInfoItem>
 
-          <ListInfoItem label='采购会员'>
+          <ListInfoItem label='供应会员'>
             {info?.buyerMemberName}
           </ListInfoItem>
 
@@ -95,7 +95,7 @@ const DeliveryNoteManageDetails: React.FC = () => {
         <ListInfo className='mt-15' title={Harvest.name} id={Harvest.key}>
 
           <div>
-            <ListInfoItem className="mt-16" label='收货日期'>
+            <ListInfoItem className="mt-16" label='收货时间'>
               {info?.receiveTime}
             </ListInfoItem>
 
@@ -152,7 +152,7 @@ const DeliveryNoteManageDetails: React.FC = () => {
 
         </ListInfo>
 
-        <ListInfo className='mt-15' title={Material.name} id={Material.key} cols={1}>
+        <ListInfo className='mt-15' title={HarvestMaterial.name} id={HarvestMaterial.key} cols={1}>
           <Table
             rowKey={row => row.orderNo}
             columns={
@@ -164,6 +164,11 @@ const DeliveryNoteManageDetails: React.FC = () => {
                     return rcode.deliveryCount
                   }
                 }
+                , {
+                  title: '收货数量',
+                  dataIndex: 'receiveCount',
+                  key: 'receiveCount'
+                }
               ]}
             dataSource={tableDataSource}
           />

src/pages/order/receivingNote/deliveryNoteManage/index.tsx

@@ -71,7 +71,7 @@ const DeliveryNoteManage: React.FC = () => {
     { title: '收货日期', dataIndex: 'receiveTime', key: 'receiveTime' },
     { title: '送货单号', dataIndex: 'deliveryNo', key: 'deliveryNo' },
     { title: '送货日期', dataIndex: 'deliveryTime', key: 'deliveryTime' },
-    { title: '供应会员', dataIndex: 'buyerMemberName', key: 'buyerMemberName' },
+    { title: '供应会员', dataIndex: 'vendorMemberName', key: 'vendorMemberName' },
     { title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
     {
       title: '外部状态',

src/pages/order/receivingNote/deliveryNoteQuery/index.tsx

@@ -91,7 +91,7 @@ const DeliveryNoteQuery: React.FC = () => {
     },
     { title: '送货单摘要', dataIndex: 'digest', key: 'digest' },
     { title: '送货日期', dataIndex: 'deliveryTime', key: 'deliveryTime' },
-    { title: '供应会员', dataIndex: 'buyerMemberName', key: 'buyerMemberName' },
+    { title: '供应会员', dataIndex: 'vendorMemberName', key: 'vendorMemberName' },
     { title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
     {
       title: '外部状态',