Merge branch 'dev' into 'master'

Dev

See merge request !66

src/api/podUsOrder.ts

@@ -9,6 +9,7 @@ import {
   WarehouseListData,
   WarehouseListData,
   LogisticsData,
   LogisticsData,
   ExportParams,
   ExportParams,
+  InterceptStateGroupData,
 } from '@/types/api/podUsOrder'
 } from '@/types/api/podUsOrder'
 import axios from './axios'
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
@@ -43,6 +44,13 @@ export function getOrderTabData() {
     '/factory/podJomallOrderUs/findStateGroupList',
     '/factory/podJomallOrderUs/findStateGroupList',
   )
   )
 }
 }
+// 拦截状态数量
+export function getgetInterceptStateGroupList() {
+  return axios.get<never, BaseRespData<InterceptStateGroupData>>(
+    'factory/podJomallOrderUs/findInterceptStateGroupList',
+  )
+}
+
 export function getOrderList(
 export function getOrderList(
   params: SearchForm,
   params: SearchForm,
   currentPage: number,
   currentPage: number,
@@ -505,6 +513,17 @@ export function updateToWaitShipmentApi(params: {
     params,
     params,
   )
   )
 }
 }
+
+// 拦截状态改变
+export function interceptUpdateApi(params: {
+  orderIds: (string | number)[]
+  interceptStatus: number
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateInterceptStatus`,
+    params,
+  )
+}
 // 驳回
 // 驳回
 export function rejectToApi(params: {
 export function rejectToApi(params: {
   orderStatus: string
   orderStatus: string

src/types/api/podUsOrder.ts

@@ -6,7 +6,7 @@ export interface Tab {
 export interface ExportParams extends SearchForm {
 export interface ExportParams extends SearchForm {
   idList?: number[]
   idList?: number[]
   exportAll: boolean
   exportAll: boolean
-  status?:string
+  status?: string
 }
 }
 
 
 export interface SearchForm {
 export interface SearchForm {
@@ -34,6 +34,7 @@ export interface SearchForm {
   batchArrangeNumber?: string
   batchArrangeNumber?: string
   craftCode?: string
   craftCode?: string
   thirdStockSku?: string
   thirdStockSku?: string
+  interceptStatus?: number | string
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number
@@ -127,6 +128,7 @@ export interface ProductList {
   supplierProductNo?: string | null
   supplierProductNo?: string | null
   replenishmentSumNum?: number | null
   replenishmentSumNum?: number | null
   batchArrangeNumber?: string | null
   batchArrangeNumber?: string | null
+  interceptStatus?: number | null
 }
 }
 export interface cardImages {
 export interface cardImages {
   title: string
   title: string
@@ -201,3 +203,12 @@ export interface CraftListData {
   craftName: string
   craftName: string
   craftCode: string
   craftCode: string
 }
 }
+
+export interface InterceptStateGroupData {
+  shipment: {
+    [key: string]: number
+  }
+  production: {
+    [key: string]: number
+  }
+}

src/views/order/podUs/PodMakeOrder.vue

@@ -422,6 +422,7 @@ const renderItemBox = (bool: boolean) => {
   if (renderLock) return
   if (renderLock) return
   renderLock = true
   renderLock = true
   let boxItem = podBoxList.value.find((item) => item.box === boxIndex.value)
   let boxItem = podBoxList.value.find((item) => item.box === boxIndex.value)
+
   if (!boxItem) boxItem = { data: { productList: [] } }
   if (!boxItem) boxItem = { data: { productList: [] } }
   const { data } = boxItem
   const { data } = boxItem
   data?.productList?.forEach((el) => {
   data?.productList?.forEach((el) => {