Commit cd6d77a3 authored by ganke's avatar ganke

fix: 收货单管理的bug修复

parent e8c269ba
...@@ -10,7 +10,7 @@ import CommodityRoute from './commodityRoute'; // 商品能力路由 ...@@ -10,7 +10,7 @@ import CommodityRoute from './commodityRoute'; // 商品能力路由
// import ChannelRoute from './channelRoute' // 渠道能力路由 // import ChannelRoute from './channelRoute' // 渠道能力路由
import TranactionRoute from './tranactionRoute'; // 交易能力路由 import TranactionRoute from './tranactionRoute'; // 交易能力路由
// import LogisticsRoute from './logisticsRoutes' // 物流能力路由 // import LogisticsRoute from './logisticsRoutes' // 物流能力路由
// import PayandSettleRoute from './payandSettle' //支付与结算 import PayandSettleRoute from './payandSettle' //支付与结算
// import AuthConfigRoute from './authConfigRoute' // import AuthConfigRoute from './authConfigRoute'
// import AfterService from './afterServiceRoute' // 售后 // import AfterService from './afterServiceRoute' // 售后
// import HandlingRoute from './handlingRoute'; // 加工能力 // import HandlingRoute from './handlingRoute'; // 加工能力
...@@ -46,7 +46,7 @@ const srmPurchaserHomeRoute = { ...@@ -46,7 +46,7 @@ const srmPurchaserHomeRoute = {
// isDev ? [ homeRoute, OrderRoute ] : // isDev ? [ homeRoute, OrderRoute ] :
// const routes = asyncRoutes; // const routes = asyncRoutes;
const routes = isDev ? [ homeRoute, OrderRoute ] : asyncRoutes; const routes = isDev ? [ homeRoute, OrderRoute, PayandSettleRoute ] : asyncRoutes;
const memberCenterRoute = { const memberCenterRoute = {
path: '/memberCenter', path: '/memberCenter',
......
...@@ -111,6 +111,7 @@ export class HandleFormSubmit { ...@@ -111,6 +111,7 @@ export class HandleFormSubmit {
sendTime: data?.sendTime ? moment(data?.sendTime) : moment().startOf('day'), sendTime: data?.sendTime ? moment(data?.sendTime) : moment().startOf('day'),
"executorVO.carNumbers": data?.executorVO?.carNumbers, "executorVO.carNumbers": data?.executorVO?.carNumbers,
"receiveVO.phone": data?.receiveVO?.phone, "receiveVO.phone": data?.receiveVO?.phone,
"receiveVO.consignee":data?.receiveVO?.consignee,
logisticsNo: data?.logisticsNo, logisticsNo: data?.logisticsNo,
logisticsCompanyInt: { logisticsCompanyInt: {
label: data?.logisticsCompany, label: data?.logisticsCompany,
......
...@@ -100,10 +100,10 @@ const DeliveryNoteManageDetails: React.FC = () => { ...@@ -100,10 +100,10 @@ const DeliveryNoteManageDetails: React.FC = () => {
</ListInfoItem> </ListInfoItem>
<ListInfoItem className="mt-16" label='收货人'> <ListInfoItem className="mt-16" label='收货人'>
{info?.receiverBO?.consignee} {info?.executorVO?.consignee}
</ListInfoItem> </ListInfoItem>
<ListInfoItem className="mt-16" label='收货电话'> <ListInfoItem className="mt-16" label='收货电话'>
{info?.receiverBO?.phone} {info?.executorVO?.phone}
</ListInfoItem> </ListInfoItem>
</div> </div>
......
...@@ -89,6 +89,7 @@ function DeliveryNoteAddForm() { ...@@ -89,6 +89,7 @@ function DeliveryNoteAddForm() {
function handleSubmit() { function handleSubmit() {
console.log(tableDataSource)
Modal.confirm({ Modal.confirm({
title: "提示", title: "提示",
content: "确认送货单资料填写是否正确,提交后不能再撤回!", content: "确认送货单资料填写是否正确,提交后不能再撤回!",
...@@ -183,16 +184,6 @@ function DeliveryNoteAddForm() { ...@@ -183,16 +184,6 @@ function DeliveryNoteAddForm() {
<FormItem <FormItem
rules={[ rules={[
{
required: false,
message: '',
}
]}
label={ConsigneeLabel} name="receiveVO.consignee">
<Input placeholder={`${PlearInput}${ConsigneeLabel}`} />
</FormItem>
<FormItem
rules={[
required() required()
]} ]}
label={ReceivingAddress} name="receiveVO"> label={ReceivingAddress} name="receiveVO">
...@@ -209,7 +200,19 @@ function DeliveryNoteAddForm() { ...@@ -209,7 +200,19 @@ function DeliveryNoteAddForm() {
message: '', message: '',
} }
]} ]}
label={ConsigneePhoneLabel} name="receiveVO.phone"> label={ConsigneeLabel} name="executorVO.consignee">
<Input placeholder={`${PlearInput}${ConsigneeLabel}`} />
</FormItem>
<FormItem
rules={[
{
required: false,
message: '',
}
]}
label={ConsigneePhoneLabel} name="executorVO.phone">
<Input placeholder={`${PlearInput}${ConsigneePhoneLabel}`} /> <Input placeholder={`${PlearInput}${ConsigneePhoneLabel}`} />
</FormItem> </FormItem>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment