Merge remote-tracking branch 'origin/dev' into linjinhong

daac1dc2 · linjinhong · a2757fc6 · 04823d8a · daac1dc2 · daac1dc2
Commit daac1dc2 authored Jun 25, 2025 by linjinhong
Hide whitespace changes
Inline Side-by-side

Showing with 104 additions and 68 deletions

auto-imports.d.ts
+1 -16

src/views/order/podUs/index.vue
+103 -52

No files found.
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -88,21 +88,6 @@ declare global {
 // for type re-export
 declare global {
  // @ts-ignore
-  export type {
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
-    Component,
-    ComponentPublicInstance,
-    ComputedRef,
-    DirectiveBinding,
-    ExtractDefaultPropTypes,
-    ExtractPropTypes,
-    ExtractPublicPropTypes,
-    InjectionKey,
-    PropType,
-    Ref,
-    MaybeRef,
-    MaybeRefOrGetter,
-    VNode,
-    WritableComputedRef,
-  } from 'vue'
  import('vue')
 }
--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -262,7 +262,7 @@
              blue: item.quantity && item.quantity > 0,
              red: item.status === 'EXCEPTION_ORDER',
            }"
-            >{{ item.quantity }}</span
+          >{{ item.quantity }}</span
          >
        </div>
        <!-- <div
@@ -329,7 +329,7 @@
          <ElButton
            :loading="tifDownloadLoading"
            type="warning"
-            @click="downloadTif('tiff', 'tiff')"
+            @click="downloadTif('tiff')"
          >
            TIF排版
          </ElButton>
@@ -338,7 +338,7 @@
          <ElButton
            :loading="pngDownloadLoading"
            type="warning"
-            @click="downloadTif('png', 'composingPNG')"
+            @click="downloadTif('png')"
          >
            PNG排版
          </ElButton>
@@ -447,19 +447,19 @@
            <template #dropdown>
              <ElDropdownMenu>
                <ElDropdownItem @click="getOrderByIdApi('createLogisticsOrder')"
-                  >创建物流订单</ElDropdownItem
+                >创建物流订单</ElDropdownItem
                >
                <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
-                  >获取跟踪号</ElDropdownItem
+                >获取跟踪号</ElDropdownItem
                >
                <ElDropdownItem @click="getOrderByIdApi('getPrintOrder')"
-                  >获取打印面单</ElDropdownItem
+                >获取打印面单</ElDropdownItem
                >
                <ElDropdownItem @click="getOrderByIdApi('cancelLogisticsOrder')"
-                  >取消物流订单</ElDropdownItem
+                >取消物流订单</ElDropdownItem
                >
                <ElDropdownItem @click="getOrderByIdApi('batchChangeLogistics')"
-                  >更换物流</ElDropdownItem
+                >更换物流</ElDropdownItem
                >
              </ElDropdownMenu>
            </template>
@@ -610,7 +610,7 @@
                    </div>
                    <div class="goods-item-info-item">
                      <span class="goods-item-info-item-label"
-                        >第三方生产单号:</span
+                      >第三方生产单号:</span
                      >
                      <span
                        class="goods-item-info-item-value"
@@ -643,7 +643,7 @@
                    >
                      <!-- <span class="goods-item-info-item-label">补胚状态:</span> -->
                      <el-tag size="small" effect="dark" type="danger"
-                        >补胚中
+                      >补胚中
                      </el-tag>
                    </div>
                  </div>
@@ -675,19 +675,20 @@
                    <div class="goods-item-info-item">
                      <span class="goods-item-info-item-label">{{
-                        status === 'EXCEPTION_ORDER' ||
+                          status === 'EXCEPTION_ORDER' ||
-                        status === 'PICKING' ||
+                          status === 'PICKING' ||
-                        status === 'TO_BE_CONFIRMED' ||
+                          status === 'TO_BE_CONFIRMED' ||
-                        status === 'STOCK_OUT'
+                          status === 'STOCK_OUT' ||
-                          ? '数量:'
+                          status === 'CREATE_LOGISTICS' ? '数量:'
-                          : '已生产数量:'
+                            : '已生产数量:'
-                      }}</span>
+                        }}</span>
                      <span class="goods-item-info-item-value">
                        {{
                          status === 'EXCEPTION_ORDER' ||
                          status === 'PICKING' ||
                          status === 'TO_BE_CONFIRMED' ||
-                          status === 'STOCK_OUT'
+                          status === 'STOCK_OUT' ||
+                          status === 'CREATE_LOGISTICS'
                            ? item.num
                            : item.passNum
                        }}
@@ -710,7 +711,7 @@
                        size="small"
                        type="success"
                        @click="applyForReplenishment(item)"
-                        >申请补胚
+                      >申请补胚
                      </el-button>
                      <!-- f -->
                    </div>
@@ -896,17 +897,17 @@
              <el-timeline-item
                :color="row.createTime ? '#409EFF' : ''"
                :timestamp="row.createTime"
-                >创建时间
+              >创建时间
              </el-timeline-item>
              <el-timeline-item
                :color="row.startStockingTime ? '#E6A23C' : ''"
                :timestamp="row.startStockingTime"
