Merge remote-tracking branch 'origin/master' into linjinhong

auto-imports.d.ts

@@ -88,6 +88,21 @@ declare global {
 // for type re-export
 // for type re-export
 declare global {
 declare global {
   // @ts-ignore
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type {
+    Component,
+    ComponentPublicInstance,
+    ComputedRef,
+    DirectiveBinding,
+    ExtractDefaultPropTypes,
+    ExtractPropTypes,
+    ExtractPublicPropTypes,
+    InjectionKey,
+    PropType,
+    Ref,
+    MaybeRef,
+    MaybeRefOrGetter,
+    VNode,
+    WritableComputedRef,
+  } from 'vue'
   import('vue')
   import('vue')
 }
 }

components.d.ts

@@ -32,13 +32,13 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSelect: typeof import('element-plus/es')['ElSelect']

src/api/podUsOrder.ts

@@ -174,9 +174,17 @@ export function printPickingOrderApi(orderIds: number[]) {
   )
   )
 }
 }
 export function stockOutCheckApi(orderIds: number[]) {
 export function stockOutCheckApi(orderIds: number[]) {
-  return axios.get<never, BaseRespData<number[]>>(
-    `factory/podJomallOrderUs/replenishVerify?ids=${orderIds.join(',')}`,
-  )
+  return axios.get<
+    never,
+    BaseRespData<
+      {
+        id: number
+        status: boolean
+        message?: string
+        factoryOrderNumber?: string
+      }[]
+    >
+  >(`factory/podJomallOrderUs/replenishVerify?ids=${orderIds.join(',')}`)
 }
 }
 export function toBePickingApi(orderIds: number[]) {
 export function toBePickingApi(orderIds: number[]) {
   return axios.get<never, BaseRespData<never>>(
   return axios.get<never, BaseRespData<never>>(
@@ -326,16 +334,16 @@ export function createLogisticsOrderApi(params: {
 
 
 // 创建物流
 // 创建物流
 export function uploadExpressSheet(params: {
 export function uploadExpressSheet(params: {
-  trackingNumber:string
+  trackingNumber: string
   file: File
   file: File
 }) {
 }) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/uploadExpressSheet',
     'factory/podJomallOrderUs/uploadExpressSheet',
     params,
     params,
   )
   )
-}// 创建物流
+} // 创建物流
 export function updateSelfLogistics(params: {
 export function updateSelfLogistics(params: {
-  trackingNumber:string
+  trackingNumber: string
   expressSheet: string
   expressSheet: string
   processNumber: string
   processNumber: string
   id?: string
   id?: string
@@ -347,9 +355,9 @@ export function updateSelfLogistics(params: {
 }
 }
 
 
 // 更改物流
 // 更改物流
-export function composingDesignImages(data: number[]) {
+export function composingDesignImages(data: number[],type:string) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
-    'factory/podJomallOrderUs/composingDesignImages',
+    `factory/podJomallOrderUs/composingDesignImages?type=${type}`,
     data,
     data,
   )
   )
 }
 }
@@ -362,6 +370,15 @@ export function updateLogisticsToPickingApi(params: { ids: string }) {
     },
     },
   )
   )
 }
 }
+// 转至待排单
+export function updateLogisticsToArrangeApi(params: { ids: string }) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateLogisticsToArrange`,
+    {
+      params,
+    },
+  )
+}
 //创建物流订单
 //创建物流订单
 export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
 export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
@@ -411,3 +428,18 @@ export function toOutOfStockApi(ids: number[]) {
     ids,
     ids,
   )
   )
 }
 }
+
+// 排单完成
+export function arrangeFinishApi(ids: number[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductUs/arrangeFinish`,
+    ids,
+  )
+}
+
+// 获取工艺
+export function getListCraftApi() {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderProductUs/listCraft`,
+  )
+}

src/types/api/podUsOrder.ts

@@ -15,6 +15,7 @@ export interface SearchForm {
   factorySubOrderNumber: string
   factorySubOrderNumber: string
   status: string
   status: string
   customizedQuantity: string
   customizedQuantity: string
+  multi: boolean | null
   startTime: string | null
   startTime: string | null
   endTime: string | null
   endTime: string | null
   exceptionHandling: number | undefined
   exceptionHandling: number | undefined
@@ -22,7 +23,9 @@ export interface SearchForm {
   productionClient: string
   productionClient: string
   warehouseId: string | number
   warehouseId: string | number
   thirdSkuCode: string
   thirdSkuCode: string
-  supplierProductNo:string
+  supplierProductNo: string
+  batchArrangeNumber: string
+  craftCode: string
 }
 }
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number
@@ -109,6 +112,7 @@ export interface ProductList {
   thirdSkuCode?: string | null
   thirdSkuCode?: string | null
   supplierProductNo?: string | null
   supplierProductNo?: string | null
   replenishmentSumNum?: number | null
   replenishmentSumNum?: number | null
+  batchArrangeNumber?: string | null
 }
 }
 export interface cardImages {
 export interface cardImages {
   title: string
   title: string
@@ -179,3 +183,7 @@ export interface LogisticsFormData {
   expressSheetUrl: string
   expressSheetUrl: string
   expressSheet: File | null
   expressSheet: File | null
 }
 }
+export interface CraftListData {
+  craftName: string
+  craftCode: string
+}

src/views/order/podUs/components/ResultInfo.vue

@@ -74,11 +74,10 @@ const resultDialog = ref(false)
 const isIndeterminate = ref(false)
 const isIndeterminate = ref(false)
 const checkAll = ref(false)
 const checkAll = ref(false)
 const selectedList = ref<IList[]>([])
 const selectedList = ref<IList[]>([])
-
+let key = ''
 // 显示弹窗
 // 显示弹窗
 const showDialog = (type?: string) => {
 const showDialog = (type?: string) => {
-  console.log(type)
-
+  key = type || ''
   resultDialog.value = true
   resultDialog.value = true
   selectedList.value = []
   selectedList.value = []
   checkAll.value = false
   checkAll.value = false
@@ -127,6 +126,7 @@ const copyAllCode = (field: string) => {
 }
 }
 
 
 function closedFn() {
 function closedFn() {
+  if (key === 'stockOut') return
   emits('confirm', selectedList.value)
   emits('confirm', selectedList.value)
 }
 }