Merge branch 'dev' of https://gitea.dykj.co/sundongyu/dykj-college-back-office-management-system into dev

src/pages/finance-bill-manage/billCancel.vue

@@ -465,3 +465,4 @@ onMounted(() => {
   justify-content: space-between;
 }
 </style>
+@/pages/finance-bill-manage/billCancel

src/pages/finance-bill-manage/billReceipt.vue

@@ -392,12 +392,13 @@ const refresh = () => {
   getTableData();
 };
 // 判断menuManagement里面是否存在数据
-const getPersonName = () => {
+const getPersonName = async () => {
   let arr = JSON.parse(localStorage.getItem("ReceiptList"));
   if (arr) {
     personName.value = arr.personName;
   } else {
-    personList();
+    await personList();
+    getTableData();
   }
 };
 // 判断menuManagement里面是否存在数据
@@ -429,8 +430,8 @@ const getTableData = async () => {
 };
 
 onMounted(async () => {
-  getPersonName();
+  await getPersonName();
-  getTableData();
+  await getTableData();
 });
 </script>
 

src/stores/billReceipt.js

@@ -16,11 +16,11 @@ export const useReceiptList = defineStore("ReceiptList", {
     async getPersonNameList() {
       const { data } = await reqPersonName();
       this.personName = data;
-      console.log(this.personName);
       return this.personName;
     },
 
     async getReceiptList(obj) {
+      console.log("222");
       const { data } = await reqReceiptList(obj);
       this.receiptList = data;
       return this.receiptList;