Merge branch 'dev' into 'master'

Dev

See merge request !46

src/views/order/podUs/index.vue

@@ -678,8 +678,8 @@
                           status === 'EXCEPTION_ORDER' ||
                           status === 'PICKING' ||
                           status === 'TO_BE_CONFIRMED' ||
-                          status === 'STOCK_OUT'||
-                          status === 'CREATE_LOGISTICS'  ? '数量:'
+                          status === 'STOCK_OUT' ||
+                          status === 'CREATE_LOGISTICS' ? '数量:'
                             : '已生产数量:'
                         }}</span>
                       <span class="goods-item-info-item-value">
@@ -1114,11 +1114,11 @@
                     </span>
                   </div>
 
-                  <div class="grid-item">
+                  <!-- <div class="grid-item">
                     <span title="Variant SKU" class="grid-item-value">
                       {{ cardItem?.variantSku }}
                     </span>
-                  </div>
+                  </div> -->
                   <div class="grid-item" title="工艺">
                     <span class="grid-item-label">工艺：</span>
                     <span class="grid-item-value">
@@ -1148,14 +1148,14 @@
                       {{ cardItem?.shopNumber }}
                     </span>
                   </div>
-                  <div class="grid-item" title="订单号">
+                  <!-- <div class="grid-item" title="订单号">
                     <span
                       class="grid-item-value"
                       @click="copy(cardItem?.factoryOrderNumber || '')"
                     >
                       {{ cardItem?.factoryOrderNumber }}
                     </span>
-                  </div>
+                  </div> -->
 
                   <div class="grid-item">
                     <span
@@ -1169,9 +1169,9 @@
                     </span>
                   </div>
                   <div
+                    v-if="cardItem.batchArrangeNumber"
                     class="grid-item"
                     title="批次号"
-                    v-if="cardItem.batchArrangeNumber"
                   >
                     <span
                       class="grid-item-value"
@@ -1192,17 +1192,36 @@
         </div>
         <div v-else class="empty">暂无数据</div>
       </div>
-      <ElPagination
-        v-model:current-page="currentPage"
-        v-model:page-size="pageSize"
-        :page-sizes="[100, 200, 300, 400, 500]"
-        background
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        style="margin: 10px auto 0; text-align: right"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      ></ElPagination>
+      <div class="pagination">
+        <div class="total">
+          <span
+          >已选择
+            <span style="color: red">{{ selection.length || cardSelection.length }}</span> 条数据</span
+          >
+        </div>
+        <ElPagination
+          v-model:current-page="currentPage"
+          v-model:page-size="pageSize"
+          :page-sizes="[50,100, 200, 300, 400, 500]"
+          background
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total"
+          style="margin: 10px auto 0; text-align: right"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        ></ElPagination>
+        <div class="pageSize">
+          <span
+          >自定义条数
+            <span><el-input
+              v-model="pageSize"
+              type="number"
+              style="width: 100px;" clearable
+              @blur="inputBlur"></el-input></span> 条/页</span
+          >
+        </div>
+      </div>
+
     </div>
   </div>
   <RightClickMenu
@@ -1530,8 +1549,8 @@
         <div v-if="logisticsForm.expressSheet" class="file">
           <span>{{ logisticsForm.expressSheet.name }}</span>
           <el-icon
-            @click="logisticsForm.expressSheet = null"
             class="expressSheetClose"
+            @click="logisticsForm.expressSheet = null"
           >
             <Close></Close>
           </el-icon>
@@ -1664,6 +1683,7 @@ const currentRow = ref<AddressInfo>({
 })
 
 const updateAddVisible = ref(false)
+const initPageSize = ref(50)
 const logisticsVisible = ref(false)
 const logisticsFormRef = ref()
 const logistics = {
@@ -1963,6 +1983,7 @@ const {
   onCurrentPageChange: handleCurrentChange,
   onPageSizeChange: handleSizeChange,
 } = usePageList({
+  initPageSize: initPageSize.value,
   query: (page, pageSize) => {
     if (
       status.value !== 'IN_PRODUCTION' &&
@@ -2440,7 +2461,12 @@ const changeExceptionOrder = async () => {
   currentOrderIds.value = selection.value.map((item) => item.id)
   exceptionDialogVisible.value = true
 }
-
+const inputBlur = () => {
+  if (!pageSize.value || Number(pageSize.value) <= 0) {
+    pageSize.value = initPageSize.value
+  }
+  search()
+}
 const handleExceptionConfirm = async () => {
   try {
     await exceptionFormRef.value.validate()
@@ -3669,6 +3695,29 @@ const replenishmentSuccess = async () => {
     }
   }
 }
+
+.pagination {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 15px;
+  margin: 10px 0;
+
+  :deep(.el-pagination) {
+    margin: 0 !important;
+  }
+
+  .total {
+    color: #606266;
+    font-size: 15px;
+  }
+
+  .pageSize {
+    line-height: 39px;
+    color: #606266;
+    font-size: 15px;
+  }
+}
 </style>
 <style lang="scss">
 .customize-select-style {