Merge branch 'dev'

src/views/order/podUs/index.vue

@@ -186,7 +186,7 @@
           :class="exceptionStatus === 3 ? 'sub-active' : ''"
           @click="handleExceptionCommand(3)"
         >
-          <span class="sub-status-item-label">已处理</span>
+          <span class="sub-status-item-label">待同步</span>
         </div>
       </div>
       <div class="operation-box mb-10">
@@ -202,14 +202,14 @@
         >
           <ElButton type="warning" @click="assignOrder"> 分派 </ElButton>
         </span>
-        <span
+        <!-- <span
           v-if="status === 'EXCEPTION_ORDER' && exceptionStatus === 2"
           class="item"
         >
           <ElButton type="warning" @click="handleExceptionOrder">
             处理异常
           </ElButton>
-        </span>
+        </span> -->
         <span v-if="status === 'PICKING'" class="item">
           <ElButton type="primary" @click="printProductionOrder">
             打印生产单
@@ -1162,7 +1162,7 @@ import {
   createLogisticsOrderApi,
   updateLogisticsToPickingApi,
   createLogisticsOrdersApi,
-  handleExceptionOrderApi,
+  // handleExceptionOrderApi,
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 
@@ -1608,37 +1608,37 @@ const assignOrder = async () => {
   currentOrderIds.value = selection.value.map((item) => item.id)
   exceptionDialogVisible.value = true
 }
-const handleExceptionOrder = async () => {
-  if (selection.value.length === 0) {
-    return ElMessage.warning('请选择数据')
-  }
-  try {
-    await showConfirm('确定处理异常吗?', {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    })
-  } catch {
-    return
-  }
-  const orderIds = selection.value.map((item) => item.id)
-  const loading = ElLoading.service({
-    fullscreen: true,
-    text: '操作中...',
-    background: 'rgba(0, 0, 0, 0.3)',
-  })
-  try {
-    const res = await handleExceptionOrderApi(orderIds)
-    if (res.code !== 200) return
-    ElMessage.success('操作成功')
-    search()
-    loadTabData()
-  } catch (e) {
-    console.error(e)
-  } finally {
-    loading.close()
-  }
-}
+// const handleExceptionOrder = async () => {
+//   if (selection.value.length === 0) {
+//     return ElMessage.warning('请选择数据')
+//   }
+//   try {
+//     await showConfirm('确定处理异常吗?', {
+//       confirmButtonText: '确认',
+//       cancelButtonText: '取消',
+//       type: 'warning',
+//     })
+//   } catch {
+//     return
+//   }
+//   const orderIds = selection.value.map((item) => item.id)
+//   const loading = ElLoading.service({
+//     fullscreen: true,
+//     text: '操作中...',
+//     background: 'rgba(0, 0, 0, 0.3)',
+//   })
+//   try {
+//     const res = await handleExceptionOrderApi(orderIds)
+//     if (res.code !== 200) return
+//     ElMessage.success('操作成功')
+//     search()
+//     loadTabData()
+//   } catch (e) {
+//     console.error(e)
+//   } finally {
+//     loading.close()
+//   }
+// }
 const printProductionOrder = async () => {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')