feat: 驳回成功消息弹窗修改

src/api/podUsOrder.ts

@@ -508,7 +508,7 @@ export function updateToWaitShipmentApi(params: {
 // 驳回
 // 驳回
 export function rejectToApi(params: {
 export function rejectToApi(params: {
   orderStatus: string
   orderStatus: string
-  productList: ProductList[][]
+  productList: ProductList[]
 }) {
 }) {
   return axios.post<never, BaseRespData<never>>(
   return axios.post<never, BaseRespData<never>>(
     `factory/podJomallOrderUs/rejectTo`,
     `factory/podJomallOrderUs/rejectTo`,

src/views/order/podUs/index.vue

@@ -412,7 +412,7 @@
                 <ElDropdownMenu>
                 <ElDropdownMenu>
                   <ElDropdownItem
                   <ElDropdownItem
                     :disabled="
                     :disabled="
-                      selection.length === 0 ||
+                      (selection.length === 0 && cardSelection.length === 0) ||
                       selection.some((item) => item.shipmentType !== 1)
                       selection.some((item) => item.shipmentType !== 1)
                     "
                     "
                     @click="getOrderByIdApi('createLogisticsOrder')"
                     @click="getOrderByIdApi('createLogisticsOrder')"
@@ -420,7 +420,7 @@
                   >
                   >
                   <ElDropdownItem
                   <ElDropdownItem
                     :disabled="
                     :disabled="
-                      selection.length === 0 ||
+                      (selection.length === 0 && cardSelection.length === 0) ||
                       selection.some((item) => item.shipmentType !== 1)
                       selection.some((item) => item.shipmentType !== 1)
                     "
                     "
                     @click="getOrderByIdApi('getTrackingNumber')"
                     @click="getOrderByIdApi('getTrackingNumber')"
@@ -428,7 +428,7 @@
                   >
                   >
                   <ElDropdownItem
                   <ElDropdownItem
                     :disabled="
                     :disabled="
-                      selection.length === 0 ||
+                      (selection.length === 0 && cardSelection.length === 0) ||
                       selection.some((item) => item.shipmentType !== 1)
                       selection.some((item) => item.shipmentType !== 1)
                     "
                     "
                     @click="getOrderByIdApi('getPrintOrder')"
                     @click="getOrderByIdApi('getPrintOrder')"
@@ -436,7 +436,7 @@
                   >
                   >
                   <ElDropdownItem
                   <ElDropdownItem
                     :disabled="
                     :disabled="
-                      selection.length === 0 ||
+                      (selection.length === 0 && cardSelection.length === 0) ||
                       selection.some((item) => item.shipmentType !== 1)
                       selection.some((item) => item.shipmentType !== 1)
                     "
                     "
                     @click="getOrderByIdApi('cancelLogisticsOrder')"
                     @click="getOrderByIdApi('cancelLogisticsOrder')"
@@ -505,55 +505,36 @@
               <template #dropdown>
               <template #dropdown>
                 <ElDropdownMenu>
                 <ElDropdownMenu>
                   <ElDropdownItem
                   <ElDropdownItem
-                    :disabled="
-                      selection.length === 0 ||
-                      selection.some((item) => item.shipmentType !== 1)
+                    v-if="
+                      status === 'STOCK_OUT' ||
+                      status === 'CREATE_LOGISTICS' ||
+                      status === 'TO_BE_ARRANGE' ||
+                      status === 'PICKING' ||
+                      status === 'IN_PRODUCTION'
                     "
                     "
+                    :disabled="selection.length === 0"
                     @click="rejectOrder('TO_BE_CONFIRMED')"
                     @click="rejectOrder('TO_BE_CONFIRMED')"
                     >待确认</ElDropdownItem
                     >待确认</ElDropdownItem
                   >
                   >
-                  <!-- <ElDropdownItem
-                    v-if="status !== 'STOCK_OUT'"
-                    :disabled="
-                      selection.length === 0 ||
-                      selection.some((item) => item.shipmentType !== 1)
-                    "
-                    @click="rejectOrder('STOCK_OUT')"
-                    >缺货</ElDropdownItem
-                  > -->
                   <ElDropdownItem
                   <ElDropdownItem
-                    v-if="status !== 'STOCK_OUT' && status !== 'TO_BE_ARRANGE'"
-                    :disabled="
-                      selection.length === 0 ||
-                      selection.some((item) => item.shipmentType !== 1)
+                    v-if="
+                      status === 'IN_PRODUCTION' ||
+                      status === 'TO_BE_ARRANGE' ||
+                      status === 'PICKING'
                     "
                     "
+                    :disabled="selection.length === 0"
                     @click="rejectOrder('CREATE_LOGISTICS')"
                     @click="rejectOrder('CREATE_LOGISTICS')"
                     >待创建物流</ElDropdownItem
                     >待创建物流</ElDropdownItem
                   >
                   >
                   <ElDropdownItem
                   <ElDropdownItem
-                    v-if="
-                      status !== 'STOCK_OUT' &&
-                      status !== 'TO_BE_ARRANGE' &&
-                      status !== 'PICKING'
-                    "
-                    :disabled="
-                      selection.length === 0 ||
-                      selection.some((item) => item.shipmentType !== 1)
-                    "
+                    v-if="status === 'PICKING' || status === 'IN_PRODUCTION'"
+                    :disabled="selection.length === 0"
                     @click="rejectOrder('TO_BE_ARRANGE')"
                     @click="rejectOrder('TO_BE_ARRANGE')"
                     >待排单</ElDropdownItem
                     >待排单</ElDropdownItem
                   >
                   >
                   <ElDropdownItem
                   <ElDropdownItem
-                    v-if="
-                      status !== 'STOCK_OUT' &&
-                      status !== 'TO_BE_ARRANGE' &&
-                      status !== 'PICKING' &&
-                      status !== 'IN_PRODUCTION'
-                    "
-                    :disabled="
-                      selection.length === 0 ||
-                      selection.some((item) => item.shipmentType !== 1)
-                    "
+                    v-if="status === 'IN_PRODUCTION'"
+                    :disabled="selection.length === 0"
                     @click="rejectOrder('PICKING')"
                     @click="rejectOrder('PICKING')"
                     >待拣胚</ElDropdownItem
                     >待拣胚</ElDropdownItem
                   >
                   >
@@ -3669,22 +3650,13 @@ const rejectOrder = async (type: string) => {
     const res = await rejectToApi({
     const res = await rejectToApi({
       orderStatus: type,
       orderStatus: type,
       productList: selection.value.flatMap(
       productList: selection.value.flatMap(
-        (item: PodUsOrderListData) => item.productList,
+        (item: PodUsOrderListData) => item.productList || [],
       ),
       ),
     })
     })
     if (res.code !== 200) return
     if (res.code !== 200) return
 
 
-    await ElMessageBox.alert(
-      res.data.map((i) => i.message).join('<br>'),
-      '操作成功',
-      {
-        confirmButtonText: '确定',
-        dangerouslyUseHTMLString: true,
-      },
-    ).then(() => {
-      search()
-      loadTabData()
-    })
+    resultInfo.value = res.data
+    resultRefs.value?.showDialog()
   } catch (e) {
   } catch (e) {
     console.log(e)
     console.log(e)
   } finally {
   } finally {