Skip to content

J
jinfa-platform
Commit 879a8752 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫
Browse files
Options

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

parents 5a5e7357 379a2dfd
Hide whitespace changes
Inline Side-by-side
Showing with 489 additions and 78 deletions
src/pages/afterService/components/GoodsDrawer/index.tsx
View file @ 879a8752
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-04 15:09:09
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 11:29:44
* @LastEditTime: 2021-08-11 11:44:19
* @Description: 维修商品抽屉组件
*/
import React from 'react';
......@@ -432,7 +432,7 @@ class GoodsDrawer extends React.Component<GoodsDrawerProps, GoodsDrawerState> {
? product.payInfoList.reduce((prev, now) => {
return now.externalState === PayOutWorkState.CONFIRM_ACCOUNT ? +(new BigNumber(+product.purchaseCount).multipliedBy(product.price).multipliedBy(new BigNumber(now.payRatio).dividedBy(100))).toFixed(2) + prev : prev;
}, 0)
: product.amount,
: product.paidAmount,
});
}
});
......
src/pages/afterService/components/ReturnAnalysis/index.tsx
View file @ 879a8752
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-11-05 15:18:15
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 15:31:35
* @LastEditTime: 2021-08-11 16:45:01
* @Description: 退货收货统计、退货发货明细
*/
import React, { useState } from 'react';
......@@ -106,7 +106,7 @@ const ReturnInfo: React.FC<ReturnInfoProps> = ({
dataIndex: 'orderNo',
render: (text, record) => (
<a
href={`${target}/orderDetail?orderNo=${record.orderNo}`}
href={`${target}/orderDetail?id=${record.orderId}`}
target="_blank"
>
{text}
......
src/pages/afterService/returnApplication/returnPrDeliver/components/ReturnDeliverDrawer/index.tsx
View file @ 879a8752
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-08-07 15:11:54
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-09 14:12:50
* @LastEditTime: 2021-08-11 16:41:14
* @Description: 退货发货处理抽屉
*/
import React from 'react';
......@@ -18,7 +18,7 @@ import {
import { ArrayTable } from '@formily/antd-components';
import { PublicApi } from '@/services/api';
import {
GetAsReturnGoodsPageReturnedGoodsResponseDetail,
GetAsReturnGoodsGetDetailByConsumerResponse,
} from '@/services/AfterServiceV2Api';
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import NiceForm from '@/components/NiceForm';
......@@ -70,6 +70,10 @@ export type ValuesType = {
* 已发货数量
*/
deliveryCount: string,
/**
* 未退货发货数量
*/
noDeliveryCount: number,
}[],
/**
* 退货发货地址
......@@ -77,6 +81,13 @@ export type ValuesType = {
returnDeliverAddress: AddressValueType,
}
type ProductListItemType = GetAsReturnGoodsGetDetailByConsumerResponse['goodsDetailList'][0] & {
/**
* 退货数量
*/
count: number,
}
interface IProps {
/**
* 是否可见
......@@ -89,7 +100,7 @@ interface IProps {
/**
* 商品列表
*/
productList: GetAsReturnGoodsPageReturnedGoodsResponseDetail[],
productList: ProductListItemType[],
},
/**
* 配送方式
......@@ -153,7 +164,8 @@ const ReturnDeliverDrawer: React.FC<IProps> = (props) => {
const { productList, ...rest } = values;
onSubmit({
...rest,
productList: productList.filter((item) => +item.deliveryCount < +item.returnCount),
// 过滤掉退货数量为0的数据
productList: productList.filter((item) => +item.deliveryCount < +item.returnCount && +item.count > 0),
});
}
};
......
src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx
View file @ 879a8752
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2021-01-06 11:36:34
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-10 18:18:45
* @LastEditTime: 2021-08-11 16:18:09
* @Description: 退货发货
*/
import React, { useState } from 'react';
......@@ -77,7 +77,11 @@ const ReturnPrDeliverVerify: React.FC = () => {
<ReturnDeliverDrawer
value={{
productList: info?.goodsDetailList.filter((item) => item.isNeedReturn && item.noDeliveryCount > 0),
productList: (
info?.goodsDetailList
.filter((item) => item.isNeedReturn && item.noDeliveryCount > 0)
.map((item) => ({ ...item, count: item.noDeliveryCount }))
),
}}
deliveryType={info?.returnGoodsAddress.deliveryType}
visible={visible}
......
src/pages/afterService/returnApplication/returnPrSubmit/components/ReturnForm/index.tsx
View file @ 879a8752
......@@ -137,8 +137,8 @@ const ReturnForm: React.FC<BillsFormProps> = ({
},
{
title: '订单摘要',
dataIndex: 'digest',
align: 'center',
dataIndex: 'digest',
ellipsis: true,
},
{
title: '供应会员',
......@@ -178,31 +178,31 @@ const ReturnForm: React.FC<BillsFormProps> = ({
const childTableColumn: ColumnType<any>[] = [
!isMateriel ?{
title: '商品ID',
dataIndex: 'productId',
dataIndex: 'productNo',
align: 'center',
} : {
title: '物料编号',
dataIndex: 'materialCode',
dataIndex: 'productNo',
align: 'center',
},
!isMateriel ? {
title: '商品名称',
dataIndex: 'name',
align: 'center',
ellipsis: true,
} : {
title: '物料名称、规格',
dataIndex: 'materialName',
dataIndex: 'name',
align: 'center',
render: (text, record) => `${text}/${record.materialType}`,
},
{
title: '品类',
dataIndex: !isMateriel ? 'category' : 'materialCategory',
dataIndex: !isMateriel ? 'category' : 'quotedCategory',
align: 'center',
},
{
title: '品牌',
dataIndex: !isMateriel ? 'brand' : 'materialBrand',
dataIndex: !isMateriel ? 'brand' : 'quotedBrand',
align: 'center',
},
{
......@@ -223,7 +223,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
},
{
title: '金额',
dataIndex: 'amount',
dataIndex: 'paidAmount',
align: 'center',
render: (text) => `¥ ${text}`,
},
......@@ -623,7 +623,7 @@ const ReturnForm: React.FC<BillsFormProps> = ({
purchasePrice: item.price,
purchaseCount: item.quantity,
purchaseAmount: +(item.price * item.quantity).toFixed(2),
payAmount: item.payAmount,
payAmount: item.paidAmount,
returnCount: '',
refundAmount: '',
extraData: {
......
src/pages/procurement/callForBids/addRemarkBidCommittee/index.tsx
View file @ 879a8752
......@@ -302,7 +302,7 @@ const AddRemarkBidCommittee:React.FC<AddRemarkBidCommitteeProps> = (props) => {
onBack={() => history.goBack()}
backIcon={<ReutrnEle description="返回"/>}
title={pageStatus === PageStatus.ADD ? '新增专家抽取' : ( pageStatus === PageStatus.EDIT ? '编辑专家抽取' : '查看专家抽取' )}
extra={[
extra={ (pageStatus === PageStatus.PREVIEW) ? [] : [
<Button key="1" onClick={() => addSchemaAction.submit()} loading={btnLoading} type="primary" icon={<SaveOutlined />}>
保存
</Button>,
......
src/pages/procurement/callForBids/readySubmitReport/components/remarkBidReport/index.tsx
View file @ 879a8752
......@@ -108,8 +108,8 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
return {
memberName: item,
total,
average: total/expertNumber || null,
total: total.toFixed(2),
average: (total/expertNumber).toFixed(2) || null,
expertNumber,
}
})
......@@ -145,15 +145,17 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
}]
let childTableColumnResult = []
const childDataSource = groupBy(dataBySort[item], 'memberName')
console.log(childDataSource, 'childDataSource')
Object.keys(childDataSource).forEach((_item, _index) => {
// 动态子表格列 // 合并同会员下的专家评标
// 相同同会员名下的分数数据 只需要取一个
const computedMemberScoreItem = computedScore.filter(_v => _v.memberName === _item)[0]
console.log(computedMemberScoreItem, childDataSource[_item])
let objectItem: any = {
memberId: childDataSource[_item][0]['memberId'],
memberName: _item,
total: computedMemberScoreItem['total'],
average: computedMemberScoreItem['average'] ? computedMemberScoreItem['average'].toFixed(2) : null,
average: computedMemberScoreItem['average'] ? Number(computedMemberScoreItem['average']).toFixed(2) : null,
expertNumber: computedMemberScoreItem['expertNumber'],
editable,
}
......@@ -177,6 +179,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
})
setChildrenTableData(childrenTableDataSource)
setChildrenTableColumns(childTableDataColumns)
console.log(childrenTableDataSource, childTableDataColumns)
}
}, [data, templateSort])
......@@ -346,7 +349,7 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
return {
..._e,
total: Number(row.total),
average: Number(row.total) / row.expertNumber,
average: (Number(row.total) / row.expertNumber).toFixed(2),
}
} else {
return _e
......@@ -374,10 +377,6 @@ const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle, editable})
)
}
useEffect(() => {
console.log(offlineData)
}, [offlineData])
return (<>
<div id="extractExpertList">
<MellowCard
......
src/pages/procurement/components/bidParticulars/constant.tsx
View file @ 879a8752
......@@ -40,6 +40,12 @@ export const columns = [
key: 'price',
render: t => `￥${t}`
},
// {
// title: '中标数量',
// dataIndex: 'awardTenderRatio',
// key: 'awardTenderRatio',
// render: (t, r) => (Number(t)/100 * Number(r.count)).toFixed(2)
// },
{
title: '金额(含税)',
dataIndex: 'money',
......
src/pages/procurement/components/bidParticulars/index.tsx
View file @ 879a8752
......@@ -49,6 +49,16 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
totalMoney += item.price * item.inviteTenderMateriel.count
}) : []
let tempCol: any = [...columns]
// 中标数量
if(cardTitle === '中标明细') {
tempCol[tempCol.length-1] = {
title: '中标数量',
dataIndex: 'awardTenderRatio',
key: 'awardTenderRatio',
render: (t, r) => (Number(t)/100 * Number(r.count)).toFixed(2)
}
}
// 总计
tempCol[tempCol.length] = {
title: <span>金额(含税)<br />合计: ￥{totalMoney}</span>,
dataIndex: 'money',
......@@ -139,7 +149,7 @@ const BidParticulars: React.FC<BidParticularsProps> = ({cardTitle}) => {
}
}
}}
dataSource={tableData}
dataSource={cardTitle === '中标明细' ? tableData.filter(item => item.awardTenderRatio) : tableData}
rowKey="id"
pagination={{size: "small"}}
/>
......
src/pages/transaction/purchaseOrder/orderCollectB2b/index.tsx
View file @ 879a8752
......@@ -170,6 +170,7 @@ const PurchaseOrderDetail:React.FC<PurchaseOrderDetailProps> = (props) => {
}, [])
const handleSubmit = async (value) => {
console.log(value, 'value')
const _orderProductRequests = JSON.parse(JSON.stringify(value.products))
try {
......
src/pages/transaction/purchaseOrder/orderCollectB2b/model/usePaymentInfo.tsx
View file @ 879a8752
......@@ -35,7 +35,7 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
roleId: memberRoleId,
shopId: ctx.getFieldValue('shopId'),
orderMode: ctx.getFieldValue('orderMode'),
productIds: ctx.getFieldValue('products').map(item => item.productId)
products: ctx.getFieldValue('products').map(item => ({ productId: item.commodityId, skuId: item.productId }))
}).then(res => {
const { code, data } = res
if (code === 1000) {
......
src/pages/transaction/purchaseOrder/orderCollectSrm/components/contractModalTable/index.tsx
View file @ 879a8752
......@@ -47,7 +47,9 @@ const ContractModalTable:React.FC<ContractModalTableProps> = (props) => {
sourceType = 2;
break;
}
rowSelectionCtl.setSelectedRowKeys([contract['contractId']])
if(contract) {
rowSelectionCtl.setSelectedRowKeys([contract['id'] || contract['contractId']])
}
setOriginType(sourceType)
}
}, [visible])
......
src/pages/transaction/purchaserEvaluation/common/schemas/evaluateSchema.tsx
View file @ 879a8752
......@@ -56,7 +56,7 @@ export const evaluateSchema: ISchema = {
max: 200,
},
},
MEGA_LADYOUT: {
MEGA_LADYOUT_1: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
......
src/pages/transaction/purchaserEvaluation/common/schemas/receivedSchema.tsx 0 → 100644
View file @ 879a8752
/*
* @Author: XieZhiXiong
* @Date: 2021-08-11 14:04:22
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 16:41:32
* @Description: 收到的评价详情 schema
*/
import { ISchema } from '@formily/antd';
import { UPLOAD_TYPE } from '@/constants';
/**
*
* @param showExplain 是否需要展示解释, 默认为 true
* @returns
*/
const createSchema = (showExplain = true): ISchema => ({
type: 'object',
properties: {
comments: {
type: 'array',
'x-component': 'EvaluationList',
default: [],
items: {
type: 'object',
properties: {
LEFT_RIGHT: {
type: 'object',
'x-component': 'LeftRightLayout',
'x-component-props': {
rightProps: {
span: 2,
offset: 4,
},
},
properties: {
MEGA_LADYOUT: {
type: 'object',
'x-component': 'Mega-Layout',
'x-component-props': {
labelCol: 6,
labelAlign: 'left',
position: 'left',
},
properties: {
star: {
title: '满意程度',
'x-component': 'Rating',
'x-component-props': {
allowHalf: false,
allowClear: false,
},
},
comment: {
type: 'string',
title: '评价',
'x-component': 'TextArea',
'x-component-props': {
rows: 4,
},
'x-rules': {
max: 200,
},
},
picture: {
type: 'string',
title: '图片',
'x-component': 'FixUpload',
'x-mega-props': {
span: 2,
},
'x-component-props': {
listType: 'card',
action: '/api/file/file/upload/prefix',
data: {
fileType: UPLOAD_TYPE,
prefix: '',
},
beforeUpload: '{{beforeUpload}}',
accept: '.png, .jpg, .jpeg',
},
'x-rules': [
{
max: 4,
message: '最多可上传4张图片',
},
],
},
...(showExplain ? {
replyTime: {
type: 'string',
title: '解释时间',
},
replyContent: {
type: 'string',
title: '商家解释',
},
} : {}),
},
},
smile: {
type: 'object',
'x-component': 'SmilingFace',
'x-component-props': {
position: 'right',
},
},
},
},
},
},
},
},
});
export default createSchema;
src/pages/transaction/purchaserEvaluation/components/RecordList/index.tsx
View file @ 879a8752
......@@ -81,6 +81,10 @@ export interface RecordItem {
* 订单id
*/
orderId: number
/**
* 是否已解释，被评价方回复 0-否 1-是
*/
replyStatus?: number,
};
export interface RecordRes {
......@@ -89,16 +93,24 @@ export interface RecordRes {
};
interface RecordListProps {
// 分页器类型
/**
* 分页器类型
*/
paginationType?: 'pagination' | 'button';
// 是否需要检索
/**
* 是否需要检索
*/
searchable?: boolean;
// 是否是查看收到的品论
/**
* 是否是查看收到的评论
*/
opposite?: boolean;
// 是否可编辑的
/**
* 是否可编辑的
*/
editable?: boolean;
fetchList: (params: ListParams) => Promise<RecordRes>;
......@@ -107,8 +119,20 @@ interface RecordListProps {
onEdit?: (record: RecordItem) => void;
// 搜索框提示语
/**
* 搜索框提示语
*/
searchTip?: string;
/**
* 是否显示解释按钮，默认 false
*/
explicable?: boolean;
/**
* 点击解释触发事件
*/
onExplain?: (record: RecordItem) => void;
};
interface RecordListState {
......@@ -175,6 +199,24 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
});
};
// 重新加载列表
refresh = () => {
this.setState({
receivedList: {
data: [],
totalCount: 0,
},
}, () => {
const { page, size } = this.state;
this.getRecordList().then(res => {
this.setState({
receivedList: res,
hasMore: checkMore(page, size, res.data.length, res.totalCount),
});
});
});
};
// 查询列表
handleSearch = values => {
this.setState({
......@@ -244,14 +286,22 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
onEdit(record);
}
};
handleExplain = record => {
const { onExplain } = this.props;
if (onExplain) {
onExplain(record);
}
};
render() {
const {
paginationType = 'pagination',
searchable = true,
opposite = true,
editable = false,
searchTip = '评价方',
paginationType = 'pagination',
searchable = true,
opposite = true,
editable = false,
searchTip = '评价方',
explicable = false,
} = this.props;
const { page, size, loading, receivedList, hasMore } = this.state;
......@@ -322,6 +372,9 @@ export default class RecordList extends React.Component<RecordListProps, RecordL
{editable && (
<Button type="link" onClick={() => this.handleEdit(item)}>编辑</Button>
)}
{explicable && item.replyStatus === 0 && (
<Button type="link" onClick={() => this.handleExplain(item)}>解释</Button>
)}
<Button type="link" onClick={() => this.handleCheck(item)}>查看</Button>
</div>
</li>
......
src/pages/transaction/purchaserEvaluation/received/detail/index.tsx
View file @ 879a8752
......@@ -14,7 +14,7 @@ import { PublicApi } from '@/services/api';
import { normalizeFiledata, FileData } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm';
import { evaluateSchema } from '../../common/schemas/evaluateSchema';
import createSchema from '../../common/schemas/receivedSchema';
import { createEffects } from '../../common/effects';
import EvaluationList from '../../components/EvaluationList';
......@@ -171,7 +171,7 @@ const ReceivedDetail: React.FC = () => {
effects={($, actions) => {
createEffects($, actions);
}}
schema={evaluateSchema}
schema={createSchema(false)}
/>
</PageHeaderWrapper>
</Spin>
......
src/pages/transaction/purchaserEvaluation/sent/components/DetailInfo/index.tsx
View file @ 879a8752
......@@ -21,7 +21,7 @@ import EvaluationList from '../../../components/EvaluationList';
const formActions = createFormActions();
const {
onFormInit$,
onFormInit$,
} = FormEffectHooks;
interface Unevaluated {
......@@ -144,19 +144,18 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
return Promise.resolve();
};
const UploadTip = (
<span
const UploadTip = () => (
<div
style={{
lineHeight: '24px',
color: '#909399',
fontWeight: 400,
wordBreak: 'break-all',
position: 'relative',
top: '34px',
}}
>
支持JPG/PNG/JPEG <br />每张最大不超过 10M，尺寸不限 <br />最大数量限制 4张
</span>
</div>
);
return (
......@@ -220,15 +219,36 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
}}
editable={isEdit}
expressionScope={{
UploadTip: isEdit ? UploadTip : null,
beforeUpload,
}}
onSubmit={handleSubmit}
components={{
EvaluationList,
EvaluationList,
UploadTip,
}}
onSubmit={handleSubmit}
effects={($, actions) => {
createEffects($, actions);
onFormInit$().subscribe(() => {
// 控制不同样式
if (!isEdit) {
actions.setFieldState('comments.*.MEGA_LADYOUT_1', (fieldState) => {
fieldState.props['x-component-props'] = {
...(fieldState.props['x-component-props'] || {}),
labelCol: 6,
};
});
actions.setFieldState('comments.*.UPLOAD_TIP', (fieldState) => {
fieldState.visible = false;
});
actions.setFieldState('comments.*.picture', (fieldState) => {
fieldState.props['x-mega-props'] = {
...(fieldState.props['x-mega-props'] || {}),
span: 3,
};
});
}
});
}}
schema={evaluateSchema}
/>
......
src/pages/transaction/supplierEvaluation/analysis/components/ExplainModal/index.tsx 0 → 100644
View file @ 879a8752
/*
* @Author: XieZhiXiong
* @Date: 2021-08-11 14:20:42
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 15:28:33
* @Description: 解释 Modal
*/
import React from 'react';
import { Modal, Tooltip } from 'antd';
import { QuestionCircleOutlined } from '@ant-design/icons';
import { createAsyncFormActions } from '@formily/antd';
import NiceForm from '@/components/NiceForm';
import schema from './schema';
const modalFormActions = createAsyncFormActions();
export type ValuesType = {
/**
* 解释内容
*/
content: string,
}
interface ExplainModalProps {
visible: boolean;
confirmLoading: boolean;
onSubmit: (values: ValuesType) => void;
/**
* 关闭触发事件
*/
onClose: () => void;
/**
* 是否只可以选择 不接受申请
*/
rejected?: boolean;
}
const ExplainModal: React.FC<ExplainModalProps> = (props) => {
const {
visible,
confirmLoading,
onSubmit,
onClose,
} = props;
const handleClose = () => {
onClose?.();
};
const handleSubmit = values => {
if (onSubmit) {
onSubmit(values);
}
};
return (
<Modal
title={(
<>
商家解释
<Tooltip title="商家对于评价的解释，显示在商品交易评价中">
<QuestionCircleOutlined style={{ marginLeft: 3 }} />
</Tooltip>
</>
)}
visible={visible}
confirmLoading={confirmLoading}
onOk={() => modalFormActions.submit()}
onCancel={handleClose}
>
<NiceForm
effects={() => {
}}
actions={modalFormActions}
schema={schema}
onSubmit={handleSubmit}
/>
</Modal>
);
};
export default ExplainModal;
src/pages/transaction/supplierEvaluation/analysis/components/ExplainModal/schema.ts 0 → 100644
View file @ 879a8752
/*
* @Author: XieZhiXiong
* @Date: 2021-08-11 14:23:08
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-11 14:58:47
* @Description:
*/
import { ISchema } from '@formily/antd';
const schema: ISchema = {
type: 'object',
properties: {
MEGA_LAYOUT: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
labelAlign: 'top',
},
properties: {
content: {
type: 'string',
'x-component': 'textarea',
'x-component-props': {
placeholder: '在此输入你的内容',
rows: 5,
},
'x-rules': [
{
required: true,
message: '请输入内容',
},
],
},
},
},
},
};
export default schema;
src/pages/transaction/supplierEvaluation/analysis/index.tsx
View file @ 879a8752
import React, { useEffect, useState } from 'react';
import { Tabs, Row, Col, Button } from 'antd';
import React, { useEffect, useState, useRef } from 'react';
import { Tabs, Row, Col } from 'antd';
import { history } from 'umi';
import { observer, inject } from 'mobx-react';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import { PublicApi } from '@/services/api';
import { isJSONStr } from '@/utils';
import { IEvaluationModule } from '@/module/evaluationModule';
import MellowCard from '@/components/MellowCard';
import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
import { Pie } from '@/components/Charts';
import Mood from '@/components/Mood';
import ExplainModal, { ValuesType } from './components/ExplainModal';
import Shelves from '../../purchaserEvaluation/components/Shelves';
import RecordList, { ListParams, RecordRes } from '../../purchaserEvaluation/components/RecordList';
import RecordList, { ListParams, RecordRes, RecordItem } from '../../purchaserEvaluation/components/RecordList';
import styles from './index.less';
const { TabPane } = Tabs;
......@@ -57,8 +57,14 @@ const Analysis: React.FC<AnalysisProps> = ({
const [evaluateSum, setEvaluateSum] = useState([]);
const [evaluatePie, setEvaluatePie] = useState([]);
const [visibleExplainModal, setVisibleExplainModal] = useState(false);
const [explainConfirmLoading, setExplainConfirmLoading] = useState(false);
const { supplier, setSupplierActiveKey } = EvaluationStore;
const recordListRef = useRef<RecordList | null>(null);
const currentRecordRef = useRef<RecordItem | null>(null);
const summaryEvaluate = (items: EstimateSumItems[]): EstimateSumItems[] => {
// 顺序写死的 1：表示好评，2：表示中评，3：表示差评
// 根据 1、2星级为差评，3星级为中评，4、5星级为好评往里边塞数据
......@@ -213,15 +219,16 @@ const Analysis: React.FC<AnalysisProps> = ({
resolve({
data: data.map(item => {
return {
id: item.id,
star: item.star,
comment: item.comment,
productName: item.product || '',
price: item.price,
quantity: item.purchaseCount,
created: item.dealTime as string,
target: item.memberName,
orderId: item.orderId,
id: item.id,
star: item.star,
comment: item.comment,
productName: item.product || '',
price: item.price,
quantity: item.purchaseCount,
created: item.dealTime as string,
target: item.memberName,
orderId: item.orderId,
replyStatus: item.replyStatus,
};
}),
totalCount,
......@@ -312,6 +319,30 @@ const Analysis: React.FC<AnalysisProps> = ({
history.push(`/memberCenter/tranactionAbility/supplierEvaluation/sent/detail?id=${record.id}`);
};
const handleVisibleExplainModal = (flag?: boolean) => {
setVisibleExplainModal(!!flag);
};
const handleExplain = (record: RecordItem) => {
currentRecordRef.current = record;
handleVisibleExplainModal(true);
};
const handleExplainSubmit = (values: ValuesType) => {
setExplainConfirmLoading(true);
PublicApi.postMemberCommentSupplyReceiveTradeHistoryReply({
id: currentRecordRef.current.id,
content: values.content,
}).then((res) => {
if (res.code === 1000) {
recordListRef.current?.refresh();
handleVisibleExplainModal(false);
}
}).finally(() => {
setExplainConfirmLoading(false);
});
};
return (
<PageHeaderWrapper>
<MellowCard
......@@ -367,6 +398,10 @@ const Analysis: React.FC<AnalysisProps> = ({
<RecordList
fetchList={getReceivedList}
onCheck={handleJumpReceived}
onExplain={handleExplain}
opposite={false}
explicable={true}
ref={recordListRef}
/>
</TabPane>
......@@ -382,6 +417,13 @@ const Analysis: React.FC<AnalysisProps> = ({
</TabPane>
</Tabs>
</MellowCard>
<ExplainModal
visible={visibleExplainModal}
onClose={() => handleVisibleExplainModal(false)}
confirmLoading={explainConfirmLoading}
onSubmit={handleExplainSubmit}
/>
</PageHeaderWrapper>
);
};
......
src/pages/transaction/supplierEvaluation/received/detail/index.tsx
View file @ 879a8752
......@@ -14,7 +14,7 @@ import { PublicApi } from '@/services/api';
import { normalizeFiledata, FileData } from '@/utils';
import AvatarWrap from '@/components/AvatarWrap';
import NiceForm from '@/components/NiceForm';
import { evaluateSchema } from '../../../purchaserEvaluation/common/schemas/evaluateSchema';
import createSchema from '../../../purchaserEvaluation/common/schemas/receivedSchema';
import { createEffects } from '../../../purchaserEvaluation/common/effects';
import EvaluationList from '../../../purchaserEvaluation/components/EvaluationList';
......@@ -31,7 +31,9 @@ interface Unevaluated {
star: number;
comment: string;
picture: FileData[];
smile: number;
smile: number;
replyContent: string,
replyTime: string,
};
interface OrderInfo {
......@@ -69,6 +71,8 @@ const ReceivedDetail: React.FC = () => {
comment: res.data.comment,
picture: res.data.pics ? res.data.pics.map(item => normalizeFiledata(item)) : [],
smile: res.data.star,
replyContent: res.data.replyContent,
replyTime: res.data.replyTime,
});
setOrderInfo({
orderNo: res.data.orderNo,
......@@ -173,7 +177,7 @@ const ReceivedDetail: React.FC = () => {
effects={($, actions) => {
createEffects($, actions);
}}
schema={evaluateSchema}
schema={createSchema()}
/>
</PageHeaderWrapper>
</Spin>
......
src/pages/transaction/supplierEvaluation/sent/components/DetailInfo/index.tsx
View file @ 879a8752
......@@ -144,19 +144,18 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
return Promise.resolve();
};
const UploadTip = (
<span
const UploadTip = () => (
<div
style={{
lineHeight: '24px',
color: '#909399',
fontWeight: 400,
wordBreak: 'break-all',
position: 'relative',
top: '34px',
}}
>
支持JPG/PNG/JPEG <br />每张最大不超过 10M，尺寸不限 <br />最大数量限制 4张
</span>
</div>
);
return (
......@@ -222,15 +221,36 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
}}
editable={isEdit}
expressionScope={{
UploadTip: isEdit ? UploadTip : null,
beforeUpload,
}}
onSubmit={handleSubmit}
components={{
EvaluationList,
EvaluationList,
UploadTip,
}}
onSubmit={handleSubmit}
effects={($, actions) => {
createEffects($, actions);
onFormInit$().subscribe(() => {
// 控制不同样式
if (!isEdit) {
actions.setFieldState('comments.*.MEGA_LADYOUT_1', (fieldState) => {
fieldState.props['x-component-props'] = {
...(fieldState.props['x-component-props'] || {}),
labelCol: 6,
};
});
actions.setFieldState('comments.*.UPLOAD_TIP', (fieldState) => {
fieldState.visible = false;
});
actions.setFieldState('comments.*.picture', (fieldState) => {
fieldState.props['x-mega-props'] = {
...(fieldState.props['x-mega-props'] || {}),
span: 3,
};
});
}
});
}}
schema={evaluateSchema}
/>
......
src/pages/transaction/supplierEvaluation/unevaluated/schema/index.tsx
View file @ 879a8752
......@@ -38,7 +38,7 @@ export const listSearchSchema: ISchema = {
columns: 6,
},
properties: {
orderThe: {
digest: {
type: 'string',
'x-component-props': {
placeholder: '订单摘要',
......@@ -53,7 +53,7 @@ export const listSearchSchema: ISchema = {
allowClear: true,
},
},
'[startCreateTime, endCreateTime]': {
'[createTimeStart, createTimeEnd]': {
type: 'string',
default: '',
'x-component': 'dateSelect',
......
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