Merge branch 'dev'

src/types/api/podCnOrder.ts

@@ -44,6 +44,7 @@ export interface SearchForm {
   interceptStatus?: number | string
   sizeType?: number | null
   tagsId?: string
+  source?: string
   tagsIdArr?: (number | null)[]
 }
 export interface PodCnOrderListData {
@@ -222,9 +223,9 @@ export interface CraftListData {
   craftCode: string
 }
 export interface PackingData {
-  podProductionNo?: string;   // 生产单号（PSCD 开头）
-  jomallCustomNo?: string;    // 一件定制号（16 位数字 或 S- 开头）
-  jomallPsdCustomNo?: string; // 满印定制号（JMSC/GCSC 开头）
-  podJomallNo?: string;       // POD 平台号（JMPSC/GCPS 经过正则提取）
-  sku?: string;               // 普通 SKU（兜底）
-}
\ No newline at end of file
+  podProductionNo?: string // 生产单号（PSCD 开头）
+  jomallCustomNo?: string // 一件定制号（16 位数字 或 S- 开头）
+  jomallPsdCustomNo?: string // 满印定制号（JMSC/GCSC 开头）
+  podJomallNo?: string // POD 平台号（JMPSC/GCPS 经过正则提取）
+  sku?: string // 普通 SKU（兜底）
+}

src/views/order/podCN/index.vue

@@ -353,6 +353,22 @@
                   ></ElOption>
                 </ElSelect>
               </ElFormItem>
+              <ElFormItem label="订单来源">
+                <ElSelect
+                  v-model="searchForm.source"
+                  placeholder="请选择"
+                  clearable
+                  :teleported="false"
+                  style="width: 150px"
+                >
+                  <ElOption
+                    v-for="(item, index) in sourceList"
+                    :key="index"
+                    :value="item.id"
+                    :label="item.name"
+                  ></ElOption>
+                </ElSelect>
+              </ElFormItem>
             </ElForm>
             <template #reference>
               <el-button type="warning" @click="searchVisible = !searchVisible">
@@ -1327,6 +1343,19 @@
                 </el-icon>
               </div>
               <div class="order-detail-item">
+                <span class="order-detail-item-label">订单来源:</span>
+                <span class="order-detail-item-value">
+                  {{
+                    row.source
+                      ? {
+                          'jomall-erp': 'erp推送',
+                          'third-party': '第三方推送',
+                        }[row.source as 'jomall-erp' | 'third-party']
+                      : ''
+                  }}
+                </span>
+              </div>
+              <div class="order-detail-item">
                 <span class="order-detail-item-label">总克重:</span>
                 <span v-if="row.weight" class="order-detail-item-value">
                   {{ row.weight }}g
@@ -2620,6 +2649,17 @@ const exportForm = ref({
   resource: '',
 })
 
+const sourceList = [
+  {
+    name: 'erp推送',
+    id: 'jomall-erp',
+  },
+  {
+    name: '第三方推送',
+    id: 'third-party',
+  },
+]
+
 const exportData = () => {
   exportVisible.value = true
 }

src/views/order/podUs/index.vue

 <template>
   <div class="card flex-column h-100 overflow-hidden">
     <div class="header-filter-form">
-      <ElForm class="search-form" label-position="right" label-width="70px" :model="searchForm" size="default" inline>
+      <ElForm
+        class="search-form"
+        label-position="right"
+        label-width="70px"
+        :model="searchForm"
+        size="default"
+        inline
+      >
         <!-- <div> -->
         <ElFormItem label="仓库">
           <ElSelect
@@ -338,7 +345,7 @@
                   style="width: 150px"
                 >
                   <ElOption
-                    v-for="(item, index) in sourceList "
+                    v-for="(item, index) in sourceList"
                     :key="index"
                     :value="item.id"
                     :label="item.name"
@@ -1508,9 +1515,10 @@
                 <span class="order-detail-item-value">
                   {{
                     row.source
-                      ? { 'jomall-erp': 'erp', 'third-party': '第三方推送' }[
-                          row.source as 'jomall-erp' | 'third-party'
-                        ]
+                      ? {
+                          'jomall-erp': 'erp推送',
+                          'third-party': '第三方推送',
+                        }[row.source as 'jomall-erp' | 'third-party']
                       : ''
                   }}
                 </span>
@@ -2899,7 +2907,8 @@ import {
   changeToFinished,
   updateTrackingNumberAndRegister,
   countTrackRegisterApi,
-  getCustomTagListApi, getLogisticsWayApi,
+  getCustomTagListApi,
+  getLogisticsWayApi,
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 
@@ -2971,18 +2980,18 @@ declare global {
 }
 const sourceList = [
   {
-    name:'erp推送',
-    id:'jomall-erp'
+    name: 'erp推送',
+    id: 'jomall-erp',
   },
   {
-    name:'第三方推送',
-    id:'third-party'
-  }
+    name: '第三方推送',
+    id: 'third-party',
+  },
 ]
 const tabsNav = ref<Tab[]>()
 const isAuto = ref(true)
 const countryList = ref([])
-const logisticsWayList = ref<{name:string,id:number}[]>([])
+const logisticsWayList = ref<{ name: string; id: number }[]>([])
 const currentRow = ref<AddressInfo>({
   receiverName: '',
   receiverPhone: '',
@@ -6169,8 +6178,8 @@ const getTagName = (row: ProductList) => {
     : ''
 }
 
-const getLogisticsWay = async ()=>{
-  const {data} = await getLogisticsWayApi()
+const getLogisticsWay = async () => {
+  const { data } = await getLogisticsWayApi()
   logisticsWayList.value = data
 }
 
@@ -6525,15 +6534,14 @@ useRouter().beforeEach((to, from, next) => {
   color: white;
   font-weight: bold;
 }
-.search-form{
-  ::v-deep .el-radio-button{
+.search-form {
+  ::v-deep .el-radio-button {
     width: 75px;
-    .el-radio-button__inner{
+    .el-radio-button__inner {
       width: 100%;
     }
   }
 }
-
 </style>
 <style lang="scss">
 .customize-select-style {