Merge branch 'dev' into 'master'

fix: 待创建物流修改

See merge request !59

components.d.ts

@@ -32,7 +32,6 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']

src/types/api/podUsOrder.ts

@@ -56,7 +56,7 @@ export interface PodUsOrderListData {
   paymentTime?: string
   startStockingTime?: string
   finishTime?: string
-  shipmentType?: string
+  shipmentType?: number
   expressSheet?: string
   trackingNumber?: string
   processNumber?: string

src/views/order/podUs/index.vue

@@ -375,20 +375,42 @@
               <template #dropdown>
                 <ElDropdownMenu>
                   <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 ||
+                      selection.some((item) => item.shipmentType !== 1)
+                    "
                     @click="getOrderByIdApi('createLogisticsOrder')"
                     >创建物流订单</ElDropdownItem
                   >
-                  <ElDropdownItem @click="getOrderByIdApi('getTrackingNumber')"
+                  <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 ||
+                      selection.some((item) => item.shipmentType !== 1)
+                    "
+                    @click="getOrderByIdApi('getTrackingNumber')"
                     >获取跟踪号</ElDropdownItem
                   >
-                  <ElDropdownItem @click="getOrderByIdApi('getPrintOrder')"
+                  <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 ||
+                      selection.some((item) => item.shipmentType !== 1)
+                    "
+                    @click="getOrderByIdApi('getPrintOrder')"
                     >获取打印面单</ElDropdownItem
                   >
                   <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 ||
+                      selection.some((item) => item.shipmentType !== 1)
+                    "
                     @click="getOrderByIdApi('cancelLogisticsOrder')"
                     >取消物流订单</ElDropdownItem
                   >
                   <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 ||
+                      selection.some((item) => item.shipmentType !== 1)
+                    "
                     @click="getOrderByIdApi('batchChangeLogistics')"
                     >更换物流</ElDropdownItem
                   >
@@ -786,7 +808,10 @@
               </div>
               <div class="order-detail-item">
                 <span class="order-detail-item-label">物流类型:</span>
-                <span class="order-detail-item-value">
+                <span
+                  style="color: red; font-weight: 500"
+                  class="order-detail-item-value"
+                >
                   {{ ['自有物流', '工厂物流'][row.shipmentType] }}
                 </span>
               </div>
@@ -1070,6 +1095,18 @@
               </span>
               <span
                 v-if="
+                  (status === 'WAIT_SHIPMENT' ||
+                    status === 'CREATE_LOGISTICS') &&
+                  row.shipmentType === 1
+                "
+                class="operate-item"
+              >
+                <ElButton link type="primary" @click="handleStockOut(row)">
+                  更换物流
+                </ElButton>
+              </span>
+              <span
+                v-if="
                   row.shipmentType === 0 &&
                   ['CREATE_LOGISTICS', 'WAIT_SHIPMENT'].includes(status)
                 "
@@ -3013,20 +3050,6 @@ const getOrderByIdApi = async (type: string) => {
       Fn: cancelLogisticsOrderApi,
     },
   }
-
-  if (['batchChangeLogistics'].includes(type)) {
-    if (selection.value.length !== 1) {
-      return ElMessage.warning('请选择单条数据')
-    }
-    wayDialogTitle.value = `切换物流(当前物流方式：${selection.value[0]?.logisticsWayName})`
-
-    isChangeWay.value = true
-
-    const { data } = await getLogisticsCalculation(selection.value[0]?.id)
-    logisticsWayData.value = data
-
-    return
-  }
   let loading
   const operation = operationMap[type]
   if (operation) {
@@ -3073,6 +3096,17 @@ const getOrderByIdApi = async (type: string) => {
     ElMessage.warning('未知操作类型')
   }
 }
+const handleStockOut = async (row: PodUsOrderListData) => {
+  wayDialogTitle.value = `切换物流(当前物流方式：${row.logisticsWayName})`
+
+  isChangeWay.value = true
+  try {
+    const { data } = await getLogisticsCalculation(row.id as number)
+    logisticsWayData.value = data
+  } catch (error) {
+    console.error(error)
+  }
+}
 //展示返回结果
 const resultInfo = ref<
   {
@@ -3244,7 +3278,7 @@ const toBePicking = async () => {
     return ElMessage.warning('请选择数据')
   }
   try {
-    await ElMessageBox.confirm('确定转至待创建物流吗？', '提示', {
+    await ElMessageBox.confirm('确定补货完成吗？', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',