提交修改代码

src/views/biz/orderProcessPlan/board.vue

@@ -1367,12 +1367,12 @@ function dispatchSubmit() {
   dispatchformRef.value?.validate((errors: any) => {
     // Naive UI：有 errors 表示校验失败
     if (errors) return
-    if (total !== remainQty) {
-      message.error(`派工总数量需等于待派数量 ${remainQty}（计划 ${dispatchform.quantity}，已完成 ${dispatchform.completedQty ?? 0}）`, {
-        duration: 4000,
-      })
-      return
-    }
+    // if (total !== remainQty) {
+    //   message.error(`派工总数量需等于待派数量 ${remainQty}（计划 ${dispatchform.quantity}，已完成 ${dispatchform.completedQty ?? 0}）`, {
+    //     duration: 4000,
+    //   })
+    //   return
+    // }
 
     dispatchLoading.value = true
     // 提交时 quantity 仍传计划总数，避免把工序计划数量改成待派数

src/views/biz/station/index.vue

@@ -53,7 +53,7 @@
         :scroll-x="1200"
         v-model:checked-row-keys="selectedIds"
       />
-            <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
+      <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
         <n-pagination
           v-model:page="pagination.page"
           v-model:page-size="pagination.pageSize"

src/views/biz/stockIn/index.vue

@@ -64,13 +64,26 @@
         :columns="columns"
         :data="tableData"
         :loading="loading"
-        :pagination="pagination"
         :row-key="(row) => row.id!"
         :scroll-x="1680"
-        @update:page="handlePageChange"
-        @update:page-size="handlePageSizeChange"
-        @update:checked-row-keys="handleCheck"
       />
+      <div class="pagination-container" style="display: flex; justify-content: flex-end; margin-top: 12px">
+        <n-pagination
+            v-model:page="pagination.page"
+            v-model:page-size="pagination.pageSize"
+            :item-count="pagination.itemCount"
+            :page-sizes="[10, 20, 50, 100]"
+            show-size-picker
+            show-quick-jumper
+            @update:page="handlePageChange"
+            @update:page-size="handlePageSizeChange"
+            @update:checked-row-keys="handleCheck"
+        >
+          <template #prefix>
+            共 {{ pagination.itemCount }} 条
+          </template>
+        </n-pagination>
+      </div>
     </n-card>
 
     <!-- 详情 -->