Commit e76ee40e authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
parents b4ed44b0 c4a467cf
...@@ -642,12 +642,13 @@ export const logisticsDeliverySearchSchema: ISchema = { ...@@ -642,12 +642,13 @@ export const logisticsDeliverySearchSchema: ISchema = {
} }
} }
}, },
inventoryId: { invoicesType: {
type: 'string', type: 'string',
"x-component": 'SearchSelect', // fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
// "x-component": 'SearchSelect',
'x-component-props': { 'x-component-props': {
placeholder: '单据类型', placeholder: '单据类型',
fetchSearch: PublicApi.getWarehouseInvoicesTypeAll,
style: { style: {
width: 160 width: 160
} }
......
...@@ -30,7 +30,7 @@ export interface ModalTableProps extends IStandardTableProps<any> { ...@@ -30,7 +30,7 @@ export interface ModalTableProps extends IStandardTableProps<any> {
export const logisticsDeliverySearchSchema: ISchema = { export const logisticsDeliverySearchSchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
invoicesNo: { orderNo: {
type: 'string', type: 'string',
'x-component': 'ModalSearch', 'x-component': 'ModalSearch',
'x-component-props': { 'x-component-props': {
...@@ -53,7 +53,7 @@ export const logisticsDeliverySearchSchema: ISchema = { ...@@ -53,7 +53,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
}, },
}, },
properties: { properties: {
orderNo: { memberName: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '会员名称', placeholder: '会员名称',
...@@ -62,7 +62,7 @@ export const logisticsDeliverySearchSchema: ISchema = { ...@@ -62,7 +62,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
} }
} }
}, },
invoicesAbstract: { orderThe: {
type: 'string', type: 'string',
"x-component-props": { "x-component-props": {
placeholder: '单据摘要', placeholder: '单据摘要',
...@@ -71,7 +71,7 @@ export const logisticsDeliverySearchSchema: ISchema = { ...@@ -71,7 +71,7 @@ export const logisticsDeliverySearchSchema: ISchema = {
} }
} }
}, },
"[startTransactionTime,endTransactionTime]": { "[startCreateTime,endCreateTime]": {
type: 'string', type: 'string',
"x-component": "dateSelect", "x-component": "dateSelect",
"x-component-props": { "x-component-props": {
...@@ -283,7 +283,7 @@ const ModalTableOrder: React.FC<ModalTableProps> = (props) => { ...@@ -283,7 +283,7 @@ const ModalTableOrder: React.FC<ModalTableProps> = (props) => {
useStateFilterSearchLinkageEffect( useStateFilterSearchLinkageEffect(
$, $,
actions, actions,
type === 1 ? 'invoicesNo' : 'applyNo', type === 1 ? 'orderNo' : 'applyNo',
FORM_FILTER_PATH, FORM_FILTER_PATH,
); );
} }
......
...@@ -24,6 +24,34 @@ export const SelectGoodsColumns: ColumnType<any>[] = [ ...@@ -24,6 +24,34 @@ export const SelectGoodsColumns: ColumnType<any>[] = [
} }
] ]
export const AfterSalesSelectGoodsColumns: ColumnType<any>[] = [
{
title: '商品ID',
key: 'productId',
dataIndex: 'productId',
},
{
title: '商品名称',
key: 'productName',
dataIndex: 'productName',
},
{
title: '品类',
key: 'category',
dataIndex: 'category',
},
{
title: '订单编号',
key: 'orderNo',
dataIndex: 'orderNo',
},
{
title: '品牌',
key: 'brand',
dataIndex: 'brand',
}
]
export const ExternalListColumns: ColumnType<any>[] = [ export const ExternalListColumns: ColumnType<any>[] = [
{ {
title: '流转顺序号', title: '流转顺序号',
......
...@@ -8,7 +8,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout'; ...@@ -8,7 +8,7 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { LinkOutlined, PlusOutlined } from '@ant-design/icons'; import { LinkOutlined, PlusOutlined } from '@ant-design/icons';
import { PublicApi } from '@/services/api'; import { PublicApi } from '@/services/api';
import ModalTable from '@/components/ModalTable'; import ModalTable from '@/components/ModalTable';
import { SelectGoodsColumns, ExternalListColumns } from './components/columns'; import { SelectGoodsColumns, ExternalListColumns, AfterSalesSelectGoodsColumns } from './components/columns';
import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'; import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
import moment from 'moment'; import moment from 'moment';
import ModalTableOrder from './components/ModalTableOrder'; import ModalTableOrder from './components/ModalTableOrder';
...@@ -401,8 +401,6 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -401,8 +401,6 @@ const AddLogistics: React.FC<{}> = () => {
} }
}) })
break; break;
default:
break;
} }
}) })
} }
...@@ -474,6 +472,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -474,6 +472,7 @@ const AddLogistics: React.FC<{}> = () => {
{ {
title: '单据时间', title: '单据时间',
dataIndex: 'applyTime', dataIndex: 'applyTime',
render: (text: any) => <>{moment(text).format('YYYY-MM-DD HH:mm:ss')} </>
} }
] ]
/** 选择发货单 列表数据 */ /** 选择发货单 列表数据 */
...@@ -489,6 +488,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -489,6 +488,7 @@ const AddLogistics: React.FC<{}> = () => {
/**确定发货单 */ /**确定发货单 */
const handleShipping = () => { const handleShipping = () => {
const data = { ...query }; const data = { ...query };
if (shippingRowCtl.selectRow.length > 0) {
const selectRow = shippingRowCtl.selectRow[0] const selectRow = shippingRowCtl.selectRow[0]
data.shipmentOrderId = selectRow.id data.shipmentOrderId = selectRow.id
data.shipmentOrderCode = selectRow.invoicesNo;//发货单号 data.shipmentOrderCode = selectRow.invoicesNo;//发货单号
...@@ -504,6 +504,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -504,6 +504,7 @@ const AddLogistics: React.FC<{}> = () => {
setCreateType(1) setCreateType(1)
setshippingvisible(false); setshippingvisible(false);
} }
}
/**确定对应订单号/售后单 */ /**确定对应订单号/售后单 */
const conditions = (selectRow: any) => { const conditions = (selectRow: any) => {
...@@ -526,6 +527,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -526,6 +527,7 @@ const AddLogistics: React.FC<{}> = () => {
/**确定选择对应订单号/售后单 */ /**确定选择对应订单号/售后单 */
const handleInvoices = (type: number) => { const handleInvoices = (type: number) => {
const selectRow = invoicesRowCtl.selectRow[0] const selectRow = invoicesRowCtl.selectRow[0]
if (invoicesRowCtl.selectRow.length > 0) {
const data = { ...query }; const data = { ...query };
data.relevanceType = type; data.relevanceType = type;
setrelevanceType(type) setrelevanceType(type)
...@@ -537,8 +539,9 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -537,8 +539,9 @@ const AddLogistics: React.FC<{}> = () => {
data.receiverAddressId = selectRow.receiverAddressId; data.receiverAddressId = selectRow.receiverAddressId;
data.receiverFullAddress = selectRow.fullAddress; data.receiverFullAddress = selectRow.fullAddress;
data.receiverMemberName = selectRow.memberName; data.receiverMemberName = selectRow.memberName;
data.relevanceOrderId = selectRow.id
} }
data.relevanceOrderId = selectRow.id
data.relevanceOrderCode = selectRow.orderNo data.relevanceOrderCode = selectRow.orderNo
form.setFieldsValue({ form.setFieldsValue({
relevanceOrderCode: selectRow.orderNo relevanceOrderCode: selectRow.orderNo
...@@ -562,6 +565,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -562,6 +565,7 @@ const AddLogistics: React.FC<{}> = () => {
} }
setinvoicesvisible(false); setinvoicesvisible(false);
} }
}
const handleDelect = (idx: number) => { const handleDelect = (idx: number) => {
const list = [...detailList]; const list = [...detailList];
...@@ -643,6 +647,8 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -643,6 +647,8 @@ const AddLogistics: React.FC<{}> = () => {
/**跳转到售后/订单的详情 */ /**跳转到售后/订单的详情 */
const jumpOrderDetail = (id: any) => { const jumpOrderDetail = (id: any) => {
console.log(id, 1086)
if (id) {
switch (Number(createType)) { switch (Number(createType)) {
case 1: case 1:
switch (Number(relevanceType)) { switch (Number(relevanceType)) {
...@@ -676,6 +682,9 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -676,6 +682,9 @@ const AddLogistics: React.FC<{}> = () => {
window.open(`/memberCenter/afterService/returnApplication/returnPrAddLogistics/detail?id=${id}`) window.open(`/memberCenter/afterService/returnApplication/returnPrAddLogistics/detail?id=${id}`)
break; break;
} }
} else {
message.error('此订单id不存在!')
}
} }
return ( return (
...@@ -705,7 +714,8 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -705,7 +714,8 @@ const AddLogistics: React.FC<{}> = () => {
} }
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label="物流单号" name='receiverName1'><span>{query.logisticsOrderNo}</span></Form.Item> {query.logisticsOrderNo && <Form.Item label="物流单号" name='receiverName1'><span>{query.logisticsOrderNo}</span></Form.Item>}
<Form.Item label='对应发货单号' name='shipmentOrderCode'> <Form.Item label='对应发货单号' name='shipmentOrderCode'>
<Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.shipmentOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} /> <Search disabled={!!history.location.query.createType} readOnly value={Object.keys(query).length > 0 ? query.shipmentOrderCode : undefined} enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} />
{query.shipmentOrderCode && <Button type='link' {query.shipmentOrderCode && <Button type='link'
...@@ -730,13 +740,15 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -730,13 +740,15 @@ const AddLogistics: React.FC<{}> = () => {
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item label="单据时间" name='voucherTime'><span>{query.voucherTime && moment(query.voucherTime).format('YYYY-MM-DD HH:mm:ss')} </span></Form.Item> <Form.Item label="单据时间" name='voucherTime'><span>{query.voucherTime && moment(query.voucherTime).format('YYYY-MM-DD HH:mm:ss')} </span></Form.Item>
{createType !== 1 &&
<Form.Item label="外部状态" name='externalState'> <Form.Item label="外部状态" name='externalState'>
{ query.externalState === 1 ? <Badge status="warning" text='待提交' /> : {query.externalState === 1 ? <Badge status="warning" text='待提交' /> :
query.externalState === 2 ? <Badge status="processing" text='待确认' /> : query.externalState === 2 ? <Badge status="processing" text='待确认' /> :
query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> : query.externalState === 3 ? <Badge status="error" text='不接收物流单' /> :
query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : '' query.externalState === 4 ? <Badge status="success" text='接收物流单' /> : ''
} }
</Form.Item> </Form.Item>
}
</Form> </Form>
</TabPane> </TabPane>
{/** 物流单明细 */} {/** 物流单明细 */}
...@@ -754,9 +766,11 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -754,9 +766,11 @@ const AddLogistics: React.FC<{}> = () => {
{/** 运费 */} {/** 运费 */}
<TabPane key='tab-3' tab='运费' forceRender> <TabPane key='tab-3' tab='运费' forceRender>
<Form {...layout}> <Form {...layout}>
{query.freightPrice &&
<Form.Item label='运费'> <Form.Item label='运费'>
<span>{query.freightPrice}</span> <span>{query.freightPrice}</span>
</Form.Item> </Form.Item>
}
<Form.Item label='结算方式'> <Form.Item label='结算方式'>
<span>{query.settlementWay}</span> <span>{query.settlementWay}</span>
</Form.Item> </Form.Item>
...@@ -803,7 +817,7 @@ const AddLogistics: React.FC<{}> = () => { ...@@ -803,7 +817,7 @@ const AddLogistics: React.FC<{}> = () => {
<ModalTable <ModalTable
modalTitle='选择商品' modalTitle='选择商品'
visible={visible} visible={visible}
columns={SelectGoodsColumns} columns={(createType !== 4 && createType !== 5 && createType !== 6) ? SelectGoodsColumns : AfterSalesSelectGoodsColumns}
forceRender={true} forceRender={true}
fetchTableData={(params) => fetchData(params)} fetchTableData={(params) => fetchData(params)}
cancel={() => setvisible(false)} cancel={() => setvisible(false)}
......
...@@ -68,7 +68,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => { ...@@ -68,7 +68,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
} else { } else {
onEdit(value, idType, modifyIndex) onEdit(value, idType, modifyIndex)
} }
setedit({});
setmodalvisible(false); setmodalvisible(false);
} }
...@@ -109,7 +109,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => { ...@@ -109,7 +109,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
modalvisible={modalvisible} modalvisible={modalvisible}
edit={edit} edit={edit}
onOK={(value) => handleOk(value, type)} onOK={(value) => handleOk(value, type)}
onCancel={() => setmodalvisible(false)} onCancel={() => { setmodalvisible(false); setedit({}); }}
/> />
</> </>
) )
......
...@@ -71,10 +71,10 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => { ...@@ -71,10 +71,10 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
return ( return (
<Modal <Modal
width={576} width={576}
title='新增参数配置' title={`${Object.keys(edit).length > 0 ? `编辑` : '新增'}参数配置`}
visible={modalvisible} visible={modalvisible}
onOk={handleOk} onOk={handleOk}
onCancel={() => onCancel()} onCancel={() => { onCancel(); form.resetFields(); }}
> >
<Form <Form
form={form} form={form}
......
...@@ -425,7 +425,7 @@ const Details: React.FC<parmas> = (props) => { ...@@ -425,7 +425,7 @@ const Details: React.FC<parmas> = (props) => {
progressDot progressDot
current={data.externalState - 1} current={data.externalState - 1}
> >
{Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => { {(Object.keys(data).length > 0 && data.externalInquiryListStateResponses) && data.externalInquiryListStateResponses.map((item, index) => {
return ( return (
<Step <Step
key={index} key={index}
...@@ -443,7 +443,7 @@ const Details: React.FC<parmas> = (props) => { ...@@ -443,7 +443,7 @@ const Details: React.FC<parmas> = (props) => {
progressDot progressDot
current={Number(data.interiorState - 1)} current={Number(data.interiorState - 1)}
> >
{Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses.map((item, index) => { {(Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses ) && data.interiorRequisitionFormStateResponses.map((item, index) => {
return ( return (
<Step <Step
key={index} key={index}
......
...@@ -39,6 +39,10 @@ const AddQuotes: React.FC<parmas> = (props) => { ...@@ -39,6 +39,10 @@ const AddQuotes: React.FC<parmas> = (props) => {
memberRoleId: res.data.memberRoleId, memberRoleId: res.data.memberRoleId,
memberRoleName: res.data.memberRoleName memberRoleName: res.data.memberRoleName
}) })
setaddress({
fullAddress: res.data.fullAddress,
fullAddressId: res.data.fullAddressId
})
} }
}) })
} }
......
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