-                >确认时间
+              >确认时间
              </el-timeline-item>
              <el-timeline-item
                :color="row.finishTime ? '#67C23A' : ''"
                :timestamp="row.finishTime"
-                >完成时间
+              >完成时间
              </el-timeline-item>
            </el-timeline>
            <!-- <div class="order-time-box">
@@ -1079,7 +1080,7 @@
                <div class="grid-container">
                  <div class="grid-item" title="商品名称">
                    <span class="grid-item-value"
-                      >{{ cardItem?.productName }}
+                    >{{ cardItem?.productName }}
                    </span>
                  </div>
                  <div
@@ -1113,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">
@@ -1147,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
@@ -1168,9 +1169,9 @@
                    </span>
                  </div>
                  <div
+                    v-if="cardItem.batchArrangeNumber"
                    class="grid-item"
                    title="批次号"
-                    v-if="cardItem.batchArrangeNumber"
                  >
                    <span
                      class="grid-item-value"
@@ -1181,7 +1182,7 @@
                  </div>
                  <div v-if="cardItem.isReplenishment" class="grid-item">
                    <el-tag size="small" type="danger" effect="dark"
-                      >补胚中
+                    >补胚中
                    </el-tag>
                  </div>
                </div>
@@ -1191,17 +1192,36 @@
        </div>
        <div v-else class="empty">暂无数据</div>
      </div>
-      <ElPagination
+      <div class="pagination">
-        v-model:current-page="currentPage"
+        <div class="total">
-        v-model:page-size="pageSize"
+          <span
-        :page-sizes="[100, 200, 300, 400, 500]"
+          >已选择
-        background
+            <span style="color: red">{{ selection.length || cardSelection.length }}</span> 条数据</span
-        layout="total, sizes, prev, pager, next, jumper"
+          >
-        :total="total"
+        </div>
-        style="margin: 10px auto 0; text-align: right"
+        <ElPagination
-        @size-change="handleSizeChange"
+          v-model:current-page="currentPage"
-        @current-change="handleCurrentChange"
+          v-model:page-size="pageSize"
-      ></ElPagination>
+          :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
@@ -1529,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>
@@ -1636,7 +1656,7 @@ import platformJson from '../../../json/platform.json'
 declare global {
  interface Window {
    ActiveXObject: {
-      new (type: string): XMLHttpRequest
+      new(type: string): XMLHttpRequest
    }
    VBS_BinaryToArray: {
      (data: unknown): { toArray(): number[] }
@@ -1663,6 +1683,7 @@ const currentRow = ref<AddressInfo>({
 })
 const updateAddVisible = ref(false)
+const initPageSize = ref(50)
 const logisticsVisible = ref(false)
 const logisticsFormRef = ref()
 const logistics = {
@@ -1813,7 +1834,7 @@ const tableColumns = computed(() => [
    label: '商品',
    prop: 'goods',
    slot: 'goods',
-    minWidth: 800,
+    minWidth: 920,
  },
  {
    label: '订单详情',
@@ -1831,7 +1852,7 @@ const tableColumns = computed(() => [
  {
    label: '时间',
    slot: 'time',
-    width: 300,
+    width: 180,
    prop: 'time',
    align: 'left',
  },
@@ -1962,6 +1983,7 @@ const {
  onCurrentPageChange: handleCurrentChange,
  onPageSizeChange: handleSizeChange,
 } = usePageList({
+  initPageSize: initPageSize.value,
  query: (page, pageSize) => {
    if (
      status.value !== 'IN_PRODUCTION' &&
@@ -2183,7 +2205,7 @@ const productionClientVisible = ref(false)
 //   productionClientVisible.value = true
 // }
-const downloadTif = async (type: string, dir: string) => {
+const downloadTif = async (type: string) => {
  if (!cardSelection.value.length) {
    return ElMessage.warning('请选择数据')
  }
@@ -2197,18 +2219,19 @@ const downloadTif = async (type: string, dir: string) => {
      cardSelection.value.map((el) => el.id),
      type,
    )
-    window.open(`https://ps.jomalls.com/${dir}/` + res.message, '_blank')
+    const url = type === 'tiff' ? `https://ps.jomalls.com/tiff/` + res.message : filePath + res.message
+    window.open(url, '_blank')
    if (type === 'tiff') {
-      tifDownloadLoading.value = true
+      tifDownloadLoading.value = false
    } else {
-      pngDownloadLoading.value = true
+      pngDownloadLoading.value = false
    }
  } catch (e) {
    console.log(e)
    if (type === 'tiff') {
-      tifDownloadLoading.value = true
+      tifDownloadLoading.value = false
    } else {
-      pngDownloadLoading.value = true
+      pngDownloadLoading.value = false
    }
  }
 }
@@ -2438,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()
@@ -3460,7 +3488,7 @@ const replenishmentSuccess = async () => {
 .goods-item {
  display: grid;
-  grid-template-columns: 100px 1fr minmax(180px, 1fr) 140px;
+  grid-template-columns: 100px 1fr minmax(180px, 1fr) 180px;
  gap: 20px;
  .goods-item-img {
@@ -3667,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 {