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

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

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

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

@@ -81,7 +81,7 @@
           :columns="columns"
           :pagination="pagination"
           class="table"
-          :max-height="550"
+          :height="550"
         >
           <template #breakNum="{ row }">
             {{ `${row.breakNum}张` }}

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

@@ -276,11 +276,11 @@ const Quitneck = (value) => {
   rowItem.value = value;
 };
 const onClick = async (context) => {
-  pageJudge.value = true;
   // 判断是否为顶层节点（无父节点）
   if (context.node.value === "t1") {
     return;
   }
+  pageJudge.value = true;
   loading.value = true;
   // 获取票据列表
   tableData.value = await quitneckList.getQuitneckList(context.node.label);

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

@@ -469,9 +469,9 @@ onMounted(() => {
   background-color: @base-white-color;
   margin-bottom: 2rem;
   .scarch-from {
-    width: 100%;
     height: 60px;
     display: flex;
+    justify-content: space-between;
     align-items: center;
   }
 }