ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修改录单时产品没有合同显示全部 (#946)

Browse Source 
Reviewed-on: daoyoucloud/tachybase#946
Reviewed-by: sealday <zhanglin@daoyoucloud.com>
Co-authored-by: wjh <wwwjh0710@163.com>
Co-committed-by: wjh <wwwjh0710@163.com>
This commit is contained in:
wjh 2024-05-09 12:25:07 +08:00 committed by sealday
parent 87f2b6e73f
commit 5a15fd1ff1
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordProductScope.tsx
View File

@ -42,6 +42,24 @@ export const RecordProductScope = observer(() => {
}); });
}); });
result.push(...Object.values(leaseItem)); result.push(...Object.values(leaseItem));
} else if (!contractPlanId?.length && products) {
const leaseItem = {};
products.forEach((item) => {
const isParent = Object.values(leaseItem).find(
(value) => value['parentScopeId'].includes(item.id) && item.id !== value['id'],
);
const isChildren = Object.values(leaseItem).find(
(value) => item['parentScopeId'].includes(value['id']) && item.id !== value['id'],
);
if (isParent) return;
if (isChildren) {
delete leaseItem[isChildren['id']];
leaseItem[item.id] = item;
} else {
leaseItem[item.id] = item;
}
});
result.push(...Object.values(leaseItem));
} }
useDeepCompareEffect(() => { useDeepCompareEffect(() => {
form.setValues({ form.setValues({
@ -54,14 +72,3 @@ export const RecordProductScope = observer(() => {
RecordProductScope.displayName = 'RecordProductScope'; RecordProductScope.displayName = 'RecordProductScope';
RecordProductScope.__componentType = CustomComponentType.CUSTOM_ASSOCIATED_FIELD; RecordProductScope.__componentType = CustomComponentType.CUSTOM_ASSOCIATED_FIELD;
RecordProductScope.__componentLabel = '记录单 - 产品范围'; RecordProductScope.__componentLabel = '记录单 - 产品范围';
const intersectionByMultiple = (arr1, arr2, propName) => {
const result = [];
arr1.forEach((item) => {
const index = arr2.findIndex((i) => i[propName] === item[propName]);
if (index !== -1) {
result.push(item);
}
});
return result;
};