fix: dispatch for inventory free buy bars

This commit is contained in:
2026-02-02 12:41:46 +03:30
parent 296ac6d198
commit d60206c351
2 changed files with 39 additions and 27 deletions

View File

@@ -8,7 +8,7 @@ import ResponsiveTable from "../../../../components/responsive-table/ResponsiveT
import { import {
LOADING_END, LOADING_END,
LOADING_START, LOADING_START,
OPEN_MODAL, OPEN_MODAL
} from "../../../../lib/redux/slices/appSlice"; } from "../../../../lib/redux/slices/appSlice";
import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl"; import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl";
import { formatJustDate } from "../../../../utils/formatTime"; import { formatJustDate } from "../../../../utils/formatTime";
@@ -26,10 +26,11 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
title, title,
barState, barState,
handleUpdate, handleUpdate,
refreshTrigger,
withDate, withDate,
selectedDate1, selectedDate1,
selectedDate2, selectedDate2,
searchValue, searchValue
}) => { }) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const [openNotif] = useContext(AppContext); const [openNotif] = useContext(AppContext);
@@ -42,7 +43,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
slaughterGetProfile({ slaughterGetProfile({
role_key: checkPathStartsWith("slaughter") role_key: checkPathStartsWith("slaughter")
? selectedSubUser?.key || "" ? selectedSubUser?.key || ""
: "", : ""
}) })
); );
}, [selectedSubUser?.key]); }, [selectedSubUser?.key]);
@@ -92,7 +93,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
fetchSlaughterBroadcastAndProducts({ fetchSlaughterBroadcastAndProducts({
role_key: checkPathStartsWith("slaughter") role_key: checkPathStartsWith("slaughter")
? selectedSubUser?.key || "" ? selectedSubUser?.key || ""
: "", : ""
}) })
); );
}; };
@@ -105,9 +106,16 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
selectedDate1, selectedDate1,
selectedDate2, selectedDate2,
searchValue, searchValue,
selectedSubUser?.key, selectedSubUser?.key
]); ]);
useEffect(() => {
if (refreshTrigger != null && refreshTrigger > 0) {
setPage(1);
fetchApiData(1);
}
}, [refreshTrigger]);
useEffect(() => { useEffect(() => {
const d = data?.map((item, i) => { const d = data?.map((item, i) => {
return [ return [
@@ -153,7 +161,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
item={item} item={item}
updateTable={updateTable} updateTable={updateTable}
/> />
), )
}) })
); );
}} }}
@@ -161,7 +169,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
تایید / رد تایید / رد
</Button> </Button>
)} )}
</>, </>
]; ];
}); });
@@ -190,7 +198,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
vertical: "top", vertical: "top",
horizontal: "center", horizontal: "center",
msg: "فایل اکسل در حال دانلود می باشد، این علمیات ممکن است زمان بر باشد لطفا صبر کنید.", msg: "فایل اکسل در حال دانلود می باشد، این علمیات ممکن است زمان بر باشد لطفا صبر کنید.",
severity: "success", severity: "success"
}); });
const link = `${ const link = `${
axios.defaults.baseURL axios.defaults.baseURL
@@ -230,7 +238,7 @@ export const SlaughterInventoryFreeBuyBarsAlives = ({
"وزن لاشه (کیلوگرم)", "وزن لاشه (کیلوگرم)",
"درصد افت", "درصد افت",
"بارنامه", "بارنامه",
"عملیات", "عملیات"
]} ]}
handlePageChange={handlePageChange} handlePageChange={handlePageChange}
totalRows={totalRows} totalRows={totalRows}

View File

@@ -11,7 +11,7 @@ import {
DRAWER, DRAWER,
LOADING_END, LOADING_END,
LOADING_START, LOADING_START,
OPEN_MODAL, OPEN_MODAL
} from "../../../../lib/redux/slices/appSlice"; } from "../../../../lib/redux/slices/appSlice";
import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl"; import { getRoleFromUrl } from "../../../../utils/getRoleFromUrl";
import { AppContext } from "../../../../contexts/AppContext"; import { AppContext } from "../../../../contexts/AppContext";
@@ -57,7 +57,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
slaughterGetProfile({ slaughterGetProfile({
role_key: checkPathStartsWith("slaughter") role_key: checkPathStartsWith("slaughter")
? selectedSubUser?.key || "" ? selectedSubUser?.key || ""
: "", : ""
}) })
); );
}, [selectedSubUser?.key, dispatch]); }, [selectedSubUser?.key, dispatch]);
@@ -70,6 +70,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
const [tableData, setTableData] = useState([]); const [tableData, setTableData] = useState([]);
const [withDate, setWithDate] = useState(false); const [withDate, setWithDate] = useState(false);
const [searchValue, setSearchValue] = useState(""); const [searchValue, setSearchValue] = useState("");
const [aliveTablesRefreshTrigger, setAliveTablesRefreshTrigger] = useState(0);
const fetchApiData = async (page) => { const fetchApiData = async (page) => {
dispatch(LOADING_START()); dispatch(LOADING_START());
@@ -103,11 +104,12 @@ export const SlaughterInventoryFreeBuyBars = () => {
setPage(1); setPage(1);
fetchApiData(1); fetchApiData(1);
fetchDashboardData(); fetchDashboardData();
setAliveTablesRefreshTrigger((prev) => prev + 1);
dispatch( dispatch(
fetchSlaughterBroadcastAndProducts({ fetchSlaughterBroadcastAndProducts({
role_key: checkPathStartsWith("slaughter") role_key: checkPathStartsWith("slaughter")
? selectedSubUser?.key || "" ? selectedSubUser?.key || ""
: "", : ""
}) })
); );
}; };
@@ -124,8 +126,8 @@ export const SlaughterInventoryFreeBuyBars = () => {
type: activeTab === 0 ? "live" : "carcass", type: activeTab === 0 ? "live" : "carcass",
...(withDate && { ...(withDate && {
date1: selectedDate1, date1: selectedDate1,
date2: selectedDate2, date2: selectedDate2
}), })
}) })
).then((r) => { ).then((r) => {
setDashboardData(r.payload.data); setDashboardData(r.payload.data);
@@ -142,7 +144,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
perPage, perPage,
activeTab, activeTab,
searchValue, searchValue,
selectedSubUser?.key, selectedSubUser?.key
]); ]);
useEffect(() => { useEffect(() => {
@@ -185,7 +187,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
item={item} item={item}
updateTable={updateTable} updateTable={updateTable}
/> />
), )
}) })
); );
}} }}
@@ -193,7 +195,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
تایید / رد تایید / رد
</Button> </Button>
)} )}
</>, </>
]; ];
}); });
@@ -240,7 +242,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
padding: "5px", padding: "5px",
borderRadius: "15px", borderRadius: "15px",
borderColor: "gray", borderColor: "gray",
justifyContent: "left", justifyContent: "left"
}} }}
alignItems="center" alignItems="center"
> >
@@ -342,7 +344,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
selectedDate={selectedDate1} selectedDate={selectedDate1}
updateTable={updateTable} updateTable={updateTable}
/> />
), )
}) })
); );
}} }}
@@ -365,7 +367,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
"وزن لاشه بارهای وارد شده به انبار", "وزن لاشه بارهای وارد شده به انبار",
"تعداد کل بارها وارد نشده به انبار", "تعداد کل بارها وارد نشده به انبار",
"حجم کل بارهای زنده وارد نشده به انبار", "حجم کل بارهای زنده وارد نشده به انبار",
"وزن کل بارهای زنده وارد نشده به انبار", "وزن کل بارهای زنده وارد نشده به انبار"
]} ]}
data={[ data={[
[ [
@@ -378,14 +380,14 @@ export const SlaughterInventoryFreeBuyBars = () => {
dashboardData?.enteredTotalBarsWeightOfCarcasses?.toLocaleString(), dashboardData?.enteredTotalBarsWeightOfCarcasses?.toLocaleString(),
dashboardData?.notEnteredTotalBars?.toLocaleString(), dashboardData?.notEnteredTotalBars?.toLocaleString(),
dashboardData?.notEnteredTotalBarsQuantity?.toLocaleString(), dashboardData?.notEnteredTotalBarsQuantity?.toLocaleString(),
dashboardData?.notEnteredTotalBarsLiveWeight?.toLocaleString(), dashboardData?.notEnteredTotalBarsLiveWeight?.toLocaleString()
], ]
]} ]}
customColors={[ customColors={[
{ {
name: "وزن لاشه بارهای وارد شده به انبار", name: "وزن لاشه بارهای وارد شده به انبار",
color: "green", color: "green"
}, }
]} ]}
title={"خلاصه اطلاعات"} title={"خلاصه اطلاعات"}
/> />
@@ -398,8 +400,8 @@ export const SlaughterInventoryFreeBuyBars = () => {
[ [
dashboardData?.totalBars?.toLocaleString(), dashboardData?.totalBars?.toLocaleString(),
dashboardData?.totalBarsNumberOfCarcasses?.toLocaleString(), dashboardData?.totalBarsNumberOfCarcasses?.toLocaleString(),
dashboardData?.totalBarsWeightOfCarcasses?.toLocaleString(), dashboardData?.totalBarsWeightOfCarcasses?.toLocaleString()
], ]
]} ]}
title={"خلاصه اطلاعات"} title={"خلاصه اطلاعات"}
/> />
@@ -412,6 +414,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
title={"بار زنده در انتظار ورود به انبار (خارج استان)"} title={"بار زنده در انتظار ورود به انبار (خارج استان)"}
barState={"notentered"} barState={"notentered"}
handleUpdate={updateTable} handleUpdate={updateTable}
refreshTrigger={aliveTablesRefreshTrigger}
searchValue={searchValue} searchValue={searchValue}
withDate={withDate} withDate={withDate}
selectedDate1={selectedDate1} selectedDate1={selectedDate1}
@@ -422,6 +425,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
title={"بار زنده وارد شده به انبار (خارج استان)"} title={"بار زنده وارد شده به انبار (خارج استان)"}
barState={"entered"} barState={"entered"}
handleUpdate={updateTable} handleUpdate={updateTable}
refreshTrigger={aliveTablesRefreshTrigger}
searchValue={searchValue} searchValue={searchValue}
withDate={withDate} withDate={withDate}
selectedDate1={selectedDate1} selectedDate1={selectedDate1}
@@ -516,7 +520,7 @@ export const SlaughterInventoryFreeBuyBars = () => {
"حجم لاشه", "حجم لاشه",
"وزن لاشه (کیلوگرم)", "وزن لاشه (کیلوگرم)",
"بارنامه", "بارنامه",
"عملیات", "عملیات"
]} ]}
handlePageChange={handlePageChange} handlePageChange={handlePageChange}
totalRows={totalRows} totalRows={totalRows}