diff --git a/src/features/province/components/manage-guilds/ManageGuilds.js b/src/features/province/components/manage-guilds/ManageGuilds.js index 92f3abf..1466f54 100644 --- a/src/features/province/components/manage-guilds/ManageGuilds.js +++ b/src/features/province/components/manage-guilds/ManageGuilds.js @@ -190,9 +190,9 @@ export const ManageGuilds = ({ userType }) => { ? item.productInfo.totalCarcassesWeight.toLocaleString() : "-" ); - commonData.splice(10, 0, item?.hasInquiry ? "استعلامی" : "دستی"); + commonData.splice(12, 0, item?.hasInquiry ? "استعلامی" : "دستی"); commonData.splice( - 11, + 13, 0, item?.activeRegisterCode ? "انجام شده" : "انجام نشده" ); diff --git a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js index 339564d..c565ec2 100644 --- a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js +++ b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsForm.js @@ -384,7 +384,7 @@ export const ProvinceLegalGuildsForm = ({ updateTable, item, userType }) => { const IS_STEWARD = userType === "steward"; const userInitialValue = { - national_id: item?.user?.national_id || "", + national_id: item?.user?.nationalId || "", first_name: item?.user?.firstName || "", last_name: item?.user?.lastName || "", province: item?.address?.province?.name || "", @@ -397,7 +397,7 @@ export const ProvinceLegalGuildsForm = ({ updateTable, item, userType }) => { if (IS_STEWARD) { userInitialValue["name"] = item?.name; } else { - userInitialValue["unit_name"] = item?.unitName; + userInitialValue["unit_name"] = item?.guildsName; } const dispatch = useDispatch(); diff --git a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js index 8904d7a..e6cc728 100644 --- a/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js +++ b/src/features/province/components/province-legal-guilds-in-province/ProvinceLegalGuildsInProvince.js @@ -90,7 +90,7 @@ export const ProvinceLegalGuildsInProvince = ({ userType }) => { `${item?.registerarFullname || ""} ${ item?.registerarMobile ? "(" + item?.registerarMobile + " )" : " " }`, - (IS_STEWARD ? item?.licenseNumber : item?.nationalId) || "-", + item?.licenseNumber || "-", (IS_STEWARD ? item?.name : item?.guildsName) || "-", `${item?.user?.fullname || "-"}`, item?.user?.mobile || "-",