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

src/api/podUsOrder.ts

@@ -297,3 +297,19 @@ export function createLogisticsOrderApi(params: {
     params,
     params,
   )
   )
 }
 }
+// 转至待拣胚
+export function updateLogisticsToPickingApi(params: { ids: string }) {
+  return axios.get<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/updateLogisticsToPicking`,
+    {
+      params,
+    },
+  )
+}
+//创建物流订单
+export function createLogisticsOrdersApi(orderIds: (string | number)[]) {
+  return axios.post<never, BaseRespData<never>>(
+    `factory/podJomallOrderUs/createLogisticsOrders`,
+    orderIds,
+  )
+}

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

@@ -32,7 +32,7 @@
       <div style="margin: 15px 0"></div>
       <div style="margin: 15px 0"></div>
       <el-checkbox-group v-model="selectedList" @change="checkChange">
       <el-checkbox-group v-model="selectedList" @change="checkChange">
         <div style="display: block" v-for="(item, index) in list" :key="index">
         <div style="display: block" v-for="(item, index) in list" :key="index">
-          <el-checkbox :label="item.id">
+          <el-checkbox :value="item.id">
             {{ '店铺编号：' + item.shopNumber + ' ' + item.message }}
             {{ '店铺编号：' + item.shopNumber + ' ' + item.message }}
           </el-checkbox>
           </el-checkbox>
         </div>
         </div>

src/views/order/podUs/index.vue

@@ -171,7 +171,15 @@
         <span v-if="status === 'WAIT_SHIPMENT'" class="item">
         <span v-if="status === 'WAIT_SHIPMENT'" class="item">
           <ElButton type="warning" @click="printPodOrder"> POD打单 </ElButton>
           <ElButton type="warning" @click="printPodOrder"> POD打单 </ElButton>
         </span>
         </span>
-        <span v-if="status === 'WAIT_SHIPMENT'" class="item">
+        <span v-if="status === 'CREATE_LOGISTICS'" class="item">
+          <ElButton type="warning" @click="logisticsToPicking">
+            转至待拣胚
+          </ElButton>
+        </span>
+        <span
+          v-if="status === 'WAIT_SHIPMENT' || status === 'CREATE_LOGISTICS'"
+          class="item"
+        >
           <ElDropdown>
           <ElDropdown>
             <el-button type="success">
             <el-button type="success">
               物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon>
               物流接口<el-icon class="el-icon--right"><ArrowDown /></el-icon>
@@ -201,7 +209,9 @@
           <ElButton type="warning" @click="stockOutCheck"> 补货校验 </ElButton>
           <ElButton type="warning" @click="stockOutCheck"> 补货校验 </ElButton>
         </span>
         </span>
         <span v-if="status === 'STOCK_OUT'" class="item">
         <span v-if="status === 'STOCK_OUT'" class="item">
-          <ElButton type="success" @click="toBePicking"> 转至待拣胚 </ElButton>
+          <ElButton type="success" @click="toBePicking">
+            转至待创建物流
+          </ElButton>
         </span>
         </span>
 
 
         <span class="item">
         <span class="item">
@@ -1067,6 +1077,8 @@ import {
   cancelLogisticsOrderApi,
   cancelLogisticsOrderApi,
   changeLogisticsApi,
   changeLogisticsApi,
   createLogisticsOrderApi,
   createLogisticsOrderApi,
+  updateLogisticsToPickingApi,
+  createLogisticsOrdersApi,
 } from '@/api/podUsOrder'
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 
 
@@ -1784,6 +1796,10 @@ const getOrderByIdApi = async (type: string) => {
       Fn: (orderIds: (string | number)[]) => Promise<BaseRespData<never>>
       Fn: (orderIds: (string | number)[]) => Promise<BaseRespData<never>>
     }
     }
   } = {
   } = {
+    createLogisticsOrder: {
+      message: '创建物流订单',
+      Fn: createLogisticsOrdersApi,
+    },
     getTrackingNumber: { message: '获取跟踪号', Fn: getTrackingNumberApi },
     getTrackingNumber: { message: '获取跟踪号', Fn: getTrackingNumberApi },
     getPrintOrder: { message: '获取打印面单', Fn: getfaceSimplexFileApi },
     getPrintOrder: { message: '获取打印面单', Fn: getfaceSimplexFileApi },
     cancelLogisticsOrder: {
     cancelLogisticsOrder: {
@@ -1792,14 +1808,12 @@ const getOrderByIdApi = async (type: string) => {
     },
     },
   }
   }
 
 
-  if (['batchChangeLogistics', 'createLogisticsOrder'].includes(type)) {
+  if (['batchChangeLogistics'].includes(type)) {
     if (selection.value.length !== 1) {
     if (selection.value.length !== 1) {
       return ElMessage.warning('请选择单条数据')
       return ElMessage.warning('请选择单条数据')
     }
     }
-    wayDialogTitle.value =
-      type === 'batchChangeLogistics'
-        ? `切换物流(当前物流方式：${selection.value[0]?.logisticsWayName})`
-        : '创建物流订单'
+    wayDialogTitle.value = `切换物流(当前物流方式：${selection.value[0]?.logisticsWayName})`
+
     isChangeWay.value = true
     isChangeWay.value = true
 
 
     const { data } = await getLogisticsCalculation(selection.value[0]?.id)
     const { data } = await getLogisticsCalculation(selection.value[0]?.id)
@@ -1858,21 +1872,22 @@ const isChangeWayLoading = ref(false)
 const changeWayRef = ref()
 const changeWayRef = ref()
 const wayDialogTitle = ref('')
 const wayDialogTitle = ref('')
 
 
-const rowClick = (row: LogisticsData, title: string) => {
+const rowClick = (row: LogisticsData, title?: string) => {
+  console.log(title, 'title')
   try {
   try {
-    if (title == '创建物流订单') {
-      changeWayRow.value = row
-    } else {
-      if (row.logisticsWayId === selection.value[0]?.logisticsWayId) {
-        ElMessage.warning('不能选择相同的物流方式')
-        changeWayRow.value = {} as LogisticsData
+    // if (title == '创建物流订单') {
+    //   changeWayRow.value = row
+    // } else {
+    if (row.logisticsWayId === selection.value[0]?.logisticsWayId) {
+      ElMessage.warning('不能选择相同的物流方式')
+      changeWayRow.value = {} as LogisticsData
 
 
-        changeWayRef.value?.setCurrentRow()
+      changeWayRef.value?.setCurrentRow()
 
 
-        return
-      }
-      changeWayRow.value = row
+      return
     }
     }
+    changeWayRow.value = row
+    // }
   } catch (error) {
   } catch (error) {
     console.log(error)
     console.log(error)
   }
   }
@@ -1984,12 +1999,13 @@ const stockOutCheck = async () => {
     loading.close()
     loading.close()
   }
   }
 }
 }
+//转至待创建物流
 const toBePicking = async () => {
 const toBePicking = async () => {
   if (selection.value.length === 0) {
   if (selection.value.length === 0) {
     return ElMessage.warning('请选择数据')
     return ElMessage.warning('请选择数据')
   }
   }
   try {
   try {
-    await ElMessageBox.confirm('确定转至待拣胚吗？', '提示', {
+    await ElMessageBox.confirm('确定转至待创建物流吗？', '提示', {
       confirmButtonText: '确定',
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       cancelButtonText: '取消',
       type: 'warning',
       type: 'warning',
@@ -2014,6 +2030,39 @@ const toBePicking = async () => {
     loading.close()
     loading.close()
   }
   }
 }
 }
+//转至待拣胚
+const logisticsToPicking = async () => {
+  if (selection.value.length === 0) {
+    return ElMessage.warning('请选择数据')
+  }
+  try {
+    await ElMessageBox.confirm('确定转至待拣胚吗？', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch (e) {
+    return
+  }
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+  try {
+    const res = await updateLogisticsToPickingApi({
+      ids: selection.value.map((item) => item.id).join(','),
+    })
+    if (res.code !== 200) return
+    ElMessage.success('操作成功')
+    search()
+    loadTabData()
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.close()
+  }
+}
 const sheetPrinter = ref('')
 const sheetPrinter = ref('')
 const handlePrinterChange = (value: string) => {
 const handlePrinterChange = (value: string) => {
   sheetPrinter.value = value
   sheetPrinter.value = value