Merge branch 'dev' into 'master'

Dev

See merge request !7

src/api/podUsOrder.ts

+import { BasePaginationData, BaseRespData } from '@/types/api'
+import {
+  ProductList,
+  PodUsOrderListData,
+  SearchForm,
+  Tab,
+  LogListData,
+} from '@/types/api/podUsOrder'
+import axios from './axios'
+
+export function getOrderTabData() {
+  return axios.get<never, BaseRespData<Tab[]>>(
+    '/factory/podJomallOrderUs/findStateGroupList',
+  )
+}
+export function getOrderList(
+  params: SearchForm,
+  currentPage: number,
+  pageSize: number,
+) {
+  return axios.post<never, BasePaginationData<PodUsOrderListData[]>>(
+    '/factory/podJomallOrderUs/list_page',
+    {
+      ...params,
+      currentPage,
+      pageSize,
+    },
+  )
+}
+export function getCardOrderList(
+  params: SearchForm,
+  currentPage: number,
+  pageSize: number,
+) {
+  return axios.post<never, BasePaginationData<ProductList[]>>(
+    '/factory/podJomallOrderProductUs/list_page',
+    {
+      ...params,
+      currentPage,
+      pageSize,
+    },
+  )
+}
+export function confirmOrderApi(data: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/confirmOrders',
+    data,
+  )
+}
+export function updateExceptionOrderApi(data: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/updateExceptionOrders',
+    {
+      orderIds: data,
+    },
+  )
+}
+export function changeExceptionOrderApi(ids: number[], value: string) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/exceptionOrders',
+    {
+      orderIds: ids,
+      exceptionReason: value,
+    },
+  )
+}
+export function cancelOrderApi(ids: number[], value: string) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/cancelOrders',
+    {
+      orderIds: ids,
+      cancelReason: value,
+    },
+  )
+}
+export function getOperationLogApi(id: number) {
+  return axios.get<never, BaseRespData<LogListData[]>>(
+    `factory/podJomallOrderUsLog/getPodJomallOrderUsLog?id=${id}`,
+  )
+}
+export function getSubOrderBySubOrderNumber(factorySubOrderNumber: string) {
+  return axios.get<never, BaseRespData<ProductList>>(
+    'factory/podJomallOrderProductUs/getProductUsByFactorySubOrderNumber',
+    {
+      params: {
+        factorySubOrderNumber,
+      },
+    },
+  )
+}
+export function downloadMaterialApi(id: Array<number>) {
+  return axios.post<never, BaseRespData<Array<string>>>(
+    'factory/podJomallOrderProductUs/downloadDesignImages',
+    id,
+  )
+}
+export function productionQueryApi(id: number, podJomallOrderUsId: number) {
+  return axios.post<never, BasePaginationData<never>>(
+    'factory/podJomallOrderProductUs/completeDelivery',
+    {
+      id,
+      podJomallOrderUsId,
+    },
+  )
+}

src/components/TableView.vue

@@ -13,6 +13,7 @@
         v-if="selectionable"
         v-if="selectionable"
         type="selection"
         type="selection"
         width="50"
         width="50"
+        fixed="left"
         header-align="center"
         header-align="center"
         align="center"
         align="center"
       ></ElTableColumn>
       ></ElTableColumn>
@@ -20,7 +21,8 @@
         v-if="serialNumberable"
         v-if="serialNumberable"
         label="序号"
         label="序号"
         type="index"
         type="index"
-        width="50"
+        width="60"
+        fixed="left"
         header-align="center"
         header-align="center"
         align="center"
         align="center"
       ></ElTableColumn>
       ></ElTableColumn>

src/router/index.ts

@@ -19,6 +19,7 @@ import AccountStatementNote from '@/views/AccountStatementNote.vue'
 import TypeseetingManagement from '@/views/typesetting/TypesettingManagement.vue'
 import TypeseetingManagement from '@/views/typesetting/TypesettingManagement.vue'
 import PodOrderList from '@/views/order/pod/index.vue'
 import PodOrderList from '@/views/order/pod/index.vue'
 import PodDeliveryNoteList from '@/views/order/pod/deliveryOrderList.vue'
 import PodDeliveryNoteList from '@/views/order/pod/deliveryOrderList.vue'
+import PodUsOrderList from '@/views/order/podUs/index.vue'
 
 
 const router = createRouter({
 const router = createRouter({
   history: createWebHistory(),
   history: createWebHistory(),
@@ -50,6 +51,13 @@ const router = createRouter({
           component: PodOrderList,
           component: PodOrderList,
         },
         },
         {
         {
+          path: '/pod-us-order/list',
+          meta: {
+            title: 'POD订单(US)',
+          },
+          component: PodUsOrderList,
+        },
+        {
           path: '/pod-delivery-note/list',
           path: '/pod-delivery-note/list',
           meta: {
           meta: {
             title: 'POD发货单',
             title: 'POD发货单',

src/router/menu.ts

@@ -26,6 +26,11 @@ const menu: MenuItem[] = [
         id: 7,
         id: 7,
         label: 'POD订单',
         label: 'POD订单',
       },
       },
+      {
+        index: '/pod-us-order/list',
+        id: 8,
+        label: 'POD订单(US)',
+      },
     ],
     ],
   },
   },
 
 

src/styles/common.scss

@@ -114,3 +114,6 @@ img {
 .mt-10 {
 .mt-10 {
   margin-top: 10px;
   margin-top: 10px;
 }
 }
+.mb-10 {
+  margin-bottom: 10px;
+}

src/types/api/podUsOrder.ts

+export interface Tab {
+  status?: string
+  statusName?: string
+  quantity?: number
+}
+export interface SearchForm {
+  timeType: number | null
+  shopNumber: string
+  userMark: string
+  logisticsTracking: string
+  baseSku: string
+  factoryOrderNumber: string
+  sku: string
+  factorySubOrderNumber: string
+  status: string
+}
+export interface PodUsOrderListData {
+  id: number
+  thirdOrderNumber?: string
+  factoryOrderNumber?: string
+  shopNumber?: string
+  factoryOnlineId?: number | null
+  factoryNo?: number | null
+  factoryCode?: string | null
+  status?: string
+  weight?: number | null
+  totalProductAmount?: number | null
+  productAmount?: number
+  carriageAmount?: number | null
+  totalAmount?: number | null
+  productNum?: number | null
+  trackStatus?: string | null
+  receiverName?: string
+  receiverPhone?: string
+  receiverCountry?: string
+  receiverProvince?: string
+  receiverCity?: string
+  receiverDistrict?: string
+  receiverAddress1?: string
+  receiverAddress2?: string
+  receiverPostCode?: string
+  paymentType?: string
+  paymentTime?: string
+  startStockingTime?: string
+  finishTime?: string
+  shipmentType?: string
+  expressSheet?: string
+  trackingNumber?: string
+  processNumber?: string
+  createTime?: string
+  updateTime?: string
+  remark?: string | null
+  userMark?: string
+  version?: number
+  productList?: ProductList[]
+  orderNumber?: string
+}
+export interface ProductList {
+  id: number
+  podJomallOrderUsId: number
+  thirdSubOrderNumber?: string
+  factorySubOrderNumber?: string
+  factoryCode?: string
+  productName?: string
+  baseSku?: string
+  variantSku?: string
+  productPrice?: number
+  templatePrice?: number
+  variantImage?: string
+  craftPrice?: number
+  imageAry?: string
+  designImages?: string
+  categoryId?: number
+  categoryName?: string
+  num?: number
+  passNum?: number
+  notPassNum?: number
+  payAmount?: number
+  weight?: number | null
+  diyId?: string
+  endProductId?: string
+  customizedQuantity?: number
+  tagIds?: string
+  isProduction?: boolean
+  createTime?: string
+  updateTime?: string
+  remark?: string | null
+  version?: number
+  subOrderNumber?: string
+}
+export interface cardImages {
+  title: string
+  url: string
+  sort: number
+  id?: number
+}
+export interface LogListData {
+  id: number
+  bizId: number
+  userId: number
+  employeeName: string
+  description: string
+  deleteContent: string
+  createTime: string
+}
+export interface PodOrderRes extends ProductList {
+  expectDeliveryTime?: string | null
+  thirdOrderNumber?: string | null
+  startStockingTime?: string | null
+  factoryOrderNumber?: string | null
+  userMark?: string | null
+  craftName?: string | null
+  craftId?: string | null
+  shopNumber?: string | null
+  color?: string | null
+  size?: string | null
+  note?: Array<{ prop: string | number; value: string | number }>
+  imgList: cardImages[]
+}

src/utils/hooks/usePageList.ts

@@ -57,7 +57,11 @@ export default function usePageList<T>(options: UsePageListOptions<T>) {
     loadData()
     loadData()
   }
   }
 
 
-  const refresh = () => {
+  const refresh = (reset?: boolean) => {
+    if (reset) {
+      data.value = []
+      total.value = 0
+    }
     currentPage.value = 1
     currentPage.value = 1
     loadData()
     loadData()
   }
   }

src/views/order/fastProduction.vue → src/views/order/pod/fastProduction.vue

@@ -466,7 +466,7 @@ const changeStatus = async () => {
     cancelButtonText: '取消',
     cancelButtonText: '取消',
     type: 'warning',
     type: 'warning',
   }).then(() => {
   }).then(() => {
-    setData(TrackingNumber.value)
+    setData(detail.value.factorySubOrderNumber || '')
   })
   })
 }
 }
 const setData = async (orderNumber: string) => {
 const setData = async (orderNumber: string) => {

src/views/order/pod/index.vue

@@ -1084,7 +1084,7 @@ import {
   OrderData,
   OrderData,
   ShipmentForm,
   ShipmentForm,
 } from '@/types/api/order'
 } from '@/types/api/order'
-import fastProduction from '../fastProduction.vue'
+import fastProduction from './fastProduction.vue'
 // import CardWrapper from '@/components/CardPods.vue'
 // import CardWrapper from '@/components/CardPods.vue'
 import { useValue } from '@/utils/hooks/useValue'
 import { useValue } from '@/utils/hooks/useValue'
 import {
 import {