Merge branch 'fix418' into 'v2-220418'

src/pages/classAndProperty/attribute/index.tsx

@@ -203,7 +203,7 @@ const Attribute: React.FC<{}> = () => {
 
   const handleSee = (record: any) => {
     if (AuthUrl('attribute.see')) {
-      history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true`)
+      history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/detail?id=${record.id}&isSee=true&isMultiple=${isMultiple}`)
     }
 
   }
@@ -224,6 +224,10 @@ const Attribute: React.FC<{}> = () => {
     history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/edit?id=${record.id}&isMultiple=${isMultiple}`)
   }
 
+  const handleAdd = () => {
+    history.push(`/memberCenter/commodityAbility/classAndProperty/attribute/add?isMultiple=${isMultiple}`)
+  }
+
   const cancel = () => {
     console.log('cancel')
   }
@@ -258,7 +262,7 @@ const Attribute: React.FC<{}> = () => {
   const Actions = (
     <Space>
       <AuthButton btnCode='attribute.add' >
-        <Button type="primary" icon={<PlusOutlined />} onClick={() => { history.push('/memberCenter/commodityAbility/classAndProperty/attribute/add') }}>
+        <Button type="primary" icon={<PlusOutlined />} onClick={handleAdd}>
           {intl.formatMessage({ id: 'classAndProperty.attribute.actions.button.1' })}
         </Button>
       </AuthButton>

src/pages/classAndProperty/propertyValue/index.tsx

@@ -181,7 +181,7 @@ const PropertyValue: React.FC<{}> = () => {
 
   const handleSee = (record: any) => {
     if (AuthUrl('propertyValue.see')) {
-      history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&type=${record.type}`)
+      history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/detail?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isSee=true&isMultiple=${isMultiple}&type=${record.type}`)
     }
   }
 
@@ -240,7 +240,7 @@ const PropertyValue: React.FC<{}> = () => {
                 <AuthButton btnCode='propertyValue.edit' >
                   <Button
                     type='link'
-                    onClick={() => history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/edit?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}`)}
+                    onClick={() => history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/edit?attrId=${selectKey}&attrName=${record.customerAttribute.name}&attrValueId=${record.id}&isMultiple=${isMultiple}`)}
                   >
                     {intl.formatMessage({ id: 'classAndProperty.propertyValue.columns.button.1' })}
                   </Button>
@@ -414,7 +414,7 @@ const PropertyValue: React.FC<{}> = () => {
                         type="primary"
                         icon={<PlusOutlined />}
                         onClick={() => {
-                          history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/add?attrId=${selectKey || history.location.query.attrId}&attrName=${selectNode?._title || history.location.query.attrName}&type=${selectNode?.type || history.location.query.type}`)
+                          history.push(`/memberCenter/commodityAbility/classAndProperty/propertyValue/add?attrId=${selectKey || history.location.query.attrId}&attrName=${selectNode?._title || history.location.query.attrName}&isMultiple=${isMultiple}&type=${selectNode?.type || history.location.query.type}`)
                         }}
                       >
                         {intl.formatMessage({ id: 'classAndProperty.propertyValue.standardTable.formilyChilds.button' })}

src/pages/procurement/callForBids/readyAddBid/index.tsx

@@ -141,7 +141,7 @@ const ReadyAddBid:React.FC<ReadyAddBidProps> = (props) => {
               <Button
                 icon={<PlusCircleOutlined />}
                 type='primary'
-                onClick={() => history.push('/memberCenter/procurementAbility/callForBids/readyAddBid/add')}
+                onClick={clickAdd}
               >
                 {intl.formatMessage({ id: 'table.purchase.added' })}
               </Button>

src/pages/repositories/index.tsx

@@ -17,10 +17,9 @@ import { treeReduction } from '@/utils';
 import ModalForm from '@/components/ModalForm';
 import { useHttpRequest } from '@/hooks/useHttpRequest';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
-import { getProductFreightSpaceList, postProductFreightSpaceStopStart, postProductFreightSpaceUpdateBatch } from '@/services/ProductV2Api';
+import { getProductFreightSpaceList, postProductFreightSpaceStopStart, postProductFreightSpaceUpdateBatch, postProductFreightSpaceUpdateInventory } from '@/services/ProductV2Api';
 import AuthButton from '@/components/AuthButton';
 import { AuthUrl } from '@/components/AuthButton/AuthUrl';
-import { postProductFreightSpaceUpdateInventory } from '@/services/ProductV2Api/id13787';
 const intl = getIntl();
 
 // table编辑控件

src/pages/trademark/addBrand.tsx

@@ -152,7 +152,7 @@ const AddBrand: React.FC<{}> = () => {
             {
               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' })} />
             }

src/pages/trademark/checkBrandDetail.tsx

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