Commit 3c5b0556 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 商品审核进度角色同步当前角色

parent 2332cd3d
...@@ -152,7 +152,7 @@ const AddBrand: React.FC<{}> = () => { ...@@ -152,7 +152,7 @@ const AddBrand: React.FC<{}> = () => {
{ {
hasSelfStore hasSelfStore
? ?
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} /> <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
: :
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} /> <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
} }
......
...@@ -11,6 +11,8 @@ import ReutrnEle from '@/components/ReturnEle' ...@@ -11,6 +11,8 @@ import ReutrnEle from '@/components/ReturnEle'
import moment from 'moment' import moment from 'moment'
import styles from './index.less' import styles from './index.less'
import { getProductBrandGetBrandCheckRecord, getProductBrandGetBrand, postProductBrandCheckBrand } from '@/services/ProductV2Api' import { getProductBrandGetBrandCheckRecord, getProductBrandGetBrand, postProductBrandCheckBrand } from '@/services/ProductV2Api'
import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
import { getAuth } from '@/utils/auth'
const { Step } = Steps const { Step } = Steps
const { TextArea } = Input const { TextArea } = Input
...@@ -27,13 +29,19 @@ const CheckBrandDetail: React.FC<{}> = () => { ...@@ -27,13 +29,19 @@ const CheckBrandDetail: React.FC<{}> = () => {
const [recordData, setRecordData] = useState<any[]>([]) const [recordData, setRecordData] = useState<any[]>([])
const [checkForm] = Form.useForm(); const [checkForm] = Form.useForm();
const [disableCheck, setDisableCheck] = useState<boolean>(false) const [disableCheck, setDisableCheck] = useState<boolean>(false)
const [hasSelfStore, setHasSelfStore] = useState<boolean>(false)
const [checkStatus, setCheckStatus] = useState<number>(4) const [checkStatus, setCheckStatus] = useState<number>(4)
const { roles, memberRoleId, memberId } = getAuth() || {};
useEffect(() => { useEffect(() => {
const { id } = history.location.query const { id } = history.location.query
if(id){ if(id){
loadPageData(id) loadPageData(id)
} }
postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
const { code, data } = res
setHasSelfStore(data)
})
}, []) }, [])
const columns: ColumnType<any>[] = [ const columns: ColumnType<any>[] = [
...@@ -211,8 +219,15 @@ const CheckBrandDetail: React.FC<{}> = () => { ...@@ -211,8 +219,15 @@ const CheckBrandDetail: React.FC<{}> = () => {
<Space direction="vertical" style={{width:'100%'}}> <Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title={intl.formatMessage({ id: 'trademark.viewBrand.card.1' })}> <Card headStyle={{borderBottom:'none'}} title={intl.formatMessage({ id: 'trademark.viewBrand.card.1' })}>
<Steps progressDot current={fixStep}> <Steps progressDot current={fixStep}>
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} /> <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1' })} description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} /> {/* <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.1.description' })} /> */}
{
hasSelfStore
?
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
:
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
}
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description="" /> <Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description="" />
</Steps> </Steps>
</Card> </Card>
......
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