feat：【工厂端】【订单】POD(US)订单跟踪中新增普品筛选；POD(CN)订单跟踪中新增两个类型栏筛选；修改“类型”字段#1001774

82aa2669 · linjinhong · 017d5a98 · 82aa2669 · 82aa2669 · 82aa2669
Commit 82aa2669 authored Dec 15, 2025 by linjinhong
Hide whitespace changes
Inline Side-by-side

Showing with 92 additions and 60 deletions

src/views/order/orderTracking/index.vue
+2 -9

src/views/order/orderTracking/indexcn.vue
+76 -39

src/views/order/podCN/index.vue
+13 -11

src/views/order/podUs/index.vue
+1 -1

No files found.
--- a/src/views/order/orderTracking/index.vue
+++ b/src/views/order/orderTracking/index.vue
@@ -878,10 +878,11 @@ onMounted(() => {
            </ElSelect>
          </ElFormItem>
-          <ElFormItem label="类型">
+          <ElFormItem label="印刷">
            <el-radio-group v-model="searchForm.customizedQuantity">
              <el-radio-button value="single">单面</el-radio-button>
              <el-radio-button value="multiple">多面</el-radio-button>
+              <el-radio-button value="normal">普品</el-radio-button>
            </el-radio-group>
          </ElFormItem>
          <ElFormItem label="数量">
@@ -1283,12 +1284,4 @@ onMounted(() => {
    }
  }
 }
-.search-form {
-  ::v-deep .el-radio-button {
-    width: 75px;
-    .el-radio-button__inner {
-      width: 100%;
-    }
-  }
-}
 </style>
--- a/src/views/order/orderTracking/indexcn.vue
+++ b/src/views/order/orderTracking/indexcn.vue
@@ -102,7 +102,8 @@ const tableColumns = computed(() => {
      prop: 'replaceShipment',
      width: 120,
      align: 'center',
-    },{
+    },
+    {
      label: '物流类型',
      slot: 'shipmentType',
      prop: 'shipmentType',
@@ -297,6 +298,24 @@ const goodsColumns = computed(() => {
    },
  ]
 })
+const productMarkList = [
+  {
+    label: '普通商品',
+    value: 'normal',
+  },
+  {
+    label: 'pod商品',
+    value: 'pod',
+  },
+  {
+    label: '一件定制局部印',
+    value: 'custom_part',
+  },
+  {
+    label: '一件定制满印',
+    value: 'custom_full',
+  },
+]
 const tableData = ref<PodCnOrderListData[]>([])
 const goodsData = ref<ProductList[]>([])
 const searchVisible = ref(false)
@@ -377,7 +396,7 @@ const search = () => {
  goodsData.value = []
  logList.value = []
  getOrderListFn()
-  if(tabValue.value==='2'){
+  if (tabValue.value === '2') {
    zoneType.value = 'Asia/Shanghai'
    operationLog()
  }
@@ -442,10 +461,10 @@ const submitExportForm = async () => {
      ...params,
      ...(resourceType === 2
        ? {
-          ...searchForm.value,
+            ...searchForm.value,
-          startTime: timeRange.value?.[0] || null,
+            startTime: timeRange.value?.[0] || null,
-          endTime: timeRange.value?.[1] || null,
+            endTime: timeRange.value?.[1] || null,
-        }
+          }
        : {}),
    })
    ElMessage.success('请求成功，请稍后到右上角[我的下载]中查看')
@@ -652,7 +671,7 @@ const refreshAddress = async () => {
    ElMessage.success('操作成功')
    search()
    await loadTabData()
-    if(tabValue.value==='2'){
+    if (tabValue.value === '2') {
      zoneType.value = 'Asia/Shanghai'
      await operationLog()
    }
@@ -663,7 +682,6 @@ const refreshAddress = async () => {
  }
 }
 /**
 * @description: 获取打印面单
 */
@@ -900,12 +918,13 @@ onMounted(() => {
            </ElSelect>
          </ElFormItem>
-          <!-- <ElFormItem label="类型">
+          <ElFormItem label="印刷">
            <el-radio-group v-model="searchForm.customizedQuantity">
              <el-radio-button value="single">单面</el-radio-button>
              <el-radio-button value="multiple">多面</el-radio-button>
+              <el-radio-button value="normal">普品</el-radio-button>
            </el-radio-group>
-          </ElFormItem> -->
+          </ElFormItem>
          <ElFormItem label="数量">
            <el-radio-group v-model="searchForm.multi">
              <el-radio-button :value="false">单件</el-radio-button>
@@ -1042,7 +1061,32 @@ onMounted(() => {
                    ></ElOption>
                  </ElSelect>
                </ElFormItem>
-                <ElFormItem v-if="searchForm.replaceShipment || searchForm.replaceShipment===0" label="物流类型">
+                <ElFormItem label="商品类型">
+                  <ElSelect
+                    v-model="searchForm.productMark"
+                    placeholder="请选择商品类型"
+                    clearable
+                    filterable
+                    collapse-tags
+                    collapse-tags-tooltip
+                    :teleported="false"
+                    style="width: 150px"
+                  >
+                    <ElOption
+                      v-for="(item, index) in productMarkList"
+                      :key="index"
+                      :value="item.value"
+                      :label="item.label"
+                    ></ElOption>
+                  </ElSelect>
+                </ElFormItem>
+                <ElFormItem
+                  v-if="
+                    searchForm.replaceShipment ||
+                    searchForm.replaceShipment === 0
+                  "
+                  label="物流类型"
+                >
                  <ElSelect
                    v-model="searchForm.shipmentType"
                    placeholder="物流类型"
@@ -1050,7 +1094,9 @@ onMounted(() => {
                    style="width: 150px"
                  >
                    <ElOption
-                      v-for="(item, index) in searchForm.replaceShipment === 0? ['自提', '快递']:['自有物流', '工厂物流']"
+                      v-for="(item, index) in searchForm.replaceShipment === 0
+                        ? ['自提', '快递']
+                        : ['自有物流', '工厂物流']"
                      :key="index"
                      :value="index"
                      :label="item"
@@ -1084,7 +1130,7 @@ onMounted(() => {
          <ElFormItem>
            <span>
              <ElButton link @click="resetSearchForm" style="font-size: 12px"
-              ><span title="重置查询条件">重置</span></ElButton
+                ><span title="重置查询条件">重置</span></ElButton
              >
            </span>
          </ElFormItem>
@@ -1098,14 +1144,14 @@ onMounted(() => {
          <ElFormItem>
            <span>
              <ElButton type="primary" @click="getOrderByIdApi('getPrintOrder')"
-              >获取打印面单</ElButton
+                >获取打印面单</ElButton
              >
            </span>
          </ElFormItem>
          <ElFormItem>
            <span>
              <ElButton type="success" @click="refreshAddress"
-              >刷新地址</ElButton
+                >刷新地址</ElButton
              >
            </span>
          </ElFormItem>
@@ -1136,10 +1182,14 @@ onMounted(() => {
                    <div>{{ getStatus(row.status) }}</div>
                  </template>
                  <template #shipmentType="{ row }">
-                    {{ (row.replaceShipment === 0 ? ['自提', '快递'] : ['自有物流', '工厂物流'])[row.shipmentType] }}
+                    {{
+                      (row.replaceShipment === 0
+                        ? ['自提', '快递']
+                        : ['自有物流', '工厂物流'])[row.shipmentType]
+                    }}
                  </template>
                  <template #replaceShipment="{ row }">
-                    {{['不代发', '代发'][row.replaceShipment] }}
+                    {{ ['不代发', '代发'][row.replaceShipment] }}
                  </template>
                </TableView>
              </div>
@@ -1163,7 +1213,7 @@ onMounted(() => {
    <template #other>
      <div class="bottom-table">
        <el-tabs v-model="tabValue">
-          <el-tab-pane  name="1" label="商品明细">
+          <el-tab-pane name="1" label="商品明细">
            <TableView
              ref="goodsRef"
              v-loading="goodsLoading"
@@ -1176,7 +1226,7 @@ onMounted(() => {
              </template>
            </TableView>
          </el-tab-pane>
-          <el-tab-pane  name="2" label="操作日志" @tab-click="operationLog">
+          <el-tab-pane name="2" label="操作日志" @tab-click="operationLog">
            <div>
              <el-button
                :type="zoneType === 'Asia/Shanghai' ? 'primary' : ''"
@@ -1184,27 +1234,24 @@ onMounted(() => {
                link
                style="margin-left: 10px"
                @click="changeChinaTime('Asia/Shanghai')"
-              >北京时间
+                >北京时间
-              </el-button
+              </el-button>
-              >
              <el-button
                :type="zoneType === 'America/New_York' ? 'primary' : ''"
                size="small"
                link
                style="margin-left: 10px"
                @click="changeChinaTime('America/New_York')"
-              >新泽西时间
+                >新泽西时间
-              </el-button
+              </el-button>
-              >
              <el-button
                :type="zoneType === 'America/Los_Angeles' ? 'primary' : ''"
                size="small"
                link
                style="margin-left: 10px"
                @click="changeChinaTime('America/Los_Angeles')"
-              >洛杉矶时间
+                >洛杉矶时间
-              </el-button
+              </el-button>
-              >
            </div>
            <LogList
@@ -1239,7 +1286,7 @@ onMounted(() => {
          :loading="exportLoading"
          type="primary"
          @click="submitExportForm"
-        >确认</el-button
+          >确认</el-button
        >
      </span>
    </template>
@@ -1334,14 +1381,4 @@ onMounted(() => {
    }
  }
 }
-.search-form {
-  ::v-deep .el-radio-button {
-    width: 75px;
-    .el-radio-button__inner {
-      width: 100%;
-    }
-  }
-}
 </style>
--- a/src/views/order/podCN/index.vue
+++ b/src/views/order/podCN/index.vue
@@ -229,13 +229,14 @@
            <el-option value="desc" label="倒序"></el-option>
          </el-select>
        </ElFormItem>
-        <ElFormItem label="类型" v-if="status !== 'BATCH_DOWNLOAD'">
+        <ElFormItem label="印刷" v-if="status !== 'BATCH_DOWNLOAD'">
          <el-radio-group
            v-model="searchForm.customizedQuantity"
            @click.stop="(e: Event) => handleRadioGroupClick(e)"
          >
-            <el-radio-button value="single">单面</el-radio-button>
+            <el-radio-button label="single">单面</el-radio-button>
-            <el-radio-button value="multiple">多面</el-radio-button>
+            <el-radio-button label="multiple">多面</el-radio-button>
+            <el-radio-button label="normal">普品</el-radio-button>
          </el-radio-group>
        </ElFormItem>
        <ElFormItem label="数量" v-if="status !== 'BATCH_DOWNLOAD'">
@@ -372,6 +373,7 @@
                  ></ElOption>
                </ElSelect>
              </ElFormItem>
              <ElFormItem
                v-if="searchForm.replaceShipment === 0"
                label="物流类型"
@@ -6166,14 +6168,14 @@ useEnterKeyTrigger({
  color: white;
  font-weight: bold;
 }
-.search-form {
+// .search-form {
-  ::v-deep .el-radio-button {
+//   ::v-deep .el-radio-button {
-    width: 75px;
+//     width: 75px;
-    .el-radio-button__inner {
+//     .el-radio-button__inner {
-      width: 100%;
+//       width: 100%;
-    }
+//     }
-  }
+//   }
-}
+// }
 .triangle-container-wrap {
  position: absolute;
  top: 0;

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
@@ -219,7 +219,7 @@
          </ElSelect>
        </ElFormItem>
        <!-- </div> -->
-        <ElFormItem label="类型" v-if="status !== 'BATCH_DOWNLOAD'">
+        <ElFormItem label="印刷" v-if="status !== 'BATCH_DOWNLOAD'">
          <el-radio-group
            v-model="searchForm.customizedQuantity"
            @click.stop="(e: Event) => handleRadioGroupClick(e)"