refactor: Invoice/index, Detail, 读取authstore; 使用搜索组件

src/stores/Invoice.js

@@ -8,7 +8,6 @@ import dayjs from "dayjs";
 
 import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
-import useAuthStore from '@/stores/Auth';
 
 const initialState = {
   invoiceList: [], //账单列表
@@ -122,9 +121,9 @@ export class Invoice {
 		});
 	}
 
-	fetchInvoiceDetail(GMDSN, GSN) {
+	fetchInvoiceDetail(VEI_SN, GMDSN, GSN) {
 		const fetchUrl = prepareUrl(HT_HOST + "/service-cusservice/PTGetZDDetail")
-			.append("VEI_SN", useAuthStore.getState().loginUser.travelAgencyId)
+			.append("VEI_SN", VEI_SN)
 			.append("GRI_SN", GSN)
 			.append("GMD_SN", GMDSN)
 			.append("LGC", 1)
@@ -228,10 +227,10 @@ export class Invoice {
 			});
 	}
 
-	postEditInvoiceDetail(GMD_SN, Currency, Cost, PayDate, Pic, Memo) {
+	postEditInvoiceDetail(LMI_SN, GMD_SN, Currency, Cost, PayDate, Pic, Memo) {
 		let postUrl = HT_HOST + "/service-cusservice/EditSupplierFK";
 		let formData = new FormData();
-		formData.append("LMI_SN", useAuthStore.getState().loginUser.userId);
+		formData.append("LMI_SN", LMI_SN);
 		formData.append("GMD_SN", GMD_SN);
 		formData.append("Currency", Currency);
 		formData.append("Cost", Cost);
@@ -246,11 +245,11 @@ export class Invoice {
 		});
 	}
 
-	postAddInvoice(GRI_SN, Currency, Cost, PayDate, Pic, Memo) {
+	postAddInvoice(LMI_SN, VEI_SN, GRI_SN, Currency, Cost, PayDate, Pic, Memo) {
 		let postUrl = HT_HOST + "/service-cusservice/AddSupplierFK";
 		let formData = new FormData();
-		formData.append("LMI_SN", useAuthStore.getState().loginUser.userId);
+		formData.append("LMI_SN", LMI_SN);
-		formData.append("VEI_SN", useAuthStore.getState().loginUser.travelAgencyId);
+		formData.append("VEI_SN", VEI_SN);
 		formData.append("GRI_SN", GRI_SN);
 		formData.append("Currency", Currency);
 		formData.append("Cost", Cost);

src/views/invoice/Detail.jsx

@@ -18,7 +18,7 @@ function Detail() {
 	const { GMDSN, GSN } = useParams();
 	const { invoiceStore, } = useStore();
 
-  const [travelAgencyId, token] = useAuthStore((state) => [state.loginUser.travelAgencyId, state.loginUser.token]);
+  const [userId, travelAgencyId, token] = useAuthStore((state) => [state.loginUser.userId,state.loginUser.travelAgencyId, state.loginUser.token]);
 
 	const { invoicekImages, invoiceGroupInfo, invoiceProductList, invoiceCurrencyList, invoiceZDDetail } = invoiceStore;
 	const [form] = Form.useForm();
@@ -37,7 +37,7 @@ function Detail() {
 	function defaultShow() {
 		setDataLoading(true);
 		invoiceStore
-			.fetchInvoiceDetail(GMDSN, GSN)
+			.fetchInvoiceDetail(travelAgencyId, GMDSN, GSN)
 			.then(json => {
 				let ZDDetail = json.ZDDetail;
 				if (isNotEmpty(ZDDetail)) {
@@ -113,7 +113,7 @@ function Detail() {
 		console.log("Success:", fieldVaule);
 		//入库
 		if (fieldVaule) {
-			invoiceStore.postEditInvoiceDetail(fieldVaule.info_gmdsn, fieldVaule.info_Currency, fieldVaule.info_money, fieldVaule.info_date, fieldVaule.info_images, "").then(data => {
+			invoiceStore.postEditInvoiceDetail(userId, fieldVaule.info_gmdsn, fieldVaule.info_Currency, fieldVaule.info_money, fieldVaule.info_date, fieldVaule.info_images, "").then(data => {
 				console.log(data);
 				runInAction(() => {
 					let param = { info_money: fieldVaule.info_money, info_Currency: fieldVaule.info_Currency, info_date: fieldVaule.info_date };
@@ -167,7 +167,7 @@ function Detail() {
 
 	function addInvoice() {
 		invoiceStore
-			.postAddInvoice(GSN, "", 0, "", "[]", "")
+			.postAddInvoice(userId, travelAgencyId, GSN, "", 0, "", "[]", "")
 			.then(data => {})
 			.finally(() => {
 				defaultShow();