podcn

src/api/podUsOrder.ts

@@ -367,15 +367,6 @@ export function composingDesignImages(data: number[], type: string) {
     data,
     data,
   )
   )
 }
 }
-// 转至待拣胚
-export function updateLogisticsToPickingApi(params: { ids: string }) {
-  return axios.get<never, BaseRespData<never>>(
-    `factory/podJomallOrderUs/updateLogisticsToPicking`,
-    {
-      params,
-    },
-  )
-}
 // 转至待排单
 // 转至待排单
 export function updateLogisticsToArrangeApi(params: { ids: string }) {
 export function updateLogisticsToArrangeApi(params: { ids: string }) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
@@ -453,7 +444,7 @@ export function getListCraftApi() {
 // 批量下载 列表
 // 批量下载 列表
 export function batchDownloadApi(currentPage: number, pageSize: number) {
 export function batchDownloadApi(currentPage: number, pageSize: number) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
-    `factory/podUsBatchDownload/list_page`,
+    `factory/podBatchDownload/us/list_page`,
     {
     {
       currentPage,
       currentPage,
       pageSize,
       pageSize,
@@ -464,7 +455,7 @@ export function batchDownloadApi(currentPage: number, pageSize: number) {
 // 批量下载 下载
 // 批量下载 下载
 export function batchDownloadDownloadApi(params: { id: number; type: string }) {
 export function batchDownloadDownloadApi(params: { id: number; type: string }) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
-    `factory/podUsBatchDownload/download`,
+    `factory/podBatchDownload/download`,
     {
     {
       params,
       params,
     },
     },
@@ -474,7 +465,7 @@ export function batchDownloadDownloadApi(params: { id: number; type: string }) {
 // 批量下载 删除
 // 批量下载 删除
 export function batchDownloadDeleteApi(params: { id: number }) {
 export function batchDownloadDeleteApi(params: { id: number }) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
-    `factory/podUsBatchDownload/delete`,
+    `factory/podBatchDownload/delete`,
     {
     {
       params,
       params,
     },
     },
@@ -484,7 +475,7 @@ export function batchDownloadDeleteApi(params: { id: number }) {
 // 批量下载 重新排版
 // 批量下载 重新排版
 export function batchDownloadRecomposingApi(params: { id: number }) {
 export function batchDownloadRecomposingApi(params: { id: number }) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
-    `factory/podUsBatchDownload/reComposingDesignImages`,
+    `factory/podBatchDownload/reComposingDesignImages`,
     {
     {
       params,
       params,
     },
     },

src/types/api/podCnOrder.ts

+export interface Tab {
+  status?: string
+  statusName?: string
+  quantity?: number
+}
+export interface ExportParams extends SearchForm {
+  idList?: number[]
+  exportAll: boolean
+}
+export interface SearchForm {
+  timeType?: number | null
+  shopNumber?: string
+  shipmentType?: string
+  userMark?: string
+  processNumber?: string
+  trackingNumber?: string
+  baseSku?: string
+  factoryOrderNumber?: string
+  sku?: string
+  factorySubOrderNumber?: string
+  status?: string
+  customizedQuantity?: string
+  multi?: boolean | null
+  startTime?: string | null
+  endTime?: string | null
+  shipmentArea?: number | undefined
+  platform?: string
+  productionClient?: string
+  warehouseId?: string | number
+  thirdSkuCode?: string
+  supplierProductNo?: string
+  batchArrangeNumber?: string
+  craftCode?: string
+  thirdStockSku?: string
+}
+export interface PodCnOrderListData {
+  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?: number
+  expressSheet?: string
+  trackingNumber?: string
+  processNumber?: string
+  createTime?: string
+  updateTime?: string
+  remark?: string | null
+  userMark?: string
+  version?: number
+  productList?: ProductList[]
+  orderNumber?: string
+  logisticsWayId?: number | null
+  logisticsWayName?: string
+  url?: string | null
+  tiffUrl?: string | null
+}
+export interface ProductList {
+  id: number
+  podJomallOrderCnId: number
+  thirdSubOrderNumber?: string
+  thirdStockSku?: string
+  factorySubOrderNumber?: string
+  factoryCode?: string
+  productName?: string
+  baseSku?: string
+  variantSku?: string
+  productPrice?: number
+  templatePrice?: number
+  variantImage?: string
+  craftPrice?: number
+  craftCode?: string
+  platform?: string
+  imageAry?: string
+  designImages?: string
+  categoryId?: number
+  categoryName?: string
+  num?: number
+  passNum?: number
+  notPassNum?: number
+  payAmount?: number
+  status?: 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
+  craftName?: string | null
+  lanshouAddress?: string | null
+  shopNumber?: string | null
+  factoryOrderNumber?: string | null
+  replenishmentNum?: number | null
+  isReplenishment?: boolean
+  thirdSkuCode?: string | null
+  supplierProductNo?: string | null
+  replenishmentSumNum?: number | null
+  batchArrangeNumber?: string | null
+}
+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 ProductionClient {
+  code?: string
+  remark?: 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[]
+}
+export interface WarehouseListData {
+  code?: string
+  defaulted?: number
+  factoryCode?: string
+  factoryId?: number
+  id: number
+  name?: string
+  remarks?: string
+  sort?: number
+}
+export interface LogisticsData {
+  logisticsWayName: string // 物流名称
+  warehouseName: string // 发货仓库
+  status: boolean
+  logisticsWayCode: string // 物流编码
+  partition: string // 所在分区
+  logisticsWayId?: number | null
+}
+export interface AddressInfo {
+  id?: string
+  receiverName: string
+  receiverPhone: string
+  receiverCountry: string
+  receiverProvince: string
+  receiverCity: string
+  receiverDistrict: string
+  receiverAddress1: string
+  receiverAddress2: string
+  receiverPostCode: string
+}
+export interface LogisticsFormData {
+  processNumber: string
+  trackingNumber: string
+  expressSheetUrl: string
+  expressSheet: File | null
+}
+export interface CraftListData {
+  craftName: string
+  craftCode: string
+}

src/views/order/podCN/FastProduction.vue

@@ -197,8 +197,8 @@ import {
   productionQueryApi,
   productionQueryApi,
   getSubOrderBySubOrderNumber,
   getSubOrderBySubOrderNumber,
   downloadMaterialApi,
   downloadMaterialApi,
-} from '@/api/podUsOrder'
-import { cardImages, PodOrderRes } from '@/types/api/podUsOrder'
+} from '@/api/podCnOrder'
+import { cardImages, PodOrderRes } from '@/types/api/podCnOrder'
 import { showConfirm } from '@/utils/ui'
 import { showConfirm } from '@/utils/ui'
 import { filePath } from '@/api/axios'
 import { filePath } from '@/api/axios'
 import { ref, watch, defineProps, defineEmits } from 'vue'
 import { ref, watch, defineProps, defineEmits } from 'vue'
@@ -214,7 +214,7 @@ const isDownloadImage = ref(false)
 const isAutoSure = ref(false)
 const isAutoSure = ref(false)
 const detail = ref<PodOrderRes>({
 const detail = ref<PodOrderRes>({
   id: -1,
   id: -1,
-  podJomallOrderUsId: -1,
+  podJomallOrderCnId: -1,
   imgList: [] as cardImages[],
   imgList: [] as cardImages[],
 })
 })
 const dialogVisible = ref(false)
 const dialogVisible = ref(false)
@@ -260,9 +260,9 @@ watch(
   () => props.detailVisible,
   () => props.detailVisible,
   (newVal: boolean) => {
   (newVal: boolean) => {
     dialogVisible.value = newVal
     dialogVisible.value = newVal
-    detail.value = { id: -1, podJomallOrderUsId: -1, imgList: [] }
+    detail.value = { id: -1, podJomallOrderCnId: -1, imgList: [] }
     if (newVal) {
     if (newVal) {
-      const history = localStorage.getItem('historyUsData')
+      const history = localStorage.getItem('historyCnData')
       historyData.value = history ? JSON.parse(history) : []
       historyData.value = history ? JSON.parse(history) : []
 
 
       const len = historyData.value
       const len = historyData.value
@@ -285,7 +285,7 @@ watch(
   (newVal) => {
   (newVal) => {
     detail.value = {
     detail.value = {
       id: -1,
       id: -1,
-      podJomallOrderUsId: -1,
+      podJomallOrderCnId: -1,
       imgList: [],
       imgList: [],
     }
     }
     if (newVal && Object.keys(newVal).length > 0) {
     if (newVal && Object.keys(newVal).length > 0) {
@@ -327,7 +327,7 @@ const confirmQuery = (len: HistoryDataItem[], i: number) => {
       )
       )
       if (index >= 0) {
       if (index >= 0) {
         historyData.value.splice(index, 1)
         historyData.value.splice(index, 1)
-        localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
+        localStorage.setItem('historyCnData', JSON.stringify(historyData.value))
       }
       }
       if (len[i + 1]) {
       if (len[i + 1]) {
         confirmQuery(len, i + 1)
         confirmQuery(len, i + 1)
@@ -352,8 +352,8 @@ const setData = async (orderNumber: string) => {
   if (!detail.value || detail.value?.id === -1) return
   if (!detail.value || detail.value?.id === -1) return
   try {
   try {
     const id = detail.value.id
     const id = detail.value.id
-    const podJomallOrderUsId = detail.value.podJomallOrderUsId
-    await productionQueryApi(id, podJomallOrderUsId)
+    const podJomallOrderCnId = detail.value.podJomallOrderCnId
+    await productionQueryApi(id, podJomallOrderCnId)
 
 
     if (orderNumber) {
     if (orderNumber) {
       const index = historyData.value.findIndex(
       const index = historyData.value.findIndex(
@@ -362,14 +362,14 @@ const setData = async (orderNumber: string) => {
       if (index >= 0) {
       if (index >= 0) {
         // 扫单完成删除
         // 扫单完成删除
         historyData.value.splice(index, 1)
         historyData.value.splice(index, 1)
-        localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
+        localStorage.setItem('historCnData', JSON.stringify(historyData.value))
       }
       }
     }
     }
     emit('onSuccess')
     emit('onSuccess')
     playAudio('weight_success')
     playAudio('weight_success')
     detail.value = {
     detail.value = {
       id: -1,
       id: -1,
-      podJomallOrderUsId: -1,
+      podJomallOrderCnId: -1,
       imgList: [] as cardImages[],
       imgList: [] as cardImages[],
     }
     }
     TrackingNumber.value = ''
     TrackingNumber.value = ''
@@ -379,7 +379,7 @@ const setData = async (orderNumber: string) => {
     console.error(e)
     console.error(e)
     detail.value = {
     detail.value = {
       id: -1,
       id: -1,
-      podJomallOrderUsId: -1,
+      podJomallOrderCnId: -1,
       imgList: [] as cardImages[],
       imgList: [] as cardImages[],
     }
     }
     trackingNumberRef.value && trackingNumberRef.value.focus()
     trackingNumberRef.value && trackingNumberRef.value.focus()
@@ -462,7 +462,7 @@ const trackCodeInput = async () => {
       orderNumber: TrackingNumber.value,
       orderNumber: TrackingNumber.value,
       finished: false,
       finished: false,
     })
     })
-    localStorage.setItem('historyUsData', JSON.stringify(historyData.value))
+    localStorage.setItem('historyCnData', JSON.stringify(historyData.value))
   }
   }
 
 
   const orderNumber = TrackingNumber.value
   const orderNumber = TrackingNumber.value

vite.config.ts

@@ -22,4 +22,18 @@ export default defineConfig({
   resolve: {
   resolve: {
     alias: { '@': '/src' },
     alias: { '@': '/src' },
   },
   },
+  server: {
+    port: 9803,
+    host: true,
+    proxy: {
+      '/api': {
+        target: 'http://10.168.31.130:8060',
+      },
+      '/ws': {
+        target: 'ws://wkg.local.cn:8066',
+        ws: true,
+        changeOrigin: true,
+      },
+    },
+  },
 })
 })