{
@@ -303,6 +338,7 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
return `${apiBase}/templates`;
})();
loading = false;
+ exporting = false;
isSysAdmin = false;
isGestor = false;
isClientRestricted = false;
@@ -378,6 +414,12 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
};
reservaTransferLastResult: AssignReservaLinesResultDto | null = null;
moveToReservaLastResult: AssignReservaLinesResultDto | null = null;
+ batchStatusOpen = false;
+ batchStatusSaving = false;
+ batchStatusAction: BatchStatusAction = 'BLOCK';
+ batchStatusType = '';
+ batchStatusUsuario = '';
+ batchStatusLastResult: BatchLineStatusUpdateResultDto | null = null;
detailData: any = null;
financeData: any = null;
@@ -609,6 +651,46 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
return this.hasGroupLineSelectionTools && !this.isReservaExpandedGroup && !this.isExpandedGroupNamedReserva;
}
+ get blockedStatusOptions(): string[] {
+ return this.statusOptions.filter((status) => !this.isActiveStatus(status));
+ }
+
+ get batchStatusSelectionCount(): number {
+ return this.reservaSelectedCount;
+ }
+
+ get canOpenBatchStatusModal(): boolean {
+ if (this.isClientRestricted) return false;
+ if (this.loading || this.batchStatusSaving) return false;
+ return this.batchStatusSelectionCount > 0;
+ }
+
+ get canSubmitBatchStatusModal(): boolean {
+ if (this.batchStatusSaving) return false;
+ if (this.batchStatusSelectionCount <= 0) return false;
+ if (this.batchStatusAction === 'BLOCK' && !String(this.batchStatusType ?? '').trim()) return false;
+ return true;
+ }
+
+ get batchStatusActionLabel(): string {
+ return this.batchStatusAction === 'BLOCK' ? 'Bloquear' : 'Desbloquear';
+ }
+
+ get batchStatusTargetDescription(): string {
+ return `${this.batchStatusSelectionCount} linha(s) selecionada(s)`;
+ }
+
+ get batchStatusUserOptions(): string[] {
+ const users = (this.groupLines ?? [])
+ .map((x) => (x.usuario ?? '').toString().trim())
+ .filter((x) => !!x);
+
+ const current = (this.batchStatusUsuario ?? '').toString().trim();
+ if (current) users.push(current);
+
+ return Array.from(new Set(users)).sort((a, b) => a.localeCompare(b, 'pt-BR', { sensitivity: 'base' }));
+ }
+
get reservaSelectedCount(): number {
return this.reservaSelectedLineIds.length;
}
@@ -823,7 +905,15 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
// ✅ FIX PRINCIPAL: limpeza forçada de backdrops/scroll lock
// ============================================================
private anyModalOpen(): boolean {
- return !!(this.detailOpen || this.financeOpen || this.editOpen || this.createOpen || this.reservaTransferOpen || this.moveToReservaOpen);
+ return !!(
+ this.detailOpen ||
+ this.financeOpen ||
+ this.editOpen ||
+ this.createOpen ||
+ this.reservaTransferOpen ||
+ this.moveToReservaOpen ||
+ this.batchStatusOpen
+ );
}
private cleanupModalArtifacts() {
@@ -851,6 +941,7 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
this.createOpen = false;
this.reservaTransferOpen = false;
this.moveToReservaOpen = false;
+ this.batchStatusOpen = false;
this.detailData = null;
this.financeData = null;
@@ -869,8 +960,11 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
this.batchExcelTemplateDownloading = false;
this.reservaTransferSaving = false;
this.moveToReservaSaving = false;
+ this.batchStatusSaving = false;
this.reservaTransferLastResult = null;
this.moveToReservaLastResult = null;
+ this.batchStatusLastResult = null;
+ this.batchStatusUsuario = '';
// Limpa overlays/locks residuais
this.cleanupModalArtifacts();
@@ -1800,6 +1894,225 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
this.refreshData();
}
+ async onExport(): Promise
{
+ if (this.exporting) return;
+ this.exporting = true;
+
+ try {
+ const baseRows = await this.getRowsForExport();
+ const rows = await this.getDetailedRowsForExport(baseRows);
+ if (!rows.length) {
+ await this.showToast('Nenhum registro encontrado para exportar.');
+ return;
+ }
+
+ const suffix = this.getExportFilterSuffix();
+ const timestamp = this.tableExportService.buildTimestamp();
+ const fileName = `geral_${suffix}_${timestamp}`;
+ const templateBuffer = await this.getGeralTemplateBuffer();
+
+ await this.tableExportService.exportAsXlsx({
+ fileName,
+ sheetName: 'Geral',
+ templateBuffer,
+ rows,
+ columns: [
+ { header: 'ID', value: (row) => row.id },
+ { header: 'Item', type: 'number', value: (row) => this.toInt(row.item) },
+ { header: 'Empresa (Conta)', value: (row) => this.findEmpresaByConta(row.conta) },
+ { header: 'Conta', value: (row) => row.conta ?? '' },
+ { header: 'Linha', value: (row) => row.linha ?? '' },
+ { header: 'Chip', value: (row) => row.chip ?? '' },
+ { header: 'Tipo de Chip', value: (row) => row.tipoDeChip ?? '' },
+ { header: 'Cliente', value: (row) => row.cliente ?? '' },
+ { header: 'Usuario', value: (row) => row.usuario ?? '' },
+ { header: 'Centro de Custos', value: (row) => row.centroDeCustos ?? '' },
+ { header: 'Setor ID', value: (row) => row.setorId ?? '' },
+ { header: 'Setor', value: (row) => row.setorNome ?? '' },
+ { header: 'Aparelho ID', value: (row) => row.aparelhoId ?? '' },
+ { header: 'Aparelho', value: (row) => row.aparelhoNome ?? '' },
+ { header: 'Cor do Aparelho', value: (row) => row.aparelhoCor ?? '' },
+ { header: 'IMEI do Aparelho', value: (row) => row.aparelhoImei ?? '' },
+ { header: 'NF do Aparelho (anexo)', type: 'boolean', value: (row) => !!row.aparelhoNotaFiscalTemArquivo },
+ { header: 'Recibo do Aparelho (anexo)', type: 'boolean', value: (row) => !!row.aparelhoReciboTemArquivo },
+ { header: 'Plano Contrato', value: (row) => row.planoContrato ?? '' },
+ { header: 'Status', value: (row) => row.status ?? '' },
+ { header: 'Tipo (Skil)', value: (row) => row.skil ?? '' },
+ { header: 'Modalidade', value: (row) => row.modalidade ?? '' },
+ { header: 'Cedente', value: (row) => row.cedente ?? '' },
+ { header: 'Solicitante', value: (row) => row.solicitante ?? '' },
+ { header: 'Data de Bloqueio', type: 'date', value: (row) => row.dataBloqueio ?? '' },
+ { header: 'Data Entrega Operadora', type: 'date', value: (row) => row.dataEntregaOpera ?? '' },
+ { header: 'Data Entrega Cliente', type: 'date', value: (row) => row.dataEntregaCliente ?? '' },
+ { header: 'Dt. Efetivacao Servico', type: 'date', value: (row) => row.dtEfetivacaoServico ?? '' },
+ { header: 'Dt. Termino Fidelizacao', type: 'date', value: (row) => row.dtTerminoFidelizacao ?? '' },
+ { header: 'Vencimento da Conta', value: (row) => row.vencConta ?? '' },
+ { header: 'Franquia Vivo', type: 'number', value: (row) => this.toNullableNumber(row.franquiaVivo) ?? 0 },
+ { header: 'Valor Plano Vivo', type: 'currency', value: (row) => this.toNullableNumber(row.valorPlanoVivo) ?? 0 },
+ { header: 'Gestao Voz e Dados', type: 'currency', value: (row) => this.toNullableNumber(row.gestaoVozDados) ?? 0 },
+ { header: 'Skeelo', type: 'currency', value: (row) => this.toNullableNumber(row.skeelo) ?? 0 },
+ { header: 'Vivo News Plus', type: 'currency', value: (row) => this.toNullableNumber(row.vivoNewsPlus) ?? 0 },
+ { header: 'Vivo Travel Mundo', type: 'currency', value: (row) => this.toNullableNumber(row.vivoTravelMundo) ?? 0 },
+ { header: 'Vivo Gestao Dispositivo', type: 'currency', value: (row) => this.toNullableNumber(row.vivoGestaoDispositivo) ?? 0 },
+ { header: 'Vivo Sync', type: 'currency', value: (row) => this.toNullableNumber(row.vivoSync) ?? 0 },
+ { header: 'Valor Contrato Vivo', type: 'currency', value: (row) => this.toNullableNumber(row.valorContratoVivo) ?? 0 },
+ { header: 'Franquia Line', type: 'number', value: (row) => this.toNullableNumber(row.franquiaLine) ?? 0 },
+ { header: 'Franquia Gestao', type: 'number', value: (row) => this.toNullableNumber(row.franquiaGestao) ?? 0 },
+ { header: 'Locacao AP', type: 'currency', value: (row) => this.toNullableNumber(row.locacaoAp) ?? 0 },
+ { header: 'Valor Contrato Line', type: 'currency', value: (row) => this.toNullableNumber(row.valorContratoLine) ?? 0 },
+ { header: 'Desconto', type: 'currency', value: (row) => this.toNullableNumber(row.desconto) ?? 0 },
+ { header: 'Lucro', type: 'currency', value: (row) => this.toNullableNumber(row.lucro) ?? 0 },
+ { header: 'Criado Em', type: 'datetime', value: (row) => this.getAnyField(row, ['createdAt', 'CreatedAt']) ?? '' },
+ { header: 'Atualizado Em', type: 'datetime', value: (row) => this.getAnyField(row, ['updatedAt', 'UpdatedAt']) ?? '' },
+ ],
+ });
+
+ await this.showToast(`Planilha exportada com ${rows.length} registro(s).`);
+ } catch {
+ await this.showToast('Erro ao exportar a planilha.');
+ } finally {
+ this.exporting = false;
+ }
+ }
+
+ private async getRowsForExport(): Promise {
+ let lines = await this.fetchLinesForGrouping();
+
+ if (this.selectedClients.length > 0) {
+ const selected = new Set(
+ this.selectedClients.map((client) => (client ?? '').toString().trim().toUpperCase())
+ );
+ lines = lines.filter((line) => selected.has((line.cliente ?? '').toString().trim().toUpperCase()));
+ }
+
+ const fallbackClient = this.filterSkil === 'RESERVA' ? 'RESERVA' : 'SEM CLIENTE';
+ const mapped = lines.map((line) => ({
+ id: (line.id ?? '').toString(),
+ item: String(line.item ?? ''),
+ linha: line.linha ?? '',
+ chip: line.chip ?? '',
+ cliente: ((line.cliente ?? '').toString().trim()) || fallbackClient,
+ usuario: line.usuario ?? '',
+ centroDeCustos: line.centroDeCustos ?? '',
+ setorNome: line.setorNome ?? '',
+ aparelhoNome: line.aparelhoNome ?? '',
+ aparelhoCor: line.aparelhoCor ?? '',
+ status: line.status ?? '',
+ skil: line.skil ?? '',
+ contrato: line.vencConta ?? '',
+ }));
+
+ return mapped.sort((a, b) => {
+ const byClient = (a.cliente ?? '').localeCompare(b.cliente ?? '', 'pt-BR', { sensitivity: 'base' });
+ if (byClient !== 0) return byClient;
+
+ const byItem = this.toInt(a.item) - this.toInt(b.item);
+ if (byItem !== 0) return byItem;
+
+ return (a.linha ?? '').localeCompare(b.linha ?? '', 'pt-BR', { sensitivity: 'base' });
+ });
+ }
+
+ private async getDetailedRowsForExport(baseRows: LineRow[]): Promise {
+ if (!baseRows.length) return [];
+
+ const result: ApiLineDetail[] = [];
+ const chunkSize = 8;
+
+ for (let i = 0; i < baseRows.length; i += chunkSize) {
+ const chunk = baseRows.slice(i, i + chunkSize);
+ const fetched = await Promise.all(
+ chunk.map(async (row) => {
+ try {
+ return await firstValueFrom(
+ this.http.get(`${this.apiBase}/${row.id}`, {
+ params: this.withNoCache(new HttpParams()),
+ })
+ );
+ } catch {
+ return this.toDetailFallback(row);
+ }
+ })
+ );
+
+ result.push(...fetched);
+ }
+
+ return result;
+ }
+
+ private toDetailFallback(row: LineRow): ApiLineDetail {
+ return {
+ id: row.id,
+ item: this.toInt(row.item),
+ qtdLinhas: null,
+ conta: row.contrato ?? null,
+ linha: row.linha ?? null,
+ chip: row.chip ?? null,
+ tipoDeChip: null,
+ cliente: row.cliente ?? null,
+ usuario: row.usuario ?? null,
+ centroDeCustos: row.centroDeCustos ?? null,
+ setorId: null,
+ setorNome: row.setorNome ?? null,
+ aparelhoId: null,
+ aparelhoNome: row.aparelhoNome ?? null,
+ aparelhoCor: row.aparelhoCor ?? null,
+ aparelhoImei: null,
+ aparelhoNotaFiscalTemArquivo: false,
+ aparelhoReciboTemArquivo: false,
+ planoContrato: null,
+ status: row.status ?? null,
+ skil: row.skil ?? null,
+ modalidade: null,
+ dataBloqueio: null,
+ cedente: null,
+ solicitante: null,
+ dataEntregaOpera: null,
+ dataEntregaCliente: null,
+ dtEfetivacaoServico: null,
+ dtTerminoFidelizacao: null,
+ vencConta: row.contrato ?? null,
+ franquiaVivo: null,
+ valorPlanoVivo: null,
+ gestaoVozDados: null,
+ skeelo: null,
+ vivoNewsPlus: null,
+ vivoTravelMundo: null,
+ vivoGestaoDispositivo: null,
+ vivoSync: null,
+ valorContratoVivo: null,
+ franquiaLine: null,
+ franquiaGestao: null,
+ locacaoAp: null,
+ valorContratoLine: null,
+ desconto: null,
+ lucro: null,
+ };
+ }
+
+ private async getGeralTemplateBuffer(): Promise {
+ try {
+ const params = new HttpParams().set('_', `${Date.now()}`);
+ const blob = await firstValueFrom(
+ this.http.get(`${this.templatesApiBase}/planilha-geral`, {
+ params,
+ responseType: 'blob',
+ })
+ );
+ return await blob.arrayBuffer();
+ } catch {
+ return null;
+ }
+ }
+
+ private getExportFilterSuffix(): string {
+ if (this.filterSkil === 'PF') return 'pf';
+ if (this.filterSkil === 'PJ') return 'pj';
+ if (this.filterSkil === 'RESERVA') return 'reserva';
+ return 'todas';
+ }
+
async onImportExcel() {
if (!this.isSysAdmin) {
await this.showToast('Você não tem permissão para importar planilha.');
@@ -3167,6 +3480,116 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
this.reservaSelectedLineIds = [];
}
+ async openBatchStatusModal(action: BatchStatusAction) {
+ if (this.isClientRestricted) {
+ await this.showToast('Você não tem permissão para bloquear/desbloquear em lote.');
+ return;
+ }
+
+ if (this.batchStatusSelectionCount <= 0) {
+ await this.showToast('Selecione ao menos uma linha para processar.');
+ return;
+ }
+
+ this.batchStatusAction = action;
+ this.batchStatusSaving = false;
+ this.batchStatusLastResult = null;
+ this.batchStatusUsuario = '';
+
+ if (action === 'BLOCK') {
+ const current = (this.batchStatusType ?? '').toString().trim();
+ const options = this.blockedStatusOptions;
+ if (!current || !options.some((x) => x === current)) {
+ this.batchStatusType = options[0] ?? '';
+ }
+ } else {
+ this.batchStatusType = '';
+ }
+
+ this.batchStatusOpen = true;
+ this.cdr.detectChanges();
+ }
+
+ async submitBatchStatusUpdate() {
+ if (this.batchStatusSaving) return;
+ if (!this.canSubmitBatchStatusModal) return;
+
+ const payload = this.buildBatchStatusPayload();
+ this.batchStatusSaving = true;
+
+ this.http.post(`${this.apiBase}/batch-status-update`, payload).subscribe({
+ next: async (res) => {
+ this.batchStatusSaving = false;
+ this.batchStatusLastResult = res;
+
+ const ok = Number(res?.updated ?? 0) || 0;
+ const failed = Number(res?.failed ?? 0) || 0;
+
+ this.batchStatusOpen = false;
+ this.clearReservaSelection();
+ this.batchStatusUsuario = '';
+
+ await this.showToast(
+ failed > 0
+ ? `${this.batchStatusActionLabel} em lote concluído com pendências: ${ok} linha(s) processada(s), ${failed} falha(s).`
+ : `${this.batchStatusActionLabel} em lote concluído: ${ok} linha(s) processada(s).`
+ );
+
+ if (this.expandedGroup) {
+ const term = (this.searchTerm ?? '').trim();
+ const useTerm = term && this.isSpecificSearchTerm(term) ? term : undefined;
+ this.fetchGroupLines(this.expandedGroup, useTerm);
+ }
+
+ this.loadGroups();
+ this.loadKpis();
+ },
+ error: async (err: HttpErrorResponse) => {
+ this.batchStatusSaving = false;
+ const msg = (err.error as any)?.message || 'Erro ao processar bloqueio/desbloqueio em lote.';
+ await this.showToast(msg);
+ }
+ });
+ }
+
+ private buildBatchStatusPayload(): BatchLineStatusUpdateRequestDto {
+ const clients = this.searchResolvedClient
+ ? [this.searchResolvedClient]
+ : [...this.selectedClients];
+
+ const normalizedClients = clients
+ .map((x) => (x ?? '').toString().trim())
+ .filter((x) => !!x);
+
+ const userFilter = (this.batchStatusUsuario ?? '').toString().trim();
+
+ return {
+ action: this.batchStatusAction === 'BLOCK' ? 'block' : 'unblock',
+ blockStatus: this.batchStatusAction === 'BLOCK' ? (this.batchStatusType || null) : null,
+ applyToAllFiltered: false,
+ lineIds: [...this.reservaSelectedLineIds],
+ search: (this.searchTerm ?? '').toString().trim() || null,
+ skil: this.resolveFilterSkilForApi(),
+ clients: normalizedClients,
+ additionalMode: this.resolveAdditionalModeForApi(),
+ additionalServices: this.selectedAdditionalServices.length > 0 ? this.selectedAdditionalServices.join(',') : null,
+ usuario: userFilter || null
+ };
+ }
+
+ private resolveFilterSkilForApi(): string | null {
+ if (this.filterSkil === 'PF') return 'PESSOA FÍSICA';
+ if (this.filterSkil === 'PJ') return 'PESSOA JURÍDICA';
+ if (this.filterSkil === 'RESERVA') return 'RESERVA';
+ return null;
+ }
+
+ private resolveAdditionalModeForApi(): string | null {
+ if (this.additionalMode === 'WITH') return 'with';
+ if (this.additionalMode === 'WITHOUT') return 'without';
+ return null;
+ }
+
async openReservaTransferModal() {
if (!this.isReservaExpandedGroup) {
await this.showToast('Abra um grupo no filtro Reserva para selecionar e atribuir linhas.');
@@ -3588,6 +4011,12 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
return v || '-';
}
+ private isActiveStatus(status: string | null | undefined): boolean {
+ const normalized = (status ?? '').toString().trim().toLowerCase();
+ if (!normalized) return false;
+ return normalized.includes('ativo');
+ }
+
private toEditModel(d: ApiLineDetail): any {
return {
...d,
@@ -3660,6 +4089,16 @@ export class Geral implements OnInit, AfterViewInit, OnDestroy {
return Number.isNaN(n) ? null : n;
}
+ private getAnyField(row: unknown, keys: string[]): unknown {
+ const source = row as Record;
+ for (const key of keys) {
+ if (source && source[key] !== undefined && source[key] !== null && source[key] !== '') {
+ return source[key];
+ }
+ }
+ return null;
+ }
+
private mergeOption(current: any, list: string[]): string[] {
const v = (current ?? '').toString().trim();
if (!v) return list;
diff --git a/src/app/pages/historico/historico.html b/src/app/pages/historico/historico.html
index e01f1e8..9cc9940 100644
--- a/src/app/pages/historico/historico.html
+++ b/src/app/pages/historico/historico.html
@@ -33,6 +33,10 @@
+