fix: POD US 修改

src/api/podUsOrder.ts

@@ -11,11 +11,11 @@ import {
 import axios from './axios'
 import { PodMakeOrderData } from '@/types/api/podMakeOrder'
 export interface LogisticsData {
-  logisticsWayName: string;  // 物流名称
-  warehouseName: string;     // 发货仓库
-  status: boolean;
-  logisticsWayCode: string;  // 物流编码
-  partition: string;         // 所在分区
+  logisticsWayName: string // 物流名称
+  warehouseName: string // 发货仓库
+  status: boolean
+  logisticsWayCode: string // 物流编码
+  partition: string // 所在分区
 }
 export function getOrderTabData() {
   return axios.get<never, BaseRespData<Tab[]>>(
@@ -50,7 +50,12 @@ export function getCardOrderList(
     },
   )
 }
-export function confirmOrderApi(data: number[], productionClient: string,type:string,logisticsTrialCalculation?:LogisticsData | null) {
+export function confirmOrderApi(
+  data: number[],
+  productionClient: string,
+  type: string,
+  logisticsTrialCalculation?: LogisticsData | null,
+) {
   return axios.post<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/confirmOrders',
     {
@@ -128,27 +133,19 @@ export function printProductionOrderApi(orderIds: number[]) {
     orderIds,
   )
 }
-export function printPrintOrderApi(
-  orderIds: number[],
-  productionClient: string,
-) {
+export function printPrintOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
     'factory/podJomallOrderUs/printPickPdf',
     {
-      ids: orderIds.join(','),
-      productionClient,
+      ids: orderIds.join(',')
     },
   )
 }
-export function printPickingOrderApi(
-  orderIds: number[],
-  productionClient: string,
-) {
+export function printPickingOrderApi(orderIds: number[]) {
   return axios.post<never, BaseRespData<string>>(
     'factory/podJomallOrderUs/pickingComplete',
     {
       ids: orderIds.join(','),
-      productionClient,
     },
   )
 }
@@ -238,7 +235,7 @@ export function updateRemarkApi(id: number, content: string) {
 export function getLogisticsCalculation(id: number) {
   return axios.get<never, BaseRespData<never>>(
     'factory/podJomallOrderUs/getLogisticsCalculation',
-    { params:{id} },
+    { params: { id } },
   )
 }
 export function loadWarehouseListApi() {

src/views/order/podUs/index.vue

@@ -294,7 +294,7 @@
                     </div>
                     <div class="goods-item-info-item">
                       <span class="goods-item-info-item-label"
-                      >第三方生产单号:</span
+                        >第三方生产单号:</span
                       >
                       <span
                         class="goods-item-info-item-value"
@@ -658,7 +658,7 @@
                 <div class="grid-container">
                   <div class="grid-item" title="商品名称">
                     <span class="grid-item-value"
-                    >{{ cardItem?.productName }}
+                      >{{ cardItem?.productName }}
                     </span>
                   </div>
                   <div class="grid-item" title="未生产数量">
@@ -751,7 +751,7 @@
       </ElSelect>
     </div>
     <el-table
-      v-if="productionClientValue==='JOMALL'"
+      v-if="productionClientValue === 'JOMALL'"
       height="400px"
       class="production-client-table"
       :data="confirmData"
@@ -862,7 +862,7 @@
     <template #footer>
       <div class="dialog-footer">
         <ElButton @click="productionClientVisible = false">取消</ElButton>
-        <ElButton type="primary" @click="submit">确认</ElButton>
+        <ElButton type="primary" @click="submitConfirm">确认</ElButton>
       </div>
     </template>
   </ElDialog>
@@ -890,7 +890,8 @@ import {
   toBeConfirmedApi,
   loadWarehouseListApi,
   getLogisticsCalculation,
-  refreshMaterialApi, LogisticsData,
+  refreshMaterialApi,
+  LogisticsData,
 } from '@/api/podUsOrder'
 import TableView from '@/components/TableView.vue'
 import {
@@ -919,7 +920,7 @@ import dayjs from 'dayjs'
 declare global {
   interface Window {
     ActiveXObject: {
-      new(type: string): XMLHttpRequest
+      new (type: string): XMLHttpRequest
     }
     VBS_BinaryToArray: {
       (data: unknown): { toArray(): number[] }
@@ -1184,7 +1185,6 @@ const confirm = async (row: ProductList) => {
   confirmRowData.value = row
   confirmData.value = []
   confirmSelectionData.value = []
-
 }
 const handleConfirm = async () => {
   if (!productionClientValue.value) {
@@ -1204,7 +1204,7 @@ const handleConfirm = async () => {
     [Number(id)],
     productionClientValue.value,
     'customize',
-    confirmSelectionData.value[0]||null,
+    confirmSelectionData.value[0] || null,
   )
   if (res.code !== 200) return
   ElMessage.success('操作成功')
@@ -1236,16 +1236,10 @@ const handleUpdateRemark = async (item: ProductList) => {
 const productionClientValue = ref('')
 const productionClient = ref<ProductionClient[]>()
 const productionClientVisible = ref(false)
-let confirmBtn = false
-let pickingBtn = false
-let printBtn = false
 const confirmOrder = async () => {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
   }
-  confirmBtn = true
-  pickingBtn = false
-  printBtn = false
   productionClientValue.value = ''
   productionClientVisible.value = true
 }
@@ -1258,15 +1252,6 @@ const loadProductionClient = async () => {
     console.error(e)
   }
 }
-const submit = async () => {
-  if (confirmBtn) {
-    await submitConfirm()
-  } else if (printBtn) {
-    await submitPrintPickingOrder()
-  } else if (pickingBtn) {
-    await submitPickingOrder()
-  }
-}
 const submitConfirm = async () => {
   const ids = selection.value.map((item) => item.id)
   try {
@@ -1278,7 +1263,6 @@ const submitConfirm = async () => {
     if (res.code !== 200) return
     ElMessage.success('操作成功')
     productionClientVisible.value = false
-    confirmBtn = false
     search()
     loadTabData()
   } catch (e) {
@@ -1327,46 +1311,36 @@ const printPickingOrder = async () => {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
   }
-  pickingBtn = false
-  printBtn = true
-  confirmBtn = false
-  productionClientVisible.value = true
-  productionClientValue.value = ''
-}
-const pickingComplete = async () => {
-  if (selection.value.length === 0) {
-    return ElMessage.warning('请选择数据')
-  }
-  pickingBtn = true
-  printBtn = false
-  confirmBtn = false
-  productionClientVisible.value = true
-  productionClientValue.value = ''
-}
-const submitPrintPickingOrder = async () => {
   const orderIds = selection.value.map((item) => item.id)
   try {
-    const res = await printPrintOrderApi(orderIds, productionClientValue.value)
+    const res = await printPrintOrderApi(orderIds)
     if (res.code !== 200) return
     ElMessage.success('操作成功')
     window.open(filePath + res.message)
-    printBtn = false
   } catch (e) {
     console.error(e)
   }
 }
-const submitPickingOrder = async () => {
+const pickingComplete = async () => {
+  if (selection.value.length === 0) {
+    return ElMessage.warning('请选择数据')
+  }
+  try {
+    await ElMessageBox.confirm('确定完成拣胚完成吗?', '提示', {
+      cancelButtonText: '取消',
+      confirmButtonText: '确认',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
   const orderIds = selection.value.map((item) => item.id)
   try {
-    const res = await printPickingOrderApi(
-      orderIds,
-      productionClientValue.value,
-    )
+    const res = await printPickingOrderApi(orderIds)
     if (res.code !== 200) return
     ElMessage.success('操作成功')
     search()
     loadTabData()
-    printBtn = false
   } catch (e) {
     console.error(e)
   }
@@ -1947,8 +1921,7 @@ onMounted(() => {
 }
 
 .production-client-table {
-
-  ::v-deep(.current-row>td.el-table__cell) {
+  ::v-deep(.current-row > td.el-table__cell) {
     background-color: green;
     color: white;
 
@@ -1958,5 +1931,4 @@ onMounted(() => {
     }
   }
 }
-
 </style>