feat: 待拣胚、待补胚 添加子tab页 #1011713

src/views/order/factoryOrderNew/hooks/useOrderStatusTree.ts

@@ -70,8 +70,10 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
     { label: '其他', key: 'otherReasonCount', value: 3, count: 0 },
     { label: '其他', key: 'otherReasonCount', value: 3, count: 0 },
   ])
   ])
   const cancelledSubTab = ref(1)
   const cancelledSubTab = ref(1)
-  /** 待拣胚/待补胚：0-正常，1-缺货（等待补货） */
-  const outOfStockSubTab = ref<0 | 1>(0)
+  /** 待拣胚：0-正常，1-缺货（等待补货） */
+  const pendingPickSubTab = ref<0 | 1>(0)
+  /** 待补胚：0-正常，1-缺货（等待补货） */
+  const pendingReplenishSubTab = ref<0 | 1>(0)
   const treeRef = ref()
   const treeRef = ref()
 
 
   const isCardLayout = computed(() => cardLayoutStatuses.includes(status.value))
   const isCardLayout = computed(() => cardLayoutStatuses.includes(status.value))
@@ -212,7 +214,8 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
     suspendedSubTab,
     suspendedSubTab,
     cancelledTabs,
     cancelledTabs,
     cancelledSubTab,
     cancelledSubTab,
-    outOfStockSubTab,
+    pendingPickSubTab,
+    pendingReplenishSubTab,
     treeRef,
     treeRef,
     isCardLayout,
     isCardLayout,
     isSpecialLayout,
     isSpecialLayout,

src/views/order/factoryOrderNew/index.vue

@@ -788,25 +788,37 @@
         </div>
         </div>
       </div> -->
       </div> -->
 
 
+      <div v-if="status === 'PENDING_PICK'" class="status-subtabs">
         <div
         <div
-        v-if="status === 'PENDING_PICK' || status === 'PENDING_REPLENISH'"
-        class="status-subtabs"
+          class="status-subtab"
+          :class="{ active: pendingPickSubTab === 0 }"
+          @click="handlePendingPickTabClick(0)"
         >
         >
+          待拣胚
+        </div>
         <div
         <div
           class="status-subtab"
           class="status-subtab"
-          :class="{ active: outOfStockSubTab === 0 }"
-          @click="handleOutOfStockTabClick(0)"
+          :class="{ active: pendingPickSubTab === 1 }"
+          @click="handlePendingPickTabClick(1)"
         >
         >
-          {{ status === 'PENDING_PICK' ? '待拣胚' : '待补胚' }}
+          待拣胚-等待补货
         </div>
         </div>
+      </div>
+
+      <div v-if="status === 'PENDING_REPLENISH'" class="status-subtabs">
         <div
         <div
           class="status-subtab"
           class="status-subtab"
-          :class="{ active: outOfStockSubTab === 1 }"
-          @click="handleOutOfStockTabClick(1)"
+          :class="{ active: pendingReplenishSubTab === 0 }"
+          @click="handlePendingReplenishTabClick(0)"
         >
         >
-          {{
-            status === 'PENDING_PICK' ? '待拣胚-等待补货' : '待补胚-等待补货'
-          }}
+          待补胚
+        </div>
+        <div
+          class="status-subtab"
+          :class="{ active: pendingReplenishSubTab === 1 }"
+          @click="handlePendingReplenishTabClick(1)"
+        >
+          待补胚-等待补货
         </div>
         </div>
       </div>
       </div>
 
 
@@ -1468,7 +1480,8 @@ const {
   suspendedSubTab,
   suspendedSubTab,
   // cancelledTabs,
   // cancelledTabs,
   cancelledSubTab,
   cancelledSubTab,
-  outOfStockSubTab,
+  pendingPickSubTab,
+  pendingReplenishSubTab,
   treeRef,
   treeRef,
   isCardLayout,
   isCardLayout,
   isSpecialLayout,
   isSpecialLayout,
@@ -1542,8 +1555,11 @@ const getListQueryPayload = () => {
   } else {
   } else {
     delete payload.status
     delete payload.status
   }
   }
-  if (status.value === 'PENDING_PICK' || status.value === 'PENDING_REPLENISH') {
-    payload.outOfStock = outOfStockSubTab.value
+  if (status.value === 'PENDING_PICK') {
+    payload.outOfStock = pendingPickSubTab.value
+  }
+  if (status.value === 'PENDING_REPLENISH') {
+    payload.outOfStock = pendingReplenishSubTab.value
   }
   }
   // 添加默认时间排序参数
   // 添加默认时间排序参数
   const defaultSort = getDefaultCreateTimeSortParams(status.value)
   const defaultSort = getDefaultCreateTimeSortParams(status.value)
@@ -1778,8 +1794,11 @@ const handleStatusNodeClick = (node: { status: string }) => {
   if (node.status !== 'CANCELLED') {
   if (node.status !== 'CANCELLED') {
     cancelledSubTab.value = 1
     cancelledSubTab.value = 1
   }
   }
-  if (node.status !== 'PENDING_PICK' && node.status !== 'PENDING_REPLENISH') {
-    outOfStockSubTab.value = 0
+  if (node.status !== 'PENDING_PICK') {
+    pendingPickSubTab.value = 0
+  }
+  if (node.status !== 'PENDING_REPLENISH') {
+    pendingReplenishSubTab.value = 0
   }
   }
   if (node.status === 'PICKING') {
   if (node.status === 'PICKING') {
     getOrderStatus()
     getOrderStatus()
@@ -1807,9 +1826,15 @@ const handlePendingAcceptTabClick = (
   tab: 'PENDING_RECEIVE' | 'ACCEPT_FAIL_OUT_OF_STOCK',
   tab: 'PENDING_RECEIVE' | 'ACCEPT_FAIL_OUT_OF_STOCK',
 ) => handlePendingAcceptTabClickRaw(tab, refreshTableList)
 ) => handlePendingAcceptTabClickRaw(tab, refreshTableList)
 
 
-const handleOutOfStockTabClick = (tab: 0 | 1) => {
-  if (outOfStockSubTab.value === tab) return
-  outOfStockSubTab.value = tab
+const handlePendingPickTabClick = (tab: 0 | 1) => {
+  if (pendingPickSubTab.value === tab) return
+  pendingPickSubTab.value = tab
+  refreshCurrentView()
+}
+
+const handlePendingReplenishTabClick = (tab: 0 | 1) => {
+  if (pendingReplenishSubTab.value === tab) return
+  pendingReplenishSubTab.value = tab
   refreshCurrentView()
   refreshCurrentView()
 }
 }