# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
wuweihua
2026-10-27 10:31:58 +08:00
@@ -536,8 +536,7 @@ async function runLocalRebill(payload, confirmText) {
rebillProgressTotal.value = Number(task && task.total) || rebillProgressTotal.value rebillProgressTotal.value = Number(task && task.total) || rebillProgressTotal.value
rebillProgressSuccess.value = success rebillProgressSuccess.value = success
rebillProgressFail.value = fail rebillProgressFail.value = fail
rebillProgressMessage.value = '完成:成功 ' + success + ' / 失败 ' + fail + rebillProgressMessage.value = '完成:成功 ' + success + ' / 失败 ' + fail
(fail && task.error ? (';' + task.error) : '')
tableRef.value?.refresh?.() tableRef.value?.refresh?.()
} catch (e) { } catch (e) {
const task = e && e.task const task = e && e.task
@@ -563,8 +562,8 @@ function openFilterRebill() {
ElMessage.warning('请输入单号,或选择客户并选择计费时间或提货时间后再重新计费;也可勾选订单后点重新计费选中') ElMessage.warning('请输入单号,或选择客户并选择计费时间或提货时间后再重新计费;也可勾选订单后点重新计费选中')
return return
} }
if (identifiers.length > MAX_REBILL) { if (identifiers.length > MAX_ORDER_IDENTIFIERS) {
ElMessage.warning('单次最多重新计费 ' + MAX_REBILL + ' 个单号') ElMessage.warning('单次最多重新计费 ' + MAX_ORDER_IDENTIFIERS + ' 个单号')
return return
} }
let confirmText let confirmText