Commit 5bc753c5 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

🐞 fix: 修改采购报价bug

parent 6af0f3c3
...@@ -63,6 +63,8 @@ const AddForm = () => { ...@@ -63,6 +63,8 @@ const AddForm = () => {
basicInfo.offerEndTime = params.offerEndTime; basicInfo.offerEndTime = params.offerEndTime;
basicInfo.createTime = params.createTime; basicInfo.createTime = params.createTime;
basicInfo.externalState = params.externalState; basicInfo.externalState = params.externalState;
basicInfo.interiorStateName = params.interiorStateName;
basicInfo.externalStateName = params.externalStateName;
basicInfo.interiorState = params.interiorState; basicInfo.interiorState = params.interiorState;
offerInfo.id = params.id; offerInfo.id = params.id;
if (path === 'edit') { if (path === 'edit') {
......
...@@ -166,13 +166,13 @@ const BasicInfo: React.FC<IProps> = (props: any) => { ...@@ -166,13 +166,13 @@ const BasicInfo: React.FC<IProps> = (props: any) => {
label='外部状态' label='外部状态'
name='externalState' name='externalState'
> >
{fetchdata && <Tag color={OFFTER_EXTERNALSTATE_COLOR[fetchdata.externalState]}>{OFFTER_EXTERNALSTATE[fetchdata.externalState]}</Tag>} {fetchdata && <Tag color={OFFTER_EXTERNALSTATE_COLOR[fetchdata.externalState]}>{fetchdata.externalStateName}</Tag>}
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label='内部状态' label='内部状态'
name='interiorState' name='interiorState'
> >
{fetchdata && <Badge status={OFFTER_INTERNALSTATE_COLOR[fetchdata.interiorState]} text={OFFTER_INTERNALSTATE[fetchdata.interiorState]} />} {fetchdata && <Badge status={OFFTER_INTERNALSTATE_COLOR[fetchdata.interiorState]} text={fetchdata.interiorStateName} />}
</Form.Item> </Form.Item>
</Form> </Form>
......
...@@ -128,6 +128,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => { ...@@ -128,6 +128,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
name={`isTax${index}`} name={`isTax${index}`}
style={{ margin: 0 }} style={{ margin: 0 }}
rules={[{ required: true, message: '请选择' }]} rules={[{ required: true, message: '请选择' }]}
initialValue={text}
> >
<Select <Select
style={{ width: 100 }} style={{ width: 100 }}
...@@ -223,7 +224,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => { ...@@ -223,7 +224,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
console.log(params, 123) console.log(params, 123)
params.forEach((it: any, i: number) => { params.forEach((it: any, i: number) => {
form.setFieldsValue({ form.setFieldsValue({
['isTax' + i]: it.isTax ? it.isTax : 1, ['isTax' + i]: (it.isTax || it.isTax === 0) ? it.isTax : 1,
['taxProbability' + i]: it.taxProbability, ['taxProbability' + i]: it.taxProbability,
['taxUnitPrice' + i]: it.taxUnitPrice ['taxUnitPrice' + i]: it.taxUnitPrice
}) })
...@@ -299,7 +300,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => { ...@@ -299,7 +300,7 @@ const OfferInfo: React.FC<IProps> = (props: any) => {
detailss.push({ detailss.push({
purchaseInquiryDetailsId: name === 'quote' ? item.id : item.purchaseInquiryDetailsId, purchaseInquiryDetailsId: name === 'quote' ? item.id : item.purchaseInquiryDetailsId,
taxUnitPrice: item.taxUnitPrice, taxUnitPrice: item.taxUnitPrice,
isTax: item.isTax ? item.isTax : 1, isTax: (item.isTax || item.isTax === 0) ? item.isTax : 1,
taxProbability: item.taxProbability, taxProbability: item.taxProbability,
productName: item.productName, productName: item.productName,
productId: item.productId, productId: item.productId,
......
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