HD_wangm 4 ay önce
ebeveyn
işleme
1b22da8c7c
2 değiştirilmiş dosya ile 5 ekleme ve 6 silme
  1. 3 6
      pages/order/index.uvue
  2. 2 0
      pages/order/pendingOrder.uvue

+ 3 - 6
pages/order/index.uvue

@@ -208,7 +208,6 @@ const statusConfig: StatusItem[] = [
             if (shouldRefresh) {
                 page.value = 1
             }
-			console.log("searchKeyword===" + keyword.value)
             // 调用 API,传递关键字参数
             const searchKeyword = keyword.value.length > 0 ? keyword.value : null
 
@@ -430,7 +429,6 @@ const statusConfig: StatusItem[] = [
     // 搜索
     const handleSearch = (): void => {
         page.value = 1
-		console.log("======搜索=====" + keyword.value)
         loadData(true as boolean | null)
     }
 
@@ -443,10 +441,7 @@ const statusConfig: StatusItem[] = [
 	  if (item == null) return false
 	  let permit: string[] = []
 	  const orderItem = item as acceptOrderInfo
-	  if(currentStatus.value === '' || currentStatus.value === 'completed' || currentStatus.value === 'all') {
-	  	// 传递orderType参数以便详情页决定调用哪个API
-	  	
-	  } else if(orderItem.workOrderStatus == 'assigned') {
+	  if(orderItem.workOrderStatus == 'assigned') {
 	  	// 接单
 	  	permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:accept'] : ['gxt:repairOrder:accept']
 	  } else if(orderItem.workOrderStatus == 'to_finish') {
@@ -458,6 +453,8 @@ const statusConfig: StatusItem[] = [
 	  } else if(orderItem.workOrderStatus == 'suspended') {
 	  	// 恢复
 	  	permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:resume'] : ['gxt:repairOrder:resume']
+	  } else {
+		  return false
 	  }
 	  
 	  // const orderType = (item as acceptOrderInfo).orderType

+ 2 - 0
pages/order/pendingOrder.uvue

@@ -114,6 +114,8 @@ import {checkPermi} from '../../utils/storage'
 	  } else if(orderItem.workOrderStatus == 'suspended') {
 	  	// 恢复
 	  	permit = orderItem.orderType == 2 ? ['gxt:maintenance:order:resume'] : ['gxt:repairOrder:resume']
+	  } else {
+		  return false
 	  }
 	  
 	  // const orderType = (item as acceptOrderInfo).orderType