diff --git a/src/stores/Reservation.js b/src/stores/Reservation.js index 670fe18..332ad27 100644 --- a/src/stores/Reservation.js +++ b/src/stores/Reservation.js @@ -94,13 +94,13 @@ const useReservationStore = create(devtools((set, get) => ({ fetchReservationList: (formValues, current=1) => { set(() => ({ - selectedAgencyId: formValues.selectedAgencyId + selectedAgencyId: formValues.agency })) const { reservationPage } = get() // 设置为 0,后端会重新计算总数,当跳转第 X 页时可用原来的总数。 const totalNum = current == 1 ? 0 : reservationPage.total const fetchUrl = prepareUrl(HT_HOST + '/service-cusservice/GetPlanSearchList') - .append('VEI_SN', formValues.selectedAgencyId) + .append('VEI_SN', formValues.agency) .append('GroupNo', formValues.referenceNo) .append('DateStart', formValues.startdate) .append('DateEnd', formValues.enddate) diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx index 4c24737..24302b3 100644 --- a/src/views/reservation/Newest.jsx +++ b/src/views/reservation/Newest.jsx @@ -157,30 +157,10 @@ function Newest() { // 默认重新搜索第一页,所有状态的计划 const searchReservation = (submitValues, current=1) => { setDataLoading(true) + console.info('submitValues: ', submitValues) - const getSelectedAgencyId = () => { - - if (isPermitted(PERM_AGENCY_ALL)) { - return isEmpty(submitValues.agency) ? travelAgencyId : parseInt(submitValues.agency, 10) - } else { - return travelAgencyId - } - } - const selectedAgencyId = getSelectedAgencyId() - - initAgencyGuideList(selectedAgencyId) - - if (isEmpty(selectedAgencyId)) { - notification.error({ - message: `Notification`, - description: 'Agency is required', - placement: 'top', - duration: 4, - }); - return - } - const formValues = {...submitValues, ...{ selectedAgencyId }}; - fetchReservationList(formValues, current) + // const formValues = {...submitValues, ...{ selectedAgencyId }}; + fetchReservationList(submitValues, current) .catch(ex => { notification.error({ message: `Notification`,