Commit 833e3222 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 商品详情添加税率显示,处理评标定标页native事件火狐兼容问题

parent 88e6c2c3
......@@ -16,6 +16,8 @@ export interface IPriceAttributeParam {
minOrder: number;
isMemberPrice: boolean;
priceType: number;
isTax: boolean,
taxRate: number,
}
export interface IOtherParam {
......
......@@ -793,7 +793,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
{
isTax ?
<Form.Item
name="tax"
name="taxRate"
label="税率"
rules={[
{
......
......@@ -515,6 +515,14 @@ const viewProducts: React.FC<{}> = () => {
<p>{productDetail?.isInvoice?'是':'否'}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>税率:</p>
</Col>
<Col span={20}>
<p>{productDetail?.taxRate}</p>
</Col>
</Row>
{
productDetail?.marks &&
<Row>
......@@ -721,7 +729,7 @@ const viewProducts: React.FC<{}> = () => {
</Space>
<Space direction="vertical" style={{width:'100%'}}>
<Card headStyle={{borderBottom:'none'}} title="审核历史">
<Table dataSource={checkRecord} columns={columns} />
<Table dataSource={checkRecord} columns={columns} pagination={{ size: 'small' }} />
</Card>
</Space>
</PageHeaderWrapper>
......
......@@ -40,12 +40,14 @@ const OnlineRemark: React.FC<RemarkBidReportProps> = ({cardTitle, addSchemaActio
}
const chanegChecked = (e) => {
const ev: any = window.event || e;
const path = ev.path || (ev.composedPath && ev.composedPath());
if(e.target.checked) {
e.nativeEvent.path[6].style.border = '1px solid #00B37A'
e.nativeEvent.path[6].nextSibling.style.display = 'inline-block'
path[6].style.border = '1px solid #00B37A'
path[6].nextSibling.style.display = 'inline-block'
} else {
e.nativeEvent.path[6].style.border = '1px solid #F4F5F7'
e.nativeEvent.path[6].nextSibling.style.display = 'none'
path[6].style.border = '1px solid #F4F5F7'
path[6].nextSibling.style.display = 'none'
}
}
......
......@@ -17,12 +17,14 @@ export const GivenBidItem:React.FC<GivenBidItemProps> = ({}) => {
}
const chanegChecked = (e) => {
const ev: any = window.event || e;
const path = ev.path || (ev.composedPath && ev.composedPath());
if(e.target.checked) {
e.nativeEvent.path[6].style.border = '1px solid #00B37A'
e.nativeEvent.path[6].nextSibling.style.display = 'inline-block'
path[6].style.border = '1px solid #00B37A'
path[6].nextSibling.style.display = 'inline-block'
} else {
e.nativeEvent.path[6].style.border = '1px solid #F4F5F7'
e.nativeEvent.path[6].nextSibling.style.display = 'none'
path[6].style.border = '1px solid #F4F5F7'
path[6].nextSibling.style.display = 'none'
}
}
// const chanegChecked = (e) => {
......@@ -30,7 +32,7 @@ export const GivenBidItem:React.FC<GivenBidItemProps> = ({}) => {
// e.nativeEvent.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.style.border = '1px solid #00B37A'
// e.nativeEvent.target.parentElement.parentElement.nextSibling.style.display = 'inline-block'
// } else {
// e.nativeEvent.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.style.border = 'none'
// e.nativeEvent.target.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.style.border = '1px solid #F4F5F7'
// e.nativeEvent.target.parentElement.parentElement.nextSibling.style.display = 'none'
// }
// }
......
......@@ -122,7 +122,7 @@ const schema: ISchema = {
}
}
}
//@todo 尚未完成
const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
const formRef = useRef<any>({})
const { data } = useContext(OrderDetailContext)
......@@ -215,6 +215,12 @@ const CreateOrderElectronModal:React.FC<OrderElectronModalProps> = (props) => {
$('onFieldValueChange', 'contractTemplateId').subscribe(state => {
// console.log(state.props)
})
// 采购合同下单 隐藏使用电子合同
if(data?.orderModel > 30) {
actions.setFieldState('usingElectronicContracts', state => {
state.visible = false
})
}
})
}}
/>
......
......@@ -72,6 +72,8 @@ class ProductStore implements IProductModule {
minOrder: this.productInfoByEdit?.minOrder,
isMemberPrice: this.productInfoByEdit?.isMemberPrice,
priceType: this.productInfoByEdit?.priceType,
isTax: true,
taxRate: this.productInfoByEdit?.taxRate,
}
}
......
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