update status filter fix, popup field fix

dev
RekHoto 2 years ago
parent df62953ace
commit 1ca805a2e2

@ -72,7 +72,7 @@ export const workingPointFields = [
{ name: "Факт", field: "fact" }, { name: "Факт", field: "fact" },
{ name: "Расхождение с прогнозом", field: "delta_current" }, { name: "Расхождение с прогнозом", field: "delta_current" },
{ name: "Зрелость", field: "age_day" }, { name: "Зрелость", field: "age_day" },
{ name: "id постамата", field: "postamat_id", empty: "Не указан" }, { name: "id постамата", field: "id", empty: "Не указан" },
]; ];
export const rivalsConfig = [ export const rivalsConfig = [

@ -7,9 +7,10 @@ import { useUpdateStatus } from "../../../hooks/useUpdateStatus";
import { ArrowRightOutlined } from "@ant-design/icons"; import { ArrowRightOutlined } from "@ant-design/icons";
import { Title } from "../../../components/Title"; import { Title } from "../../../components/Title";
import { usePendingPointsFilters } from "../../../stores/usePendingPointsFilters"; import { usePendingPointsFilters } from "../../../stores/usePendingPointsFilters";
import { appendFiltersInUse } from "../../../utils.js";
export const TakeToWorkButton = ({ disabled }) => { export const TakeToWorkButton = ({ disabled }) => {
const { filters } = usePendingPointsFilters(); const { filters, ranges } = usePendingPointsFilters();
const { prediction, categories, region } = filters; const { prediction, categories, region } = filters;
const { selection } = usePointSelection(); const { selection } = usePointSelection();
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@ -34,6 +35,8 @@ export const TakeToWorkButton = ({ disabled }) => {
"excluded[]": [...selection.excluded], "excluded[]": [...selection.excluded],
}); });
appendFiltersInUse(params, filters, ranges);
if (region) { if (region) {
if (region.type === "ao") { if (region.type === "ao") {
params.append("district[]", region.id); params.append("district[]", region.id);

Loading…
Cancel
Save