refactor: 从hooks/usingStorage 获取登录信息

feature/price_manager
Lei OT 1 year ago
parent 30012ae37e
commit ca0edbd63a

@ -7,7 +7,7 @@ import dayjs from "dayjs";
import SearchForm from "@/components/SearchForm"; import SearchForm from "@/components/SearchForm";
import airTicketStore from "@/stores/Airticket"; import airTicketStore from "@/stores/Airticket";
import useAuthStore from "@/stores/Auth"; import { usingStorage } from "@/hooks/usingStorage";
const planListColumns = [ const planListColumns = [
{ {
@ -66,9 +66,8 @@ const Airticket = props => {
const href = useHref(); const href = useHref();
const navigate = useNavigate(); const navigate = useNavigate();
const { phonenumber } = useParams(); const { phonenumber } = useParams();
const travelAgencyId = useAuthStore(state => state.loginUser.travelAgencyId); const {travelAgencyId, } = usingStorage();
const [getPlanList, planList, loading] = airTicketStore(state => [state.getPlanList, state.planList, state.loading]); const [getPlanList, planList, loading] = airTicketStore(state => [state.getPlanList, state.planList, state.loading]);
const [loginUser] = useAuthStore(state => [state.loginUser]);
const [phone_number, setPhone_number] = useState(phonenumber); const [phone_number, setPhone_number] = useState(phonenumber);
const showTotal = total => `合计 ${total} `; const showTotal = total => `合计 ${total} `;

@ -3,16 +3,16 @@ import { useEffect, useState } from 'react';
import { Row, Col, Space, Button, Divider, Form, Typography, Rate, Radio, Upload, Input, App, Card } from 'antd'; import { Row, Col, Space, Button, Divider, Form, Typography, Rate, Radio, Upload, Input, App, Card } from 'antd';
import { PlusOutlined } from '@ant-design/icons'; import { PlusOutlined } from '@ant-design/icons';
import * as config from '@/config'; import * as config from '@/config';
import useAuthStore from '@/stores/Auth';
import { getFeedbackDetail, getCustomerFeedbackDetail, getFeedbackImages, getFeedbackInfo, removeFeedbackImages, postFeedbackInfo } from '@/stores/Feedback'; import { getFeedbackDetail, getCustomerFeedbackDetail, getFeedbackImages, getFeedbackInfo, removeFeedbackImages, postFeedbackInfo } from '@/stores/Feedback';
import BackBtn from '@/components/BackBtn'; import BackBtn from '@/components/BackBtn';
import { usingStorage } from '@/hooks/usingStorage';
const { Title, Text, Paragraph } = Typography; const { Title, Text, Paragraph } = Typography;
function Detail() { function Detail() {
const navigate = useNavigate(); const navigate = useNavigate();
const { GRI_SN, RefNo, CII_SN } = useParams(); const { GRI_SN, RefNo, CII_SN } = useParams();
const [travelAgencyId, token] = useAuthStore((state) => [state.loginUser.travelAgencyId, state.loginUser.token]); const {travelAgencyId, token} = usingStorage();
const desc = ['none', 'Unacceptable', 'Poor', 'Fair', 'Very Good', 'Excellent']; const desc = ['none', 'Unacceptable', 'Poor', 'Fair', 'Very Good', 'Excellent'];
const { notification } = App.useApp(); const { notification } = App.useApp();
const [form] = Form.useForm(); const [form] = Form.useForm();

@ -3,15 +3,15 @@ import { useEffect, useState } from "react";
import { Row, Col, Space, Button, Divider, Form, Typography, Rate, Radio, Upload, Input, App, Card } from "antd"; import { Row, Col, Space, Button, Divider, Form, Typography, Rate, Radio, Upload, Input, App, Card } from "antd";
import { PlusOutlined } from "@ant-design/icons"; import { PlusOutlined } from "@ant-design/icons";
import * as config from "@/config"; import * as config from "@/config";
import useAuthStore from '@/stores/Auth';
import { getFeedbackDetail, getFeedbackImages, getFeedbackInfo, removeFeedbackImages, postFeedbackInfo } from '@/stores/Feedback'; import { getFeedbackDetail, getFeedbackImages, getFeedbackInfo, removeFeedbackImages, postFeedbackInfo } from '@/stores/Feedback';
import BackBtn from "@/components/BackBtn"; import BackBtn from "@/components/BackBtn";
import { usingStorage } from "@/hooks/usingStorage";
const { Title, Text, Paragraph } = Typography; const { Title, Text, Paragraph } = Typography;
function Detail() { function Detail() {
const navigate = useNavigate(); const navigate = useNavigate();
const { GRI_SN,RefNo } = useParams(); const { GRI_SN,RefNo } = useParams();
const [travelAgencyId, token] = useAuthStore((state) => [state.loginUser.travelAgencyId, state.loginUser.token]); const {travelAgencyId, token} = usingStorage();
const desc = ["none", "Unacceptable", "Poor", "Fair", "Very Good", "Excellent"]; const desc = ["none", "Unacceptable", "Poor", "Fair", "Very Good", "Excellent"];
const { notification } = App.useApp(); const { notification } = App.useApp();
const [form] = Form.useForm(); const [form] = Form.useForm();

@ -3,9 +3,9 @@ import { useEffect } from 'react';
import { Row, Col, Space, Table, App } from 'antd'; import { Row, Col, Space, Table, App } from 'antd';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import SearchForm from '@/components/SearchForm'; import SearchForm from '@/components/SearchForm';
import useAuthStore from '@/stores/Auth';
import useFeedbackStore from '@/stores/Feedback'; import useFeedbackStore from '@/stores/Feedback';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { usingStorage } from '@/hooks/usingStorage';
const feedbackListColumns = [ const feedbackListColumns = [
{ {
@ -48,7 +48,7 @@ function Index() {
const { t } = useTranslation(); const { t } = useTranslation();
const { notification } = App.useApp(); const { notification } = App.useApp();
const travelAgencyId = useAuthStore((state) => state.loginUser.travelAgencyId) const {travelAgencyId} = usingStorage();
const [loading, feedbackList, fetchFeedbackList] = useFeedbackStore((state) => [state.loading, state.feedbackList, state.fetchFeedbackList]); const [loading, feedbackList, fetchFeedbackList] = useFeedbackStore((state) => [state.loading, state.feedbackList, state.fetchFeedbackList]);
const showTotal = (total) => `Total ${total} items`; const showTotal = (total) => `Total ${total} items`;

@ -5,20 +5,17 @@ import { PlusOutlined } from "@ant-design/icons";
import { isNotEmpty } from "@/utils/commons"; import { isNotEmpty } from "@/utils/commons";
import * as config from "@/config"; import * as config from "@/config";
import dayjs from "dayjs"; import dayjs from "dayjs";
import useAuthStore from '@/stores/Auth'; import { fetchInvoiceDetail, postEditInvoiceDetail, postAddInvoice } from '@/stores/Invoice';
import useInvoiceStore, { fetchInvoiceDetail, postEditInvoiceDetail, postAddInvoice } from '@/stores/Invoice';
import { removeFeedbackImages } from '@/stores/Feedback'; import { removeFeedbackImages } from '@/stores/Feedback';
import BackBtn from '@/components/BackBtn'; import BackBtn from '@/components/BackBtn';
import { usingStorage } from "@/hooks/usingStorage";
const { Title,Text } = Typography; const { Title,Text } = Typography;
const { TextArea } = Input;
function Detail() { function Detail() {
const navigate = useNavigate(); const navigate = useNavigate();
const { GMDSN, GSN } = useParams(); const { GMDSN, GSN } = useParams();
const [userId, travelAgencyId, token] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.travelAgencyId, state.loginUser.token]); const {userId, travelAgencyId, token} = usingStorage();
// const { invoiceStore, authStore } = useStore();
// const { invoiceGroupInfo, invoiceProductList, invoiceCurrencyList, invoiceZDDetail } = invoiceStore;
const [form] = Form.useForm(); const [form] = Form.useForm();
const [dataLoading, setDataLoading] = useState(false); const [dataLoading, setDataLoading] = useState(false);
const [edited, setEdited] = useState(true); // const [edited, setEdited] = useState(true); //

@ -6,12 +6,12 @@ import { formatDate, isNotEmpty } from "@/utils/commons";
import { AuditOutlined, SmileOutlined, SolutionOutlined, EditOutlined } from "@ant-design/icons"; import { AuditOutlined, SmileOutlined, SolutionOutlined, EditOutlined } from "@ant-design/icons";
import SearchForm from '@/components/SearchForm'; import SearchForm from '@/components/SearchForm';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import useAuthStore from '@/stores/Auth';
import useInvoiceStore from '@/stores/Invoice'; import useInvoiceStore from '@/stores/Invoice';
import { usingStorage } from "@/hooks/usingStorage";
function Index() { function Index() {
const [travelAgencyId, ] = useAuthStore((state) => [state.loginUser.travelAgencyId]); const {travelAgencyId, } = usingStorage();
const [invoiceList, fetchInvoiceList] = useInvoiceStore((state) => [state.invoiceList, state.fetchInvoiceList]); const [invoiceList, fetchInvoiceList] = useInvoiceStore((state) => [state.invoiceList, state.fetchInvoiceList]);
const navigate = useNavigate(); const navigate = useNavigate();
const { notification } = App.useApp(); const { notification } = App.useApp();

@ -3,13 +3,13 @@ import { useEffect } from 'react';
import { Row, Col, Space, Table, Image } from 'antd'; import { Row, Col, Space, Table, Image } from 'antd';
import { formatDate, isNotEmpty } from '@/utils/commons'; import { formatDate, isNotEmpty } from '@/utils/commons';
import SearchForm from '@/components/SearchForm'; import SearchForm from '@/components/SearchForm';
import useAuthStore from '@/stores/Auth';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import BackBtn from '@/components/BackBtn'; import BackBtn from '@/components/BackBtn';
import useInvoiceStore from '@/stores/Invoice'; import useInvoiceStore from '@/stores/Invoice';
import { usingStorage } from '@/hooks/usingStorage';
function Paid() { function Paid() {
const [travelAgencyId] = useAuthStore((state) => [state.loginUser.travelAgencyId]); const {travelAgencyId, } = usingStorage();
const [invoicePaid, fetchInvoicePaid] = useInvoiceStore((state) => [state.invoicePaid, state.fetchInvoicePaid]); const [invoicePaid, fetchInvoicePaid] = useInvoiceStore((state) => [state.invoicePaid, state.fetchInvoicePaid]);
const navigate = useNavigate(); const navigate = useNavigate();
const showTotal = (total) => `Total ${total} items`; const showTotal = (total) => `Total ${total} items`;

@ -2,15 +2,15 @@ import { useNavigate, useParams } from 'react-router-dom';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { Row, Col, Space, Table, Typography } from 'antd'; import { Row, Col, Space, Table, Typography } from 'antd';
import { formatDate, isNotEmpty } from '@/utils/commons'; import { formatDate, isNotEmpty } from '@/utils/commons';
import useAuthStore from '@/stores/Auth';
import BackBtn from '@/components/BackBtn'; import BackBtn from '@/components/BackBtn';
import { fetchInvoicePaidDetail } from '@/stores/Invoice'; import { fetchInvoicePaidDetail } from '@/stores/Invoice';
import { usingStorage } from '@/hooks/usingStorage';
const { Title } = Typography; const { Title } = Typography;
function PaidDetail() { function PaidDetail() {
const navigate = useNavigate(); const navigate = useNavigate();
const [travelAgencyId] = useAuthStore((state) => [state.loginUser.travelAgencyId]); const {travelAgencyId, } = usingStorage();
const { flid } = useParams(); const { flid } = useParams();
const [invoicePaidDetail, setInvoicePaidDetail] = useState([]); const [invoicePaidDetail, setInvoicePaidDetail] = useState([]);

@ -4,15 +4,15 @@ import { Row, Col, Space, Typography, Divider } from 'antd';
import * as comm from '@/utils/commons'; import * as comm from '@/utils/commons';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import { fetchNoticeDetail } from '@/stores/Notice'; import { fetchNoticeDetail } from '@/stores/Notice';
import useAuthStore from '@/stores/Auth';
import BackBtn from '@/components/BackBtn'; import BackBtn from '@/components/BackBtn';
import { usingStorage } from '@/hooks/usingStorage';
const { Title, Paragraph } = Typography; const { Title, Paragraph } = Typography;
function Detail() { function Detail() {
const { t } = useTranslation(); const { t } = useTranslation();
const { CCP_BLID } = useParams(); const { CCP_BLID } = useParams();
const [userId, ] = useAuthStore((state) => [state.loginUser.userId]); const {userId} = usingStorage();
const [noticeInfo, setNoticeInfo] = useState({}); const [noticeInfo, setNoticeInfo] = useState({});
useEffect(() => { useEffect(() => {

@ -2,10 +2,11 @@ import { NavLink } from "react-router-dom";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { Row, Col, Space, Typography, Badge, List } from "antd"; import { Row, Col, Space, Typography, Badge, List } from "antd";
import useNoticeStore, { fetchBulletinList } from '@/stores/Notice'; import useNoticeStore, { fetchBulletinList } from '@/stores/Notice';
import useAuthStore from '@/stores/Auth'; import { usingStorage } from "@/hooks/usingStorage";
function Index() { function Index() {
const [userId, ] = useAuthStore((state) => [state.loginUser.userId]); const { userId, } = usingStorage();
const getBulletinUnReadCount = useNoticeStore((state) => state.getBulletinUnReadCount); const getBulletinUnReadCount = useNoticeStore((state) => state.getBulletinUnReadCount);
const [noticeList, setNoticeList] = useState([]); const [noticeList, setNoticeList] = useState([]);

@ -3,14 +3,14 @@ import * as comm from '@/utils/commons';
import { usePDF } from 'react-to-pdf'; import { usePDF } from 'react-to-pdf';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import SearchForm from '@/components/SearchForm'; import SearchForm from '@/components/SearchForm';
import useAuthStore from '@/stores/Auth';
import useReportStore from '@/stores/Report'; import useReportStore from '@/stores/Report';
import { useTranslation } from 'react-i18next' import { useTranslation } from 'react-i18next'
import { usingStorage } from '@/hooks/usingStorage';
function Index() { function Index() {
const { t } = useTranslation(); const { t } = useTranslation();
const [travelAgencyId, ] = useAuthStore((state) => [state.loginUser.travelAgencyId]); const {travelAgencyId, } = usingStorage();
const [loading, vendorScoresData, getHWVendorScores] = useReportStore((state) => [state.loading, state.vendorScoresData, state.getHWVendorScores]); const [loading, vendorScoresData, getHWVendorScores] = useReportStore((state) => [state.loading, state.vendorScoresData, state.getHWVendorScores]);
const [productScoresData, getHWProductScores] = useReportStore((state) => [state.productScoresData, state.getHWProductScores]); const [productScoresData, getHWProductScores] = useReportStore((state) => [state.productScoresData, state.getHWProductScores]);
const [commendScoresData, getHWCommendScores] = useReportStore((state) => [state.commendScoresData, state.getHWCommendScores]); const [commendScoresData, getHWCommendScores] = useReportStore((state) => [state.commendScoresData, state.getHWCommendScores]);

Loading…
Cancel
Save