Merge branch 'v2-220418' of…

src/pages/order/constants/label.ts

@@ -77,5 +77,5 @@ export const AlreadyDeliveryNoteGenerated = intl.formatMessage({id: 'order.yishe
 
 export const Deliverylimit = intl.formatMessage({id: 'order.songhuoshuliangbunengdayu',defaultMessage: '送货数量不能大于待送货数量'})
 
-
+export const PlearInput = '请输入'
 

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

@@ -75,12 +75,11 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
   }, [id])
 
   const handleSubmit = useCallback(() => {
-
+    
     Modal.confirm({
       title: "提示",
       content: "确认送货单资料填写是否正确，提交后不能再撤回!",
       onOk: () => {
-
         service.setTableData(tableDataSource);
         service.submit().then(res => {
           if (res.code === 1000) {

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

@@ -99,7 +99,7 @@ const DeliveryNoteManageDetails: React.FC = () => {
               {info?.receiveTime}
             </ListInfoItem>
 
-            <ListInfoItem className="mt-16" label='收货货人'>
+            <ListInfoItem className="mt-16" label='收货人'>
               {info?.receiverBO?.consignee}
             </ListInfoItem>
             <ListInfoItem className="mt-16" label='收货电话'>

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

@@ -6,9 +6,9 @@ import {
   ReceiptAddLabel, NoteLabel, DeliveryTimeLabel,
   ConsigneeTimeLabel, LogisticsCompanyLabel, LogisticsCarNoLabel, LogisticsNoLabel,
   DeliveryAbstractLabel, BuyerLabel, DeliveryDateLabel, DeliveryNameLabel,
-  DeliveryPhoneLabel, ReceivingAddress, DeliveryTypeLabel, DeliveryNoLabel, ExternalRoamRecord, DeliverySlefAddrLabel, DeliveryDate, ReceivingTime, ConsigneeLabel, ConsigneePhoneLabel
+  DeliveryPhoneLabel, ReceivingAddress, DeliveryTypeLabel, DeliveryNoLabel, ExternalRoamRecord, DeliverySlefAddrLabel, DeliveryDate, ReceivingTime, ConsigneeLabel, ConsigneePhoneLabel, PlearInput
 } from '../../constants'
-import { Button, Form, Input, message, Radio, Table } from 'antd'
+import { Button, Form, Input, message, Modal, Radio, Table } from 'antd'
 import { FormItem, required } from '@/components/FormItem'
 import { DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from "../../constants/page-table-column"
 import { HarvestMaterialContextProvider, HarvestMaterialInput } from '../../assets/context'
@@ -68,6 +68,8 @@ function DeliveryNoteAddForm() {
         "executorVO.phone": res?.executorVO?.phone,
         "executorVO.consignee": res?.executorVO?.consignee,
         "executorVO.carNumbers": res?.executorVO?.carNumbers,
+        "receiveVO.phone": res?.receiveVO?.phone,
+        "receiveVO.consignee": res?.receiveVO?.consignee,
         logisticsCompanyInt: {
           label: res?.logisticsCompany,
           value: res?.logisticsCompanyId
@@ -87,12 +89,20 @@ function DeliveryNoteAddForm() {
 
 
   function handleSubmit() {
-    service.submit().then(res => {
-      if (res.code == 1000) {
-        message.success(res.message)
-        history.go(-1)
-      } else {
-        message.error(res.message)
+    Modal.confirm({
+      title: "提示",
+      content: "确认送货单资料填写是否正确，提交后不能再撤回!",
+      onOk: () => {
+        service.setTableData(tableDataSource);
+        service.submit().then(res => {
+          if (res.code === 1000) {
+            handleLeave(false)
+            setTimeout(() => {
+              history.go(-1)
+            }, 1000);
+          }
+        });
+
       }
     })
   }
@@ -126,7 +136,7 @@ function DeliveryNoteAddForm() {
               required()
             ]}
             label={DeliveryNoLabel} name="deliveryNo">
-            <Input disabled={true} />
+            <Input disabled={true}  placeholder={`${PlearInput}${DeliveryNoLabel}`}/>
           </FormItem>
 
           <FormItem
@@ -134,7 +144,7 @@ function DeliveryNoteAddForm() {
               required()
             ]}
             label={DeliveryAbstractLabel} name="digest">
-            <Input disabled={true} />
+            <Input disabled={true} placeholder={`${PlearInput}${DeliveryAbstractLabel}`} />
           </FormItem>
 
           <FormItem
@@ -155,7 +165,7 @@ function DeliveryNoteAddForm() {
           </FormItem>
 
           <FormItem label={NoteLabel} name="remark">
-            <Input />
+            <Input placeholder={`${PlearInput}${NoteLabel}`} />
           </FormItem>
 
         </ContentBox>
@@ -179,7 +189,7 @@ function DeliveryNoteAddForm() {
               }
             ]}
             label={ConsigneeLabel} name="receiveVO.consignee">
-            <Input />
+            <Input placeholder={`${PlearInput}${ConsigneeLabel}`} />
           </FormItem>
           <FormItem
             rules={[
@@ -188,6 +198,7 @@ function DeliveryNoteAddForm() {
             label={ReceivingAddress} name="receiveVO">
             <ReceiverAddress
               disabled={true}
+              hiddenBtn
             />
           </FormItem>
 
@@ -199,7 +210,7 @@ function DeliveryNoteAddForm() {
               }
             ]}
             label={ConsigneePhoneLabel} name="receiveVO.phone">
-            <Input />
+            <Input placeholder={`${PlearInput}${ConsigneePhoneLabel}`} />
           </FormItem>
 
 
@@ -238,7 +249,7 @@ function DeliveryNoteAddForm() {
           </FormItem>
 
           <FormItem label={LogisticsCarNoLabel} name="executorVO.carNumbers">
-            <Input />
+            <Input placeholder={`${PlearInput}${LogisticsCarNoLabel}`} />
           </FormItem>
           <FormItem label={LogisticsCompanyLabel} name="logisticsCompanyInt">
             <LogisticsCompanyMerchantsSelect />
@@ -250,7 +261,7 @@ function DeliveryNoteAddForm() {
               }
             ]}
             name="logisticsNo">
-            <Input maxLength={20} />
+            <Input maxLength={20} placeholder={`${PlearInput}${LogisticsNoLabel}`}  />
           </FormItem>
         </ContentBox>