fix: pod ud add platform and productionClient search、time style update

components.d.ts

@@ -49,9 +49,10 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']

src/components/NavMenu.vue

@@ -10,6 +10,7 @@
         mode="horizontal"
         background-color="#001529"
         text-color="#fff"
+        style="border-bottom: none;"
         :default-active="defaultActive"
         router
       >

src/json/platform.json

+[
+  {
+    "name": "Shopify",
+    "lowercase": "shopify",
+    "type": "SHOPIFY",
+    "icon": "images/icon/logo-1.png",
+    "cycle": "today",
+    "route": "store_profits_shopify"
+  },
+  {
+    "name": "AliExpress",
+    "lowercase": "aliExpress",
+    "type": "AE",
+    "icon": "./images/icon/logo-3.png",
+    "cycle": "today",
+    "route": "store_profits_aliexpress"
+  },
+  {
+    "name": "Amazon",
+    "lowercase": "amazon",
+    "type": "AMAZON",
+    "icon": "./images/icon/logo-2.png",
+    "cycle": "yesterday",
+    "route": "store_profits_amazon"
+  },
+  {
+    "name": "Magento",
+    "lowercase": "magento",
+    "type": "MAGENTO",
+    "icon": "./images/icon/logo-6.png",
+    "cycle": "today",
+    "route": "store_profits_magento"
+  },
+
+  {
+    "name": "SHOPLINE",
+    "lowercase": "shopline",
+    "type": "SHOPLINE",
+    "cycle": "today",
+    "icon": "./images/icon/logo-4.png",
+    "route": "store_profits_shopline"
+  },
+  {
+    "name": "Shoplazza",
+    "lowercase": "shoplazza",
+    "type": "SHOPLAZZA",
+    "cycle": "today",
+    "icon": "./images/icon/logo-5.png",
+    "route": "store_profits_shoplazza"
+  },
+  {
+    "name": "temu",
+    "lowercase": "temu",
+    "type": "TEMU",
+    "cycle": "today",
+    "icon": "./images/icon/temu.png",
+    "route": "store_profits_temu"
+  },
+  {
+    "name": "eBay",
+    "lowercase": "ebay",
+    "type": "EBAY",
+    "cycle": "today",
+    "icon": "./images/icon/eBay.png",
+    "route": "store_profits_ebay"
+  },
+  {
+    "name": "Etsy",
+    "lowercase": "etsy",
+    "type": "ETSY",
+    "cycle": "today",
+    "icon": "./images/icon/etsy.png",
+    "route": "store_profits_etsy"
+  },
+  {
+    "name": "Alibaba",
+    "lowercase": "alibaba",
+    "type": "ALIBABA",
+    "cycle": "today",
+    "icon": "./images/icon/alibaba.png",
+    "route": "store_profits_alibaba"
+  },
+
+  {
+    "name": "walmart",
+    "lowercase": "walmart",
+    "type": "WALMART",
+    "cycle": "today",
+    "icon": "images/icon/walmart.png",
+    "route": "store_profits_walmart"
+  },
+  {
+    "name": "tiktokshop",
+    "lowercase": "tiktok",
+    "type": "TIKTOK",
+    "cycle": "today",
+    "icon": "images/icon/tiktokshop.png",
+    "route": "store_profits_tiktokshop"
+  },
+  {
+    "name": "Customize",
+    "lowercase": "customize",
+    "type": "CUSTOMIZE",
+    "cycle": "today",
+    "icon": "images/icon/customize.png",
+    "route": "store_profits_customize"
+  },
+  {
+    "name": "1688",
+    "type": "ALIBABA_DOMESTIC",
+    "cycle": "today",
+    "icon": "images/icon/1688.png",
+    "route": "store_profits_1688"
+  }
+]

src/types/api/podUsOrder.ts

@@ -17,6 +17,8 @@ export interface SearchForm {
   startTime: string | null
   endTime: string | null
   exceptionHandling: number | undefined
+  platform: string
+  productionClient:string
 }
 export interface PodUsOrderListData {
   id: number

src/views/order/podUs/index.vue

@@ -57,6 +57,46 @@
             <ElOption label="多面" value="multiple" />
           </ElSelect>
         </ElFormItem>
+        <ElFormItem label="平台">
+          <ElSelect
+            v-model="searchForm.platform"
+            value-key=""
+            placeholder="请选择"
+            clearable
+            filterable
+            popper-class="customize-select-style"
+            style="width: 130px"
+          >
+            <ElOption
+              v-for="(item, index) in platformJson"
+              :key="index"
+              :label="item.type"
+              :value="item.type"
+              style="width: 160px"
+            >
+              <img
+                :src="`../../../src/assets/${item.icon}`"
+                style="height: 20px; margin: 5px 10px 0 0"
+              />
+              <span :title="item.type">{{ item.type }}</span>
+            </ElOption>
+          </ElSelect>
+        </ElFormItem>
+        <ElFormItem label="生产端">
+          <ElSelect
+            v-model="searchForm.productionClient"
+            placeholder="生产端"
+            clearable
+            style="width: 130px"
+          >
+            <ElOption
+              v-for="(item, index) in productionClient"
+              :key="index"
+              :value="item.code || ''"
+              :label="`${item.remark}(${item.code})`"
+            ></ElOption>
+          </ElSelect>
+        </ElFormItem>
         <ElFormItem label="SKU">
           <ElInput
             v-model.trim="searchForm.sku"
@@ -652,7 +692,24 @@
             </div>
           </template>
           <template #time="{ row }">
-            <div class="order-time-box">
+            <el-timeline style="max-width: 600px">
+              <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">
               <div class="order-time-item">
                 <span class="order-time-item-label">创建时间：</span>
                 <span class="order-time-item-value">
@@ -665,19 +722,14 @@
                   {{ row.startStockingTime }}
                 </span>
               </div>
-              <!-- <div class="order-time-item">
-                <span class="order-time-item-label">支付时间：</span>
-                <span class="order-time-item-value">
-                  {{ row.paymentTime }}
-                </span>
-              </div> -->
+
               <div class="order-time-item">
                 <span class="order-time-item-label">完成时间：</span>
                 <span class="order-time-item-value">
                   {{ row.finishTime }}
                 </span>
               </div>
-            </div>
+            </div> -->
           </template>
           <template #innerLabel="{ row }">
             <div v-if="row.internalMemoList" class="inner-label-box">
@@ -1181,7 +1233,7 @@ import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
 import { showConfirm } from '@/utils/ui'
 import { DocumentCopy, EditPen } from '@element-plus/icons-vue'
-import { Column } from 'element-plus'
+import { Column, ElFormItem } from 'element-plus'
 import { computed, onMounted, ref, nextTick } from 'vue'
 import FastProduction from './FastProduction.vue'
 import { filePath } from '@/api/axios'
@@ -1192,6 +1244,7 @@ import dayjs from 'dayjs'
 import rightMenu from '../pod/rightMenu.vue'
 import ResultInfo from './components/ResultInfo.vue'
 import { isArray, isString } from '@/utils/validate'
+import platformJson from '../../../json/platform.json'
 declare global {
   interface Window {
     ActiveXObject: {
@@ -1230,6 +1283,8 @@ const [searchForm] = useValue<SearchForm>({
   startTime: null,
   endTime: null,
   exceptionHandling: undefined,
+  platform: '',
+  productionClient: '',
 })
 const exceptionStatus = ref(1)
 const userMarkList = ref<string[]>([])
@@ -1321,7 +1376,7 @@ const tableColumns = computed(() => [
     slot: 'price',
     width: 160,
     prop: 'price',
-    align: 'center',
+    align: 'left',
   },
   {
     label: '时间',
@@ -2646,3 +2701,12 @@ const handleExceptionCommand = (command: number) => {
   }
 }
 </style>
+<style>
+.customize-select-style {
+  .el-select-dropdown__list {
+    width: 500px;
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>