Skip to content

J
jinfa-platform
Commit 8252248d authored by GuanHua's avatar GuanHua
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

parents 9e42aa53 35f2a4fb
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 128 deletions
src/constants/index.ts
View file @ 8252248d
......@@ -828,7 +828,7 @@ export const SaleOrderInsideWorkStateTexts = {
19: '待新增物流单',
20: '订单发货待确认',
23: '待确认回单',
24: '订单待归档',
24: '订单归档',
25: '待审核发货单',
26: '待审核物流单',
27: '待手工发货'
......@@ -1058,4 +1058,53 @@ export const RETURN_OUTER_STATUS = {
[REPAIR_OUTER_STATUS_FAILED]: '不接受申请',
[REPAIR_OUTER_STATUS_SUCCESS]: '接受申请',
[REPAIR_OUTER_STATUS_FINISHED]: '售后完成',
};
\ No newline at end of file
};
// 售后换货内部状态
export const EXCHANGE_INNER_STATUS_UNCOMMITTED = 1; // 待提交换货
export const EXCHANGE_INNER_STATUS_COMMITTED = 2; // 已提交
export const EXCHANGE_INNER_STATUS_SUCCESS_1 = 3; // 一级审核通过
export const EXCHANGE_INNER_STATUS_SUCCESS_2 = 4; // 二级审核通过
export const EXCHANGE_INNER_STATUS_FAILED = 5; // 审核不通过（不接受申请）
export const EXCHANGE_INNER_STATUS_CONFIRM_SUCCESS = 6; // 确认审核通过
export const EXCHANGE_INNER_STATUS_CONFIRM_FAILED = 7; // 确认审核不通过
export const EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_DELIVERY = 8; // 待新增退货发货单
export const EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_DELIVERY = 9; // 待审核退货发货单
export const EXCHANGE_INNER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS = 10; // 采购商待新增物流单
export const EXCHANGE_INNER_STATUS_CONSUMER_UNCONFIRMED_LOGISTICS = 11; // 采购商待确认物流单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_DELIVERY = 12; // 待确认退货发货
export const EXCHANGE_INNER_STATUS_NOT_ADDED_RETURN_STORAGE = 13; // 待新增退货入库单
export const EXCHANGE_INNER_STATUS_UNREVIEWED_RETURN_STORAGE = 14; // 待审核退货入库单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIVE = 15; // 待确认退货收货
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_RETURN_RECEIPT = 16; // 待确认退货回单
export const EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_DELIVERY = 17; // 待新增换货发货单
export const EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_DELIVERY = 18; // 待审核换货发货单
export const EXCHANGE_INNER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS = 19; // 供应商待新增物流单
export const EXCHANGE_INNER_STATUS_SUPPLIER_UNCONFIRMED_LOGISTICS = 20; // 供应商待确认物流单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_DELIVERY = 21; // 待确认换货发货
export const EXCHANGE_INNER_STATUS_NOT_ADDED_REPLACE_STORAGE = 22; // 待新增换货入库单
export const EXCHANGE_INNER_STATUS_UNREVIEWED_REPLACE_STORAGE = 23; // 待审核换货入库单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 24; // 待确认换货收货
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 25; // 待确认换货回单
export const EXCHANGE_INNER_STATUS_UNCONFIRMED_FINISHED = 26; // 待确认售后完成
export const EXCHANGE_INNER_STATUS_FINISHED = 27; // 已确认售后完成
// 售后换货外部状态
export const EXCHANGE_OUTER_STATUS_UNCOMMITTED = 1; // 待提交
export const EXCHANGE_OUTER_UNCONFIRMED = 2; // 待确认申请单
export const EXCHANGE_OUTER_STATUS_FAILED = 3; // 不接受申请
export const EXCHANGE_OUTER_STATUS_SUCCESS = 4; // 接受申请
export const EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_DELIVERY = 5; // 待新增退货发货单
export const EXCHANGE_OUTER_STATUS_CONSUMER_NOT_ADDED_LOGISTICS = 6; // 采购商待新增物流单
export const EXCHANGE_OUTER_STATUS_RETURN_DELIVERY = 7; // 待退货发货
export const EXCHANGE_OUTER_STATUS_NOT_ADDED_RETURN_STORAGE = 8; // 待新增退货入库单
export const EXCHANGE_OUTER_STATUS_RETURN_RECEIVE = 9; // 待退货收货
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_RETURN_RECEIPT = 10; // 待确认退货回单
export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_DELIVERY = 11; // 待新增换货发货单
export const EXCHANGE_OUTER_STATUS_SUPPLIER_NOT_ADDED_LOGISTICS = 12; // 供应商待新增物流单
export const EXCHANGE_OUTER_STATUS_REPLACE_DELIVERY = 13; // 待换货发货
export const EXCHANGE_OUTER_STATUS_NOT_ADDED_REPLACE_STORAGE = 14; // 待新增换货入库单
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIVE = 15; // 待换货收货
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_REPLACE_RECEIPT = 16; // 待确认换货回单
export const EXCHANGE_OUTER_STATUS_UNCONFIRMED_FINISHED = 17; // 待确认售后完成
export const EXCHANGE_OUTER_STATUS_FINISHED = 18; // 售后完成
\ No newline at end of file
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @ 8252248d
......@@ -211,7 +211,7 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
);
const beforeUpload = file => {
if (file.size / 1024 < 20) {
if (file.size / 1024 / 1024 > 20) {
message.warning('图片大小超过20M');
return Promise.reject();
}
......
src/pages/afterService/exchangeApplication/exchangeQuery/index.tsx
View file @ 8252248d
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 14:25:41
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-11-17 18:21:27
* @LastEditTime: 2020-11-19 10:04:28
* @Description: 换货申请单查询
*/
import React, { useState, useRef } from 'react';
......@@ -89,65 +89,56 @@ const ExchangeQuery: React.FC = () => {
const fetchListData = (params: any) => {
const { startTime, endTime, ...rest } = params;
// return new Promise((resolve, reject) => {
// PublicApi.getAsReturnGoodsPageBySupplier({
// startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
// ...rest,
// })
// .then(res => {
// if (res.code === 1000) {
// resolve(res.data);
// }
// reject();
// })
// .catch(() => {
// reject();
// });
// });
return Promise.resolve({
totalCount: 10,
data: [
{
applyNo: '123',
replaceId: 1,
}
],
return new Promise((resolve, reject) => {
PublicApi.getAsReplaceGoodsPageByConsumer({
startTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
endTime: startTime ? moment(startTime).format('YYYY-MM-DD') : null,
...rest,
})
.then(res => {
if (res.code === 1000) {
resolve(res.data);
}
reject();
})
.catch(() => {
reject();
});
});
};
// 初始化高级筛选选项
const fetchSearchItems = async () => {
// const res = await PublicApi.getPayCreditApplyPageItemsByConsumer();
const res = await PublicApi.getAsReplaceGoodsPageItems();
// if (res.code === 1000) {
// const { data } = res;
// const {
// outerStatusList = [],
// innerStatusList = [],
// } = data;
if (res.code === 1000) {
const { data } = res;
const {
outerStatusList = [],
innerStatusList = [],
} = data;
// const newColumns = columns.slice();
const newColumns = columns.slice();
// // filter 0 过滤掉全部选项
// coverColFiltersItem(
// newColumns,
// 'outerStatusName',
// outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// coverColFiltersItem(
// newColumns,
// 'innerStatusName',
// innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
// );
// filter 0 过滤掉全部选项
coverColFiltersItem(
newColumns,
'outerStatusName',
outerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
);
coverColFiltersItem(
newColumns,
'innerStatusName',
innerStatusList.map(item => ({ text: item.name, value: item.status })).filter(item => item.value),
);
// setColumns(newColumns);
setColumns(newColumns);
// return {
// outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
// };
// }
return {
outerStatus: outerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
innerStatus: innerStatusList.map(item => ({ label: item.name, value: item.status })).filter(item => item.value),
};
}
return {};
};
......
src/pages/afterService/repairApplication/repairPrSubmit/components/RepairForm/index.tsx
View file @ 8252248d
......@@ -245,7 +245,7 @@ const RepairForm: React.FC<BillsFormProps> = ({
);
const beforeUpload = file => {
if (file.size / 1024 < 20) {
if (file.size / 1024 / 1024 > 20) {
message.warning('图片大小超过20M');
return Promise.reject();
}
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @ 8252248d
......@@ -217,7 +217,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
);
const beforeUpload = file => {
if (file.size / 1024 < 20) {
if (file.size / 1024 / 1024 > 20) {
message.warning('图片大小超过20M');
return Promise.reject();
}
......
src/pages/payandSettle/amountAccountManage/paymentWithdraw/index.tsx
View file @ 8252248d
......@@ -71,7 +71,6 @@ const PaymentWithdraw: React.FC<{}> = () => {
]
const fetchData = (params: any) => {
console.log(params)
return new Promise((resolve, reject) => {
let obj = { ...params }
PublicApi.getPayMemberAssetAccountGetPayCashOutList(obj).then(res => {
......
src/pages/payandSettle/creditApplication/components/QuotaApplicationInfo/index.tsx
View file @ 8252248d
......@@ -118,7 +118,7 @@ const QuotaApplicationInfo: React.FC<QuotaApplicationInfo> = ({
);
const beforeUpload = file => {
if (file.size / 1024 < 20) {
if (file.size / 1024 / 1024 > 20) {
message.warning('图片大小超过20M');
return Promise.reject();
}
......
src/pages/transaction/_public/order/constant.ts
View file @ 8252248d
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import moment from 'moment'
export const orderTypeLabel = ['',
'询价采购',
......@@ -62,7 +63,7 @@ export const tableListSchema: ISchema = {
"supplyMembersName": {
type: 'string',
"x-component-props": {
placeholder: '请输入供应会员名称'
placeholder: '请输入采购会员名称'
}
},
"[startCreateTime,endCreateTime]": {
......
src/pages/transaction/_public/order/effects/useOrderDetail.tsx
View file @ 8252248d
......@@ -28,7 +28,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const dataRef = useRef<any>([
{ label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
{ label: '订单摘要', name: 'orderThe', span: 8 },
{ label: '供应会员', name: 'supplyMembersName', span: 8 },
{ label: type === 'saleOrder' ? '采购会员' : '供应会员', name: type === 'saleOrder' ? 'createMemberName' : 'supplyMembersName', span: 8 },
{ label: '下单模式', name: 'orderModel', span: 8, render: text => GlobalConfig.web.orderMode.find(v => v.value === text)?.label || '' },
{ label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
{ label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
......@@ -64,6 +64,8 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
const { code, data } = res
if (code === 1000) {
setPaylist(data)
} else {
message.error(res.message)
}
})
}
......
src/pages/transaction/components/orderDeleveRecord/index.tsx
View file @ 8252248d
......@@ -258,26 +258,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
}
return (
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2">
<Tabs.TabPane tab='订单收货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="productId"
/>
</Tabs.TabPane>
<Tabs.TabPane tab='订单收货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
</Tabs>
</MellowCard>
<>
{
(orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2">
{
orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="productId"
/>
</Tabs.TabPane>
}
{
orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
)
}
......
src/pages/transaction/components/orderPayTabs/index.tsx
View file @ 8252248d
......@@ -17,7 +17,7 @@ const TabHeader = ({dataSource}) => {
<div className={style.smallnumber}>￥{dataSource.payPrice || 0}</div>
</Col>
<Col>
<StatusColors status={dataSource.externalState} type='out'/>
<StatusColors status={dataSource.externalState} type='payOut'/>
</Col>
</Row>
}
......
src/pages/transaction/components/orderSaleRecord/index.tsx
View file @ 8252248d
......@@ -255,26 +255,35 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
}
}
return (
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2" animated={false}>
<Tabs.TabPane tab='订单发货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
<Tabs.TabPane tab='订单发货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
</Tabs>
</MellowCard>
<>
{
(orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
<MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
<Tabs defaultActiveKey="2" animated={false}>
{
orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单发货统计' key="1">
<Table
columns={outOrderCols}
dataSource={orderReceivingStatisticsResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
}
{
orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单发货明细' key="2">
<NestTable
NestColumns={[sideOrderCols, sideChildrenCols]}
rowKey='id'
childrenDataKey='orderDeliveryProducts'
dataSource={orderDeliveryDetailsResponses}
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
)
}
......
src/pages/transaction/components/orderTransformRecord/index.tsx
View file @ 8252248d
......@@ -162,26 +162,35 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = ({type}) => {
const { data } = useContext(OrderDetailContext)
const { externalProcurementOrderLogResponses, interiorProcurementOrderLogResponses } = data
return (
<MellowCard style={{marginTop: 24}} bordered={false}>
<Tabs defaultActiveKey="1">
<Tabs.TabPane tab='外部订单流转记录' key="1">
<Table
columns={outOrderCols}
dataSource={externalProcurementOrderLogResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
<Tabs.TabPane tab='内部订单流转记录' key="2">
<Table
columns={type === 'saleOrder' ? SaleSideOrderCols : PurchaseSideOrderCols}
dataSource={interiorProcurementOrderLogResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
</Tabs>
</MellowCard>
<>
{
(externalProcurementOrderLogResponses?.length > 0 || interiorProcurementOrderLogResponses?.length > 0) &&
<MellowCard style={{marginTop: 24}} bordered={false}>
<Tabs defaultActiveKey="1">
{
externalProcurementOrderLogResponses?.length > 0 && <Tabs.TabPane tab='外部订单流转记录' key="1">
<Table
columns={outOrderCols}
dataSource={externalProcurementOrderLogResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
}
{
interiorProcurementOrderLogResponses?.length > 0 && <Tabs.TabPane tab='内部订单流转记录' key="2">
<Table
columns={type === 'saleOrder' ? SaleSideOrderCols : PurchaseSideOrderCols}
dataSource={interiorProcurementOrderLogResponses}
pagination={false}
rowKey="id"
/>
</Tabs.TabPane>
}
</Tabs>
</MellowCard>
}
</>
)
}
......
src/pages/transaction/purchaseOrder/index.tsx
View file @ 8252248d
......@@ -17,6 +17,7 @@ import Submit from '@/components/NiceForm/components/Submit'
export interface PurchaseOrderProps { }
const fetchTableData = async (params) => {
console.log(params,'params')
const { data } = await PublicApi.getOrderProcurementOrderList(params)
return data
}
......
src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts
View file @ 8252248d
import { productColumns } from './../../../../afterService/exchangeGoods/waitAddLogisticsOrder/opration/component/selectProductModal.tsx/index';
import { ISchemaFormActions, FormEffectHooks, IFieldState, ISchemaFormAsyncActions, createEffectHook } from '@formily/antd';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
import { useLinkageUtils } from '@/utils/formEffectUtils';
......
src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx
View file @ 8252248d
......@@ -4,6 +4,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
import { useEffect, useState, useRef, useContext } from 'react'
import { PublicApi } from '@/services/api'
import { ReadyAddOrderDetailContext } from '../../context'
import { message } from 'antd'
export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions, memberId: any): any => {
const paywayData = useRef<any>({})
......@@ -84,6 +85,8 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
paywayData.current = data
setColumns(newColumns)
} else {
message.error(res.message)
}
})
}
......
src/pages/transaction/purchaserEvaluation/received/detail/index.tsx
View file @ 8252248d
......@@ -103,7 +103,7 @@ const ReceivedDetail: React.FC = () => {
};
const beforeUpload = file => {
if (file.size / 1024 < 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
src/pages/transaction/purchaserEvaluation/sent/components/DetailInfo/index.tsx
View file @ 8252248d
......@@ -146,7 +146,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
};
const beforeUpload = file => {
if (file.size / 1024 < 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
src/pages/transaction/purchaserEvaluation/unevaluated/evaluate/index.tsx
View file @ 8252248d
......@@ -122,7 +122,7 @@ const EvaluateOrder: React.FC = () => {
};
const beforeUpload = file => {
if (file.size / 1024 > 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
src/pages/transaction/saleOrder/index.tsx
View file @ 8252248d
......@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const'
import { DatePicker } from '@formily/antd-components'
import Submit from '@/components/NiceForm/components/Submit'
import moment from 'moment'
// 销售订单查询
......
src/pages/transaction/supplierEvaluation/received/detail/index.tsx
View file @ 8252248d
......@@ -103,7 +103,7 @@ const ReceivedDetail: React.FC = () => {
};
const beforeUpload = file => {
if (file.size / 1024 < 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
src/pages/transaction/supplierEvaluation/sent/components/DetailInfo/index.tsx
View file @ 8252248d
......@@ -145,7 +145,7 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
};
const beforeUpload = file => {
if (file.size / 1024 < 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
src/pages/transaction/supplierEvaluation/unevaluated/evaluate/index.tsx
View file @ 8252248d
......@@ -122,7 +122,7 @@ const EvaluateOrder: React.FC = () => {
};
const beforeUpload = file => {
if (file.size / 1024 > 10) {
if (file.size / 1024 / 1024 > 10) {
message.warning('图片大小超过10M');
return Promise.reject();
}
......
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