Skip to content

J
jinfa-platform
Commit d1170c56 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

fix: 修复单据明细 商品下拉key不唯一的问题

parent 05524c7e
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 6 deletions
src/pages/transaction/stockSellStorage/bills/components/BillsForm/effects/useBusinessEffects.ts
View file @ d1170c56
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-16 15:16:47
* @LastEditors: XieZhiXiong
* @LastEditTime: 2021-01-07 10:21:44
* @LastEditTime: 2021-01-08 10:46:53
* @Description: 联动逻辑相关
*/
import { Modal } from 'antd';
......@@ -526,9 +526,6 @@ export const useBusinessEffects = (context, actions) => {
const current = originAsyncData.find(item => item.id === value);
const invoicesTypeIdVal = getFieldValue('invoicesTypeId');
console.log('value', value)
console.log('current', current)
// 取消选择
if (!value) {
setFieldState(
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/index.tsx
View file @ d1170c56
......@@ -194,7 +194,8 @@ const BillsForm: React.FC<BillsFormProps> = ({
...item,
// 单据数量，需要判断是 入库 还是 发货 单 匹配对应的字段值
productCount: transforDirection(rest.invoicesTypeId) ? item.storageCount : item.shipmentQuantity,
product: item.productId,
// 生成通知单字段不同，做兼容
product: item.produceNoticeOrderDetailId || item.relationInvoicesId,
amount: `￥${(transforDirection(rest.invoicesTypeId) ? item.storageCount : item.shipmentQuantity * item.price).toFixed(2)}`,
extraData: {
productName: item.productName,
......@@ -783,7 +784,6 @@ const BillsForm: React.FC<BillsFormProps> = ({
...rest
} = value;
const newInvoicesDetailsRequests = invoicesDetailsRequests.map(({
product,
productCount,
...rest
}) => ({
......@@ -819,6 +819,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -827,6 +828,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
goodsName: itemName,
storageCount: productCount,
productCount: goodsCount,
relationInvoicesId: product,
};
}),
supplyMembersName: memberName,
......@@ -870,6 +872,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -878,6 +881,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
goodsName: itemName,
storageCount: productCount,
productCount: goodsCount,
relationInvoicesId: product,
};
}),
})
......@@ -922,6 +926,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -930,6 +935,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
goodsName: itemName,
shipmentQuantity: productCount,
productCount: goodsCount,
relationInvoicesId: product,
};
}),
// 后台说 不管是 采购入库单，还是 销售发货单 都用这三个字段
......@@ -975,6 +981,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -983,6 +990,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
goodsName: itemName,
shipmentQuantity: productCount,
productCount: goodsCount,
relationInvoicesId: product,
};
}),
})
......@@ -1019,6 +1027,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
extraData = {},
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -1070,6 +1079,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -1115,6 +1125,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
extraData = {},
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -1166,6 +1177,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
itemName,
amount,
productCount,
product,
...rest
} = item;
return {
......@@ -1221,6 +1233,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1232,6 +1245,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
shipmentQuantity: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
relevanceInvoicesId: orderNo[0].id,
......@@ -1270,6 +1284,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1281,6 +1296,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
shipmentQuantity: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
})
......@@ -1327,6 +1343,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1338,6 +1355,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
relevanceInvoicesId: orderNo[0].id,
......@@ -1376,6 +1394,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1387,6 +1406,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
})
......@@ -1431,6 +1451,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1442,6 +1463,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
shipmentQuantity: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
relevanceInvoicesId: orderNo[0].id,
......@@ -1480,6 +1502,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1491,6 +1514,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
shipmentQuantity: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
})
......@@ -1535,6 +1559,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1546,6 +1571,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
relevanceInvoicesId: orderNo[0].id,
......@@ -1584,6 +1610,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1595,6 +1622,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: productCount,
productCount: extraData.goodsCount,
orderNo: extraData.orderNo,
relationInvoicesId: product,
};
}),
})
......@@ -1638,6 +1666,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1649,6 +1678,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: direction === DOC_DIRECTION_WAREHOUSING ? productCount : 0,
productCount: 0,
orderNo: null,
relationInvoicesId: null,
};
}),
relevanceInvoicesId: null,
......@@ -1687,6 +1717,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
amount,
productCount,
itemName,
product,
...rest
} = item;
return {
......@@ -1698,6 +1729,7 @@ const BillsForm: React.FC<BillsFormProps> = ({
storageCount: direction === DOC_DIRECTION_WAREHOUSING ? productCount : 0,
productCount: 0,
orderNo: null,
relationInvoicesId: null,
};
}),
})
......
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