Commit 879849b4 authored by 武广's avatar 武广

feat: 添加审核描述

parent 8b54f485
...@@ -837,8 +837,11 @@ class goodsManage extends Component { ...@@ -837,8 +837,11 @@ class goodsManage extends Component {
<Col span={12} key={k.id}> <Col span={12} key={k.id}>
<FormItem label={k.name} {...formItemAttr} key={k.id}> <FormItem label={k.name} {...formItemAttr} key={k.id}>
{getFieldDecorator(`attributeApplyList[${i}]['attr${k.id}']`, { {getFieldDecorator(`attributeApplyList[${i}]['attr${k.id}']`, {
initialValue: initialValue: this.getInitAttrValue(
+k.supportCustomValue.code === 1 || +k.optionType.code === 2 ? [] : '', // this.getInitAttrValue(k.id, k.supportCustomValue, k.optionType), // k.id,
k.supportCustomValue,
k.optionType,
), // +k.supportCustomValue.code === 1 || +k.optionType.code === 2 ? [] : '',
validateTrigger: ['onChange'], validateTrigger: ['onChange'],
rules: rules:
+k.required.code === 1 +k.required.code === 1
......
...@@ -13,6 +13,18 @@ const InfoAudit = props => { ...@@ -13,6 +13,18 @@ const InfoAudit = props => {
} }
}; };
const getContent = () => {
const obj = {
1: '-',
2: '审核通过',
3: `审核拒绝,${audit.rejectReason}`,
};
if (audit) {
return obj[audit.status] || '';
}
return '';
};
useEffect(() => { useEffect(() => {
if (props.visible) { if (props.visible) {
getRecord(); getRecord();
...@@ -24,9 +36,11 @@ const InfoAudit = props => { ...@@ -24,9 +36,11 @@ const InfoAudit = props => {
title="商品信息变更审核" title="商品信息变更审核"
visible={props.visible} visible={props.visible}
footer={[ footer={[
<Button key="back" type="primary" onClick={() => props.onEdit()}> audit.status === 3 && (
再次编辑 <Button key="back" type="primary" onClick={() => props.onEdit()}>
</Button>, 再次编辑
</Button>
),
<Button key="close" onClick={() => props.onCancel()}> <Button key="close" onClick={() => props.onCancel()}>
关闭 关闭
</Button>, </Button>,
...@@ -34,7 +48,7 @@ const InfoAudit = props => { ...@@ -34,7 +48,7 @@ const InfoAudit = props => {
> >
<p>审核状态:{audit.statusDesc}</p> <p>审核状态:{audit.statusDesc}</p>
<p>申请时间:{audit.createdAt}</p> <p>申请时间:{audit.createdAt}</p>
<p>审核结果:{audit.rejectReason}</p> <p>审核结果:{getContent()}</p>
</Modal> </Modal>
); );
}; };
......
...@@ -9,6 +9,10 @@ const headers = { ...@@ -9,6 +9,10 @@ const headers = {
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
}; };
/**
* 商品列表
* yapi: http://yapi.quantgroups.com/project/389/interface/api/23814
*/
export async function searchList(params) { export async function searchList(params) {
return request.post('/product/api/merchant/page', { return request.post('/product/api/merchant/page', {
prefix: goodsApi, prefix: goodsApi,
......
...@@ -190,10 +190,10 @@ export function column() { ...@@ -190,10 +190,10 @@ export function column() {
<div> <div>
<p>{row.state >= 5 ? '审核通过' : _}</p> <p>{row.state >= 5 ? '审核通过' : _}</p>
<div> <div>
{row.updateStateDesc ? ( {row.updateState ? (
<span onClick={() => onShowAudit(row)} className={styles.stateAuditTxt}> <Button onClick={() => onShowAudit(row)} type="link">
{row.updateStateDesc} {row.updateStateDesc}
</span> </Button>
) : ( ) : (
'--' '--'
)} )}
......
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