Merge remote-tracking branch 'origin/newTask-lin' into dev

src/api/podUsOrder.ts

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

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')"
@@ -488,6 +488,61 @@
               刷新商品信息
               刷新商品信息
             </ElButton>
             </ElButton>
           </span>
           </span>
+          <span
+            v-if="
+              status === 'STOCK_OUT' ||
+              status === 'CREATE_LOGISTICS' ||
+              status === 'TO_BE_ARRANGE' ||
+              status === 'PICKING' ||
+              status === 'IN_PRODUCTION'
+            "
+            class="item"
+          >
+            <ElDropdown>
+              <el-button type="warning">
+                驳回至<el-icon class="el-icon--right"><ArrowDown /></el-icon>
+              </el-button>
+              <template #dropdown>
+                <ElDropdownMenu>
+                  <ElDropdownItem
+                    :disabled="
+                      selection.length === 0 && cardSelection.length === 0
+                    "
+                    @click="rejectOrder('TO_BE_CONFIRMED')"
+                    >待确认</ElDropdownItem
+                  >
+                  <ElDropdownItem
+                    v-if="
+                      status === 'IN_PRODUCTION' ||
+                      status === 'TO_BE_ARRANGE' ||
+                      status === 'PICKING'
+                    "
+                    :disabled="
+                      selection.length === 0 && cardSelection.length === 0
+                    "
+                    @click="rejectOrder('CREATE_LOGISTICS')"
+                    >待创建物流</ElDropdownItem
+                  >
+                  <ElDropdownItem
+                    v-if="status === 'PICKING' || status === 'IN_PRODUCTION'"
+                    :disabled="
+                      selection.length === 0 && cardSelection.length === 0
+                    "
+                    @click="rejectOrder('TO_BE_ARRANGE')"
+                    >待排单</ElDropdownItem
+                  >
+                  <ElDropdownItem
+                    v-if="status === 'IN_PRODUCTION'"
+                    :disabled="
+                      selection.length === 0 && cardSelection.length === 0
+                    "
+                    @click="rejectOrder('PICKING')"
+                    >待拣胚</ElDropdownItem
+                  >
+                </ElDropdownMenu>
+              </template>
+            </ElDropdown>
+          </span>
           <span v-if="status === 'COMPLETE'" class="item">
           <span v-if="status === 'COMPLETE'" class="item">
             <ElButton type="success" @click="exportData">导出</ElButton>
             <ElButton type="success" @click="exportData">导出</ElButton>
           </span>
           </span>
@@ -573,6 +628,43 @@
           <span class="sub-status-item-label">待同步</span>
           <span class="sub-status-item-label">待同步</span>
         </div>
         </div>
       </div>
       </div>
+      <div v-if="status === 'EXCEPTION_ORDER1'" class="sub-status mb-10">
+        <div
+          class="sub-status-item"
+          :class="exceptionStatus === 1 ? 'sub-active' : ''"
+          @click="handleExceptionCommand(1)"
+        >
+          <span class="sub-status-item-label">生产拦截申请</span>
+        </div>
+        <div
+          class="sub-status-item"
+          :class="exceptionStatus === 2 ? 'sub-active' : ''"
+          @click="handleExceptionCommand(2)"
+        >
+          <span class="sub-status-item-label">生产拦截成功</span>
+        </div>
+        <div
+          class="sub-status-item"
+          :class="exceptionStatus === 3 ? 'sub-active' : ''"
+          @click="handleExceptionCommand(3)"
+        >
+          <span class="sub-status-item-label">生产拦截申请</span>
+        </div>
+        <div
+          class="sub-status-item"
+          :class="exceptionStatus === 3 ? 'sub-active' : ''"
+          @click="handleExceptionCommand(3)"
+        >
+          <span class="sub-status-item-label">生产拦截成功</span>
+        </div>
+        <div
+          class="sub-status-item"
+          :class="exceptionStatus === 3 ? 'sub-active' : ''"
+          @click="handleExceptionCommand(3)"
+        >
+          <span class="sub-status-item-label">生产拦截失败</span>
+        </div>
+      </div>
       <div
       <div
         v-if="
         v-if="
           status !== 'IN_PRODUCTION' &&
           status !== 'IN_PRODUCTION' &&
@@ -2032,6 +2124,7 @@ import {
   batchDownloadRecomposingApi,
   batchDownloadRecomposingApi,
   updateToWaitShipmentApi,
   updateToWaitShipmentApi,
   exportPodUSInfo,
   exportPodUSInfo,
+  rejectToApi,
 } from '@/api/podUsOrder'
 } from '@/api/podUsOrder'
 import { BaseRespData } from '@/types/api'
 import { BaseRespData } from '@/types/api'
 
 
@@ -3556,6 +3649,55 @@ const getOrderByIdApi = async (type: string) => {
     ElMessage.warning('未知操作类型')
     ElMessage.warning('未知操作类型')
   }
   }
 }
 }
+
+// 驳回
+const rejectOrder = async (type: string) => {
+  if (selection.value.length === 0 && cardSelection.value.length === 0) {
+    return ElMessage.warning('请选择数据')
+  }
+  const loading = ElLoading.service({
+    fullscreen: true,
+    text: '操作中...',
+    background: 'rgba(0, 0, 0, 0.3)',
+  })
+
+  try {
+    const { value } = await ElMessageBox.prompt('驳回确认', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      inputType: 'textarea',
+      inputPlaceholder: '驳回原因',
+      inputPattern: /\S+/, // 非空验证，至少一个非空白字符
+      inputErrorMessage: '内容不能为空',
+    })
+
+    const res = await rejectToApi({
+      orderStatus: type,
+      productList: selection.value.length
+        ? selection.value.flatMap(
+            (item: PodUsOrderListData) => item.productList || [],
+          )
+        : cardSelection.value,
+      reasonStr: value,
+    })
+    if (res.code !== 200) return
+
+    resultInfo.value = res.data
+    resultInfo.value = resultInfo.value.filter((item) => !item.status)
+    if (!resultInfo.value.length) {
+      ElMessage.success('操作成功')
+      search()
+      loadTabData()
+    } else {
+      resultRefs.value?.showDialog()
+    }
+  } catch (e) {
+    console.log(e)
+  } finally {
+    loading.close()
+  }
+}
+
 const handleStockOut = async (row: PodUsOrderListData) => {
 const handleStockOut = async (row: PodUsOrderListData) => {
   wayDialogTitle.value = `切换物流(当前物流方式：${row.logisticsWayName})`
   wayDialogTitle.value = `切换物流(当前物流方式：${row.logisticsWayName})`