支持按提货时间重新计费

bms-front/src/views/price/orderBill/index.vue

@@ -410,7 +410,9 @@ function buildRebillFilter() {
     orderStatuses: Array.isArray(q.orderStatuses) ? q.orderStatuses : [],
     billingFailStatuses: Array.isArray(q.billingFailStatuses) ? q.billingFailStatuses : [],
     beginBizDate: q.params?.beginBizDate || null,
-    endBizDate: q.params?.endBizDate || null
+    endBizDate: q.params?.endBizDate || null,
+    beginPickupDate: q.params?.beginPickupDate || null,
+    endPickupDate: q.params?.endPickupDate || null
   }
   return filter
 }
@@ -420,7 +422,8 @@ function hasRebillFilter(filter) {
   if (ids.length) return true
   const hasCustomer = Array.isArray(filter.customerCodes) && filter.customerCodes.length > 0
   const hasBizDate = !!(filter.beginBizDate && filter.endBizDate)
-  return hasCustomer && hasBizDate
+  const hasPickupDate = !!(filter.beginPickupDate && filter.endPickupDate)
+  return hasCustomer && (hasBizDate || hasPickupDate)
 }
 
 function buildCheckQuery() {
@@ -507,7 +510,7 @@ function openFilterRebill() {
   const identifiers = filter.orderIdentifiers || []
   if (!validateOrderIdentifierLimit(identifiers)) return
   if (!hasRebillFilter(filter)) {
-    ElMessage.warning('请输入单号，或选择客户并选择计费时间后再重新计费；也可勾选订单后点重新计费选中')
+    ElMessage.warning('请输入单号，或选择客户并选择计费时间或提货时间后再重新计费；也可勾选订单后点重新计费选中')
     return
   }
   if (identifiers.length > MAX_REBILL) {
@@ -518,7 +521,7 @@ function openFilterRebill() {
   if (identifiers.length) {
     confirmText = '将按 ' + identifiers.length + ' 个单号从本地订单表重新计费（不查上游），确认继续？'
   } else {
-    confirmText = '将按当前列表筛选（客户 + 计费时间等）从本地订单表重新计费（不查上游），确认继续？'
+    confirmText = '将按当前列表筛选（客户 + 计费时间/提货时间等）从本地订单表重新计费（不查上游），确认继续？'
   }
   runLocalRebill(filter, confirmText)
 }