文案修改

src/pages/order/assets/handles/HandleFormSubmit.ts

@@ -83,6 +83,7 @@ export class HandleFormSubmit {
     let formField = {
       digest: data?.digest,
       remark: data?.remark,
+      sourceNo:data?.sourceNo,
       member: {
         buyerMemberId: data?.buyerMemberId,
         buyerMemberName: data?.buyerMemberName,
@@ -337,6 +338,7 @@ export class ReceiveOrderCreate extends DeliveryNoteAddService {
 
 export class ReceiveOrderUpdate extends ReceiveOrderCreate {
   getSubmitRequest(): (vals: any) => Promise<any> {
+    ///order/receive/order/update
     return postOrderReceiveOrderUpdate
   }
 

src/pages/order/constants/page-table-column.tsx

@@ -49,6 +49,17 @@ export const DeliveryNoticeTableColumn: any = [
   OrderNumColumn
 ];
 
+export const DeliveryNoticeTableColumnSRM: any = [
+  MaterialNoColumn,
+  MaterialNameColumn,
+  ClassColumn,
+  BrandColumn,
+  UntilColumn,
+  OrderNoColumn,
+  OrderCreatedAtColumn,
+  OrderNumColumn
+];
+
 // 计划送货物料表格
 export const PlannedDeliveryMaterialTableColumn: any = [
   { width: 80, ...MaterialNoColumn, dataIndex: 'skuId', },

src/pages/order/constants/table-column.ts

@@ -26,8 +26,8 @@ export const TradeNameColumn: any  = {
 
 export const MaterialNoColumn: any  = {
   title: '物料编号',
-  dataIndex: 'orderProductId',
-  key: 'orderProductId',
+  dataIndex: 'skuId',
+  key: 'skuId',
   align: 'center',
 }
 

src/pages/order/deliveryNotice/create/add.tsx

@@ -111,7 +111,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryAbstractLabel}不能为空`)
             ]}
             label={DeliveryAbstractLabel} name="digest">
             <Input />
@@ -123,7 +123,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${BuyerLabel}不能为空`)
             ]}
             label={BuyerLabel} name="member">
             <RoleSelect formatFeils={(e) => {
@@ -141,7 +141,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryDate}不能为空`)
             ]}
             label={DeliveryDate} name="deliveryTime">
             <DatePickerSelect disabled={true} defualtToday={true} className='w-full' />
@@ -151,7 +151,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryTime}不能为空`)
             ]}
             label={DeliveryTime} name="deliveryRangeTime">
             <DatePickerSelect.RangePicker className="w-full" picker='time' />
@@ -159,7 +159,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryNameLabel}不能为空`)
             ]}
             label={DeliveryNameLabel} name="executorVO.consignee">
             <Input />
@@ -167,7 +167,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryPhoneLabel}不能为空`)
             ]}
             label={DeliveryPhoneLabel} name="executorVO.phone">
             <Input />
@@ -179,7 +179,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${DeliveryNameLabel}不能为空`)
             ]}
             label={DeliveryNameLabel} name="deliveryVO">
             <ShipperAddress
@@ -194,7 +194,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${ConsigneeTimeLabel}不能为空`)
             ]}
             label={ConsigneeTimeLabel} name="sendTime">
             <DatePickerSelect className="w-full" />
@@ -202,7 +202,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`${ReceivingAddressLabel}不能为空`)
             ]}
             label={ReceivingAddressLabel} name="receiveVO">
 
@@ -216,7 +216,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
           <FormItem
             rules={[
-              required()
+              required(`请选择${DeliveryTypeLabel}`)
             ]}
             label={DeliveryTypeLabel} name="deliveryType">
             <Radio.Group>

src/pages/order/deliveryNotice/manageB2B/add.tsx

@@ -135,7 +135,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryTimeLabel} name="deliveryRangeTime">
+            label={DeliveryDateLabel} name="deliveryRangeTime">
             <DatePickerSelect.RangePicker className="w-full" picker='time' />
           </FormItem>
 

src/pages/order/deliveryNotice/manageSRM/add.tsx

@@ -125,7 +125,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
             rules={[
               required()
             ]}
-            label={DeliveryDate} name="deliveryTime">
+            label={DeliveryDateLabel} name="deliveryTime">
             <DatePickerSelect defualtToday={true} className='w-full' />
           </FormItem>
 

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

@@ -5,10 +5,10 @@
  */
 import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import React, { useEffect, useLayoutEffect, useState } from 'react'
-import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel } from '../../constants'
+import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel } from '../../constants'
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
 import { Table } from 'antd';
-import { DeliveryNoticeTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
+import { DeliveryNoteAddFromTableColumn, DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
 import NoteFactoryService from '../../assets/handles/DeliveryNoteService';
 import { useLocation } from 'umi';
 import qs from 'query-string';
@@ -27,7 +27,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
     Distribution,
     DeliveryInfo,
     LogisticsInfo,
-    DeliveryGood,
+    Material,
     ExternalRoamRecord
   ])
 
@@ -139,10 +139,10 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
       </ContentBox>
 
 
-      <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+      <ContentBox title={Material.name} id={Material.key} cols={1}>
 
         <Table
-          columns={DeliveryNoticeTableColumn}
+          columns={DeliveryNoticeTableColumnSRM}
           rowKey="id"
           dataSource={tableDataSource}
           pagination={{

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

@@ -12,7 +12,7 @@ import { Button, Form, Input, message, Radio, Table } from 'antd'
 import { FormItem, required } from '@/components/FormItem'
 import { DeliveryNoticeTableColumn, ExternalRoamRecordTableColumn } from "../../constants/page-table-column"
 import { HarvestMaterialContextProvider, HarvestMaterialInput } from '../../assets/context'
-import { DeliveryNoteB2bUploadService, ReceiveOrderCreate, ReceivingNoteAddService } from "../../assets/handles/HandleFormSubmit"
+import { DeliveryNoteB2bUploadService, ReceiveOrderCreate, ReceiveOrderUpdate, ReceivingNoteAddService } from "../../assets/handles/HandleFormSubmit"
 import NoteFactoryService from "../../assets/handles/DeliveryNoteService"
 import { RoleSelect } from "@/components/RoleSelect"
 import { AddressDrawer, ReceiverAddress, ShipperAddress } from "@/components/AddressDrawer"
@@ -34,7 +34,7 @@ function DeliveryNoteAddForm() {
   const location = useLocation()
   const { id } = (location as any).query
   const [form] = useForm()
-  const service = new ReceiveOrderCreate(form);
+  const service = new ReceiveOrderUpdate(form);
   service.setTableData(tableDataSource)
 
   const [anchors, setAnchors] = useState<AnchorsItem[]>(() => {