Commit de9438a9 authored by 卢均锐's avatar 卢均锐

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

* 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform: fix: e账户企业认证已签约但没有提交刷新页面显示对应的签约合同号 fix: 商品品牌新增用于判断流程是平台审核还是供应商审核 fix: 修改订单表格title文案显示错误/修改订单商品价格原因文案错误
parents e171f45e cfc780b1
......@@ -437,7 +437,7 @@ export default {
'saleOrder.zongjine': 'Total amount',
'saleOrder.yizhifu': 'paid',
'saleOrder.dingdanhao': 'Order number',
'saleOrder.dingdanzhaiyao': 'Order summary/order time',
'saleOrder.dingdanzhaiyao': 'Order summary',
'saleOrder.caigouhuiyuan': 'purchasing member',
'saleOrder.zongjine/yi': 'Total amount/paid (yuan)',
'saleOrder.zongjine:': 'Total amount:',
......
......@@ -435,7 +435,7 @@ export default {
'saleOrder.zongjine': '총금액',
'saleOrder.yizhifu': '지불됨',
'saleOrder.dingdanhao': '주문 번호',
'saleOrder.dingdanzhaiyao': '주문 요약/주문 시간',
'saleOrder.dingdanzhaiyao': '주문 요약',
'saleOrder.caigouhuiyuan': '구매 회원',
'saleOrder.zongjine/yi': '총 금액/지급(위안)',
'saleOrder.zongjine:': '총 금액:',
......
......@@ -434,7 +434,7 @@ export default {
'saleOrder.zongjine': '总金额',
'saleOrder.yizhifu': '已支付',
'saleOrder.dingdanhao': '订单号',
'saleOrder.dingdanzhaiyao': '订单摘要/下单时间',
'saleOrder.dingdanzhaiyao': '订单摘要',
'saleOrder.caigouhuiyuan': '采购会员',
'saleOrder.zongjine/yi': '总金额/已支付(元)',
'saleOrder.zongjine:': '总金额:',
......
......@@ -299,8 +299,8 @@ export default {
'transaction_components.qingtianxiedanjia': '请填写单价',
'transaction_components.danjiajinxiansanweixiaoshu': '单价仅限三位小数',
'transaction_components.zaicishurunideyuanyin1': '在此输入你的原因, 最多50个汉字',
'transaction_components.quxiaoyuanyin': '取消原因',
'transaction_components.qingshuruquxiaoyuanyin': '请输入取消原因',
'transaction_components.xiugaiyuanyin': '修改原因',
'transaction_components.qingshuruxiugaiyuanyin': '请输入修改原因',
'transaction_components.qingzhengqueshurushuzijin': '请正确输入数字金额',
'transaction_components.yunfeijinxianliangweixiaoshu': '运费仅限两位小数',
'transaction_components.xinzengdingdan': '新增订单',
......
......@@ -5,7 +5,7 @@ import MellowCard from '@/components/MellowCard';
import { BIND_PHONE, EDetailContext, formItemLayout, formItemLayoutCompany, prefixSelector, prefixSelectorEle, tailFormItemLayout, tailFormItemLayoutCompany } from '../../constant';
import { EditOutlined } from '@ant-design/icons';
import UploadImage from '@/components/UploadImage';
import { getPayAllInPayGetBankList, postPayAllInPayBindCompanyAccount, postPayAllInPayBindPhone, postPayAllInPayIdCardCollect, postPayAllInPaySendVerificationCode, postPayAllInPaySetCompanyInfo, postPayAllInPaySignContract } from '@/services/PayV2Api';
import { getPayAllInPayGetBankList, postPayAllInPayBindCompanyAccount, postPayAllInPayBindPhone, postPayAllInPayIdCardCollect, postPayAllInPaySendVerificationCode, postPayAllInPaySetCompanyInfo, postPayAllInPaySignContract, postPayAllInPaySignContractQuery } from '@/services/PayV2Api';
import useCountDown from '@/utils/hooks';
/** 图片key对应的picType值 */
......@@ -117,9 +117,17 @@ const Company: React.FC<{}> = () => {
}
}
const contractPreview = async () => {
const {code, data} = await postPayAllInPaySignContractQuery({jumpPageType:1}, { ctlType: 'none' })
if(code === 1000) {
var signLink = document.getElementById('signPrewview')
signLink.setAttribute('href', data)
signLink.click()
}
}
const handleSendSMS = () => {
formPhone.validateFields(['phone']).then(result => {
console.log(result)
// 发送验证码
postPayAllInPaySendVerificationCode({ ...result, verificationCodeType: BIND_PHONE }).then(res => {
res.code === 1000 && start()
......@@ -447,7 +455,13 @@ const Company: React.FC<{}> = () => {
label={intl.formatMessage({ id: 'payandSettle.eAccountApprove.components.company.mellowCard.2.electric' })}
name="electric"
>
<Button onClick={clickSign} icon={<EditOutlined />} style={{ width: '100%' }}>{intl.formatMessage({ id: 'payandSettle.eAccountApprove.components.company.mellowCard.2.electric.button' })}</Button>
{
data?.contractNo
?
<Button type="link" onClick={contractPreview}>{data.contractNo}</Button>
:
<Button onClick={clickSign} icon={<EditOutlined />} style={{ width: '100%' }}>{intl.formatMessage({ id: 'payandSettle.eAccountApprove.components.company.mellowCard.2.electric.button' })}</Button>
}
</Form.Item>
<Form.Item {...tailFormItemLayout}>
......@@ -536,7 +550,9 @@ const Company: React.FC<{}> = () => {
</Form>
</MellowCard>
}
<a href="" target="_bank" id="signLink" style={{display: 'none', visibility: "hidden"}}></a>
<a href="" target="_blank" id="signPrewview" style={{display: 'none', visibility: "hidden"}}></a>
</>)
}
......
......@@ -10,6 +10,7 @@ import { validatorByte } from '@/utils/regExp'
import UploadImage from '@/components/UploadImage'
import { getAuth } from '@/utils/auth'
import { getProductBrandGetBrand, postProductBrandApplyCheckBrand, postProductBrandSaveOrUpdateBrand } from '@/services/ProductV2Api'
import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
const { Step } = Steps;
......@@ -32,7 +33,8 @@ const AddBrand: React.FC<{}> = () => {
const [formValues, setFormValues] = useState<any>({})
const [isDisabledSave, setIsDisabledSave] = useState<boolean>(false)
const [isDisabledCheck, setDisabledCheck] = useState<boolean>(true)
const { roles, memberRoleId } = getAuth() || {};
const [hasSelfStore, setHasSelfStore] = useState<boolean>(false)
const { roles, memberRoleId, memberId } = getAuth() || {};
useEffect(() => {
const { id } = history.location.query
......@@ -58,6 +60,10 @@ const AddBrand: React.FC<{}> = () => {
}
})
}
postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
const { code, data } = res
setHasSelfStore(data)
})
}, [])
useEffect(() => {
......@@ -143,7 +149,13 @@ const AddBrand: React.FC<{}> = () => {
<Card headStyle={{ borderBottom: 'none' }} title={intl.formatMessage({ id: 'trademark.addBrand.card.1' })}>
<Steps progressDot current={currentStep}>
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.1' })} description={roles.filter(item => item.memberRoleId === memberRoleId)[0]['memberRoleName']} />
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.2' })} description={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.2.description' })} />
{
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={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
}
<Step title={intl.formatMessage({ id: 'trademark.addBrand.card.1.step.3' })} description="" />
</Steps>
</Card>
......
......@@ -212,7 +212,7 @@ const CheckBrandDetail: React.FC<{}> = () => {
<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.2.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.2' })} description="" />
</Steps>
</Card>
......
......@@ -12,6 +12,8 @@ import moment from 'moment'
import styles from './index.less'
import { productStatusColor, productStatusLabel } from '../commodity/products/constant'
import { getProductBrandGetBrand, getProductBrandGetBrandCheckRecord } from '@/services/ProductV2Api'
import { getAuth } from '@/utils/auth'
import { postManageActivityShopRuleExistShop } from '@/services/ManageV2Api'
const { Step } = Steps;
......@@ -24,10 +26,12 @@ const BrandOpeartionLabel = [
const viewBrand: React.FC<{}> = () => {
const intl = useIntl();
const { memberId, memberRoleId } = getAuth() || {};
const [brandInfo, setBrandInfo] = useState<any>({})
const [fixStep, setFixStep] = useState(0)
const [recordData, setRecordData] = useState<any[]>([])
const [hasSelfStore, setHasSelfStore] = useState<boolean>(false)
useEffect(() => {
const { id } = history.location.query
......@@ -47,6 +51,10 @@ const viewBrand: React.FC<{}> = () => {
if (res.code === 1000)
setRecordData(res.data)
})
postManageActivityShopRuleExistShop({memberId, memberRoleId}, { ctlType: 'none' }).then(res => {
const { code, data } = res
setHasSelfStore(data)
})
}
}, [])
......@@ -141,7 +149,13 @@ const viewBrand: React.FC<{}> = () => {
<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.2.description' })} />
{
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={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2.description' })} />
}
<Step title={intl.formatMessage({ id: 'trademark.viewBrand.card.1.step.2' })} description="" />
</Steps>
</Card>
......
......@@ -363,11 +363,11 @@ export const MoneyTotalBox = ({ dataSource, isEditData }) => {
rows: 4,
placeholder: intl.formatMessage({ id: 'transaction_components.zaicishurunideyuanyin1' })
},
title: intl.formatMessage({ id: 'transaction_components.quxiaoyuanyin' }),
title: intl.formatMessage({ id: 'transaction_components.xiugaiyuanyin' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'transaction_components.qingshuruquxiaoyuanyin' })
message: intl.formatMessage({ id: 'transaction_components.qingshuruxiugaiyuanyin' })
},
{
limitByte: true,
......@@ -870,11 +870,11 @@ const SaleOrderProductTable: React.FC<OrderProductTableProps> = (props) => {
rows: 4,
placeholder: intl.formatMessage({ id: 'transaction_components.zaicishurunideyuanyin1' })
},
title: intl.formatMessage({ id: 'transaction_components.quxiaoyuanyin' }),
title: intl.formatMessage({ id: 'transaction_components.xiugaiyuanyin' }),
"x-rules": [
{
required: true,
message: intl.formatMessage({ id: 'transaction_components.qingshuruquxiaoyuanyin' })
message: intl.formatMessage({ id: 'transaction_components.qingshuruxiugaiyuanyin' })
},
{
limitByte: true,
......
......@@ -42,7 +42,7 @@ export const MoneyTotalBox = registerVirtualBox('moneyTotalBox', () => {
const intl = useIntl()
const { form } = useFormSpy({ selector: [['onFieldValueChange', 'detailList']], reducer: v => v })
const data = form.getFieldValue('detailList')
console.log(data, 'data')
const totalCarton = data.reduce((prev, next) => (prev*1000 + (next.carton || 0)*1000)/1000, 0)
const totalWeight = data.reduce((prev, next) => (prev*1000 + (next.weight || 0)*1000)/1000, 0)
const totalVolume = data.reduce((prev, next) => (prev*1000 + (next.volume || 0)*1000)/1000, 0)
......
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