Skip to content

J
jinfa-platform
Commit a21333c1 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏
Browse files
Options

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

parents 4997f61e 4e0b4725
Show whitespace changes
Inline Side-by-side
Showing with 161 additions and 62 deletions
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @ a21333c1
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-24 10:32:10
* @LastEditTime: 2020-12-29 11:32:18
* @Description: 维修商品抽屉组件
*/
import React, { useState, useEffect } from 'react';
......@@ -248,7 +248,10 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
});
if (!payload.length) {
this.setState({ loading: false });
this.setState({
dataSource: orderListRes,
loading: false,
});
return;
}
......@@ -575,6 +578,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
</Button>
</div>
}
destroyOnClose
>
<div className={styles.order}>
<div className={styles['order-head']}>
......
src/pages/afterService/components/RefundModal/Balance/index.tsx
View file @ a21333c1
......@@ -41,7 +41,10 @@ const Balance: React.FC<BalanceProps> = ({
const [loading, setLoading] = useState(false);
const getPayAssetAccountGetUserBalance = () => {
setLoading(false);
if (!purchaserId || !purchaserRoleId) {
return;
}
setLoading(true);
PublicApi.getPayAssetAccountGetChildUserBalance({
childMemberId: `${purchaserId}`,
childMemberRoleId: `${purchaserRoleId}`,
......
src/pages/afterService/components/RefundModal/Credit/index.tsx
View file @ a21333c1
import React, { useState } from 'react';
import { Descriptions, Space, Button } from 'antd';
import React, { useState, useEffect } from 'react';
import { Descriptions, Space, Button, Spin } from 'antd';
import { PublicApi } from '@/services/api';
interface bankAccount {
id: number,
name: string,
bankAccount: string,
bankDeposit: string,
memberId: number,
interface Credit {
quota: number,
useQuota: number,
canUseQuota: number,
isUsable: number,
};
interface BalanceProps {
......@@ -26,6 +26,22 @@ interface BalanceProps {
* 弹窗提交 loading
*/
submitLoading: boolean;
/**
* 采购商id
*/
purchaserId: number,
/**
* 采购商角色id
*/
purchaserRoleId: number,
/**
* 供应商id
*/
supplierId: number,
/**
* 供应商角色id
*/
supplierRoleId: number,
};
const Credit: React.FC<BalanceProps> = ({
......@@ -33,23 +49,55 @@ const Credit: React.FC<BalanceProps> = ({
handleConfirm,
value,
submitLoading,
purchaserId,
purchaserRoleId,
supplierId,
supplierRoleId,
}) => {
const [bankAccount, setBankAccount] = useState<bankAccount>({
id: 0,
name: '',
bankAccount: '',
bankDeposit: '',
memberId: 0,
const [credit, setCredit] = useState<Credit>({
quota: 0,
useQuota: 0,
canUseQuota: 0,
isUsable: 0,
});
const [loading, setLoading] = useState(false);
const getMemberCredit = () => {
if (
!purchaserId ||
!purchaserRoleId ||
!supplierId ||
!supplierRoleId
) {
return;
}
setLoading(true);
PublicApi.getPayCreditGetMemberCredit({
memberId: `${purchaserId}`,
roleId: `${purchaserRoleId}`,
parentMemberId: `${supplierId}`,
parentMemberRoleId: `${supplierRoleId}`,
}).then(res => {
if (res.code === 1000) {
setCredit(res.data);
}
}).finally(() => {
setLoading(false);
});
};
useEffect(() => {
getMemberCredit();
}, []);
return (
<>
<Spin spinning={loading}>
<Descriptions title="授信额度信息" column={1}>
<Descriptions.Item label="总授信额度">￥500000.00</Descriptions.Item>
<Descriptions.Item label="已用授信额度">￥500000.00</Descriptions.Item>
<Descriptions.Item label="可用授信额度">￥500000.00</Descriptions.Item>
<Descriptions.Item label="总授信额度">￥{credit.quota}</Descriptions.Item>
<Descriptions.Item label="已用授信额度">￥{credit.useQuota}</Descriptions.Item>
<Descriptions.Item label="可用授信额度">￥{credit.canUseQuota}</Descriptions.Item>
<Descriptions.Item label="当前退款金额">
<span style={{ color: '#EF6260' }}>￥6000.00</span>
<span style={{ color: '#EF6260' }}>￥{value.refundAmount}</span>
</Descriptions.Item>
</Descriptions>
......@@ -67,7 +115,7 @@ const Credit: React.FC<BalanceProps> = ({
</Button>
</Space>
</div>
</>
</Spin>
)
};
......
src/pages/afterService/components/RefundModal/UploadVoucher/index.tsx
View file @ a21333c1
......@@ -7,10 +7,11 @@ import { uploadVoucherModalSchema } from './schema';
const uploadVoucherFormActions = createFormActions();
interface bankAccount {
interface BankAccount {
name: string,
bankAccount: string,
bankDeposit: string,
id: number,
};
interface UploadVoucherProps {
......@@ -48,22 +49,23 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
purchaserId,
purchaserRoleId,
}) => {
const [bankAccount, setBankAccount] = useState<bankAccount>({
const [bankAccount, setBankAccount] = useState<BankAccount>({
name: '',
bankAccount: '',
bankDeposit: '',
id: 0,
});
const [loading, setLoading] = useState(false);
// 获取对公账户信息
const getSettleAccountsCorporateAccountConfig = (memberId: number, memberRoleId: number) => {
if (!memberId || !memberRoleId) {
const getSettleAccountsGetMemberAccountConfig = () => {
if (!purchaserId || !purchaserRoleId) {
return;
}
setLoading(true);
PublicApi.getSettleAccountsCorporateAccountConfig({
memberId: `${memberId}`,
memberRoleId: `${memberRoleId}`,
PublicApi.getSettleAccountsGetMemberAccountConfig({
memberId: `${purchaserId}`,
roleId: `${purchaserRoleId}`,
}).then(res => {
if (res.code === 1000) {
setBankAccount(res.data);
......@@ -74,11 +76,10 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
};
useEffect(() => {
getSettleAccountsCorporateAccountConfig(purchaserId, purchaserRoleId);
getSettleAccountsGetMemberAccountConfig();
}, []);
const beforeUploadVoucher = file => {
console.log(file.size)
if (file.size / 1024 > 200) {
message.warning('图片大小超过200K');
return Promise.reject();
......@@ -86,17 +87,17 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
};
const handleUploadVoucherSubmit = values => {
const { fileList = [] } = values;
const { fileList = [], id, ...rest } = values;
if (handleConfirm) {
if (!bankAccount || !bankAccount.name) {
if (!bankAccount || !bankAccount.id) {
message.error('没有收款账户相关信息，无法退款');
return;
}
handleConfirm({
...value,
payProve: {
...values,
...rest,
fileList: fileList.map(item => item.status === 'done' && ({
name: item.name,
proveUrl: item.data.url,
......@@ -110,7 +111,7 @@ const UploadVoucher: React.FC<UploadVoucherProps> = ({
<Spin spinning={loading}>
<NiceForm
previewPlaceholder=""
initialValues={bankAccount}
value={bankAccount}
effects={($, { setFieldState }) => {
}}
......
src/pages/afterService/components/RefundModal/index.tsx
View file @ a21333c1
......@@ -41,6 +41,13 @@ const RefundModal: React.FC<RefundModalProps> = ({
value,
submitLoading,
}) => {
const {
purchaserId,
purchaserRoleId,
supplierId,
supplierRoleId,
...rest
} = value;
const tempMap = {
uploadVoucher: {
......@@ -49,9 +56,9 @@ const RefundModal: React.FC<RefundModalProps> = ({
render: () => (
<Suspense fallback={null}>
<UploadVoucher
value={value}
purchaserId={value.purchaserId}
purchaserRoleId={value.purchaserRoleId}
value={rest}
purchaserId={purchaserId}
purchaserRoleId={purchaserRoleId}
handleConfirm={handleConfirm}
handleModalVisible={handleModalVisible}
submitLoading={submitLoading}
......@@ -65,7 +72,9 @@ const RefundModal: React.FC<RefundModalProps> = ({
render: () => (
<Suspense fallback={null}>
<Balance
value={value}
value={rest}
purchaserId={purchaserId}
purchaserRoleId={purchaserRoleId}
handleConfirm={handleConfirm}
handleModalVisible={handleModalVisible}
submitLoading={submitLoading}
......@@ -79,7 +88,11 @@ const RefundModal: React.FC<RefundModalProps> = ({
render: () => (
<Suspense fallback={null}>
<Credit
value={value}
value={rest}
purchaserId={purchaserId}
purchaserRoleId={purchaserRoleId}
supplierId={supplierId}
supplierRoleId={supplierRoleId}
handleConfirm={handleConfirm}
handleModalVisible={handleModalVisible}
submitLoading={submitLoading}
......@@ -93,7 +106,7 @@ const RefundModal: React.FC<RefundModalProps> = ({
render: () => (
<Suspense fallback={null}>
<COD
value={value}
value={rest}
handleConfirm={handleConfirm}
handleModalVisible={handleModalVisible}
submitLoading={submitLoading}
......
src/pages/afterService/components/ReturnDetailInfo/index.tsx
View file @ a21333c1
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 18:02:18
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-12-28 13:53:00
* @LastEditTime: 2020-12-29 11:00:22
* @Description: 退款明细
*/
import React, { useState } from 'react';
......@@ -66,6 +66,14 @@ interface ReturnDetailInfoProps {
* 采购商角色id
*/
purchaserRoleId: number,
/**
* 供应商id
*/
supplierId: number,
/**
* 供应商角色id
*/
supplierRoleId: number,
};
const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
......@@ -76,6 +84,8 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
innerStatus,
purchaserId,
purchaserRoleId,
supplierId,
supplierRoleId,
}) => {
const [visibleResult, setVisibleResult] = useState(false);
const [notReceivedLoading, setNotReceivedLoading] = useState(false);
......@@ -159,21 +169,37 @@ const ReturnDetailInfo: React.FC<ReturnDetailInfoProps> = ({
case PAY_CHANNEL_BALANCE: {
setModalName('balance');
setRefundModalVisible(true);
setRefundModalValue({ id, refundAmount: amount });
setRefundModalValue({
id,
refundAmount: amount,
purchaserId,
purchaserRoleId,
});
break;
};
// 线下支付
case PAY_CHANNEL_OFFLINE: {
setModalName('uploadVoucher');
setRefundModalVisible(true);
setRefundModalValue({ id, purchaserId, purchaserRoleId });
setRefundModalValue({
id,
purchaserId,
purchaserRoleId,
});
break;
};
// 授信支付
case PAY_CHANNEL_CREDIT: {
setModalName('credit');
setRefundModalVisible(true);
setRefundModalValue({ id, refundAmount: amount });
setRefundModalValue({
id,
refundAmount: amount,
purchaserId,
purchaserRoleId,
supplierId,
supplierRoleId,
});
break;
};
// 货到付款
......
src/pages/afterService/exchangeApplication/exchangePrSubmit/components/ExchangeForm/index.tsx
View file @ a21333c1
......@@ -29,6 +29,7 @@ const addSchemaAction = createFormActions();
const {
onFormInputChange$,
onFormInit$,
onFieldInputChange$,
} = FormEffectHooks;
interface BillsFormProps {
......@@ -528,6 +529,10 @@ const ExchangeForm: React.FC<BillsFormProps> = ({
});
}
});
onFieldInputChange$('supplierMember').subscribe(() => {
setGoodsValue([]);
});
}}
onSubmit={handleSubmit}
actions={addSchemaAction}
......
src/pages/afterService/returnApplication/components/DetailInfo/index.tsx
View file @ a21333c1
......@@ -418,6 +418,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus={detailInfo?.innerStatus}
purchaserId={detailInfo?.memberId}
purchaserRoleId={detailInfo?.roleId}
supplierId={detailInfo?.parentMemberId}
supplierRoleId={detailInfo?.parentMemberRoleId}
isPurchaser
/>
</Suspense>
......
src/pages/afterService/returnManage/components/DetailInfo/index.tsx
View file @ a21333c1
......@@ -465,6 +465,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
innerStatus={detailInfo?.innerStatus}
purchaserId={detailInfo?.memberId}
purchaserRoleId={detailInfo?.roleId}
supplierId={detailInfo?.parentMemberId}
supplierRoleId={detailInfo?.parentMemberRoleId}
/>
</Suspense>
</Col>
......
src/pages/payandSettle/creditApplication/components/DetailInfo/index.tsx
View file @ a21333c1
......@@ -103,12 +103,12 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
PublicApi.postPayCreditApplyAddCreditApply({
applyId: +id,
creditId: creditId ? +creditId : 0,
fileList: fileList.map((item: any) => ({ name: item.name, fileUrl: item.data })),
fileList: fileList.map((item: any) => ({ name: item.name, fileUrl: item.data.url })),
...rest,
}).then(res => {
if (res.code === 1000) {
setTimeout(() => {
history.goBack();
history.replace('/memberCenter/payandSettle/creditApplication/quotaPrSubmit');
}, 800);
}
}).finally(() => {
......
src/pages/transaction/stockSellStorage/bills/schema/index.tsx
View file @ a21333c1
......@@ -66,31 +66,26 @@ export const billsSchema: ISchema = {
invoicesType: {
type: 'string',
'x-component-props': {
placeholder: '请选择单据类型',
placeholder: '单据类型',
allowClear: true,
},
enum: [],
},
inventory: {
type: 'string',
'x-component-props': {
placeholder: '请选择对应仓库',
placeholder: '对应仓库',
allowClear: true,
},
enum: [],
},
transactionTime: {
'[startTransactionTime, endTransactionTime]': {
type: 'string',
'x-component': 'dateSelect',
'x-component-props': {
placeholder: '请选择交易时间',
},
enum: [
{ label: '今天', value: 1 },
{ label: '一周内', value: 2 },
{ label: '一个月内', value: 3 },
{ label: '三个月内', value: 4 },
{ label: '六个月内', value: 5 },
{ label: '一年内', value: 6 },
{ label: '一年前', value: 7 },
],
placeholder: '交易时间',
allowClear: true,
},
},
submit: {
'x-component': 'Submit',
......
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