${esc(no)}
${t('destination')}${esc(saved?.destinationCode||plan.destinationCode)}
${t('cartonCount')}${saved?.items.length||0}
${esc(message)}
`;clearTimeout(toastTimer);toastTimer=setTimeout(()=>root.innerHTML='',2600);}
+function palletPhotoKey(palletId){return palletId||state.pallet?.id||`DRAFT-${state.selectedPlanId||'pallet'}`;}
+function palletPhotoItems(palletId){return state.palletPhotos[palletPhotoKey(palletId)]||[];}
+function openPalletPhotos(palletId,planId){if(planId)state.selectedPlanId=planId;state.photoPalletId=palletId;state.page='photo-detail';render();}
+function handlePalletPhoto(input){const file=input.files&&input.files[0];if(!file)return;const key=palletPhotoKey(state.photoPalletId||state.pallet?.id);const reader=new FileReader();reader.onload=()=>{state.palletPhotos[key]??=[];state.palletPhotos[key].push(reader.result);state.photoPalletId=key;render()};reader.readAsDataURL(file);}
+function photoCaptureButton(){return ``;}
+function photoListMarkup(palletId){const photos=palletPhotoItems(palletId);return photos.length?`${photos.map((src,index)=>`
${t('photoItem')} ${index+1}`).join('')}
`:`${t('noPhotos')}
`;}
+function photoDetailView(){const key=state.photoPalletId||palletPhotoKey();const saved=state.pallets.find(x=>x.id===key);const plan=plans.find(x=>x.id===saved?.planId)||selectedPlan();return layout(`${t('photoDetails')}
${esc(key)} · ${esc(saved?.destinationCode||plan?.destinationCode||'—')}
${photoCaptureButton()}
${t('sitePhotos')}
${t('palletPhotoHint')}
${photoCaptureButton()}
`;const bottom=root.querySelector('.bottom-bar');if(bottom)root.insertBefore(section,bottom);else root.appendChild(section);}
function injectReservedEntries(){if(state.page!=='workbench')return;const grids=document.querySelectorAll('.entry-grid');const grid=grids[grids.length-1];if(!grid)return;const more=grid.querySelectorAll('.entry')[1];if(more)more.style.display='none';grid.insertAdjacentHTML('beforeend',``);}
function injectInboundPalletUnits(){if(state.page!=='workbench')return;const inbound=document.querySelectorAll('.entry-grid')[0];const entries=inbound?.querySelectorAll('.entry');if(inbound&&entries?.[1]&&entries?.[0]){inbound.insertBefore(entries[1],entries[0]);entries[1].classList.add('receive-entry');}document.querySelectorAll('.task-strip .task-main p').forEach((el,index)=>{const p=plans.filter(x=>x.status==='待卸货')[index];if(p)el.textContent=`${p.customer} · ${p.destinationCode} · ${p.expectedPallets} ${t('palletCount')}`});}
function injectOutboundEntryUnits(){if(state.page!=='workbench')return;document.querySelectorAll('.entry-grid')[1]?.classList.add('outbound-entry-grid');}
@@ -411,6 +429,26 @@ Object.assign(EXTRA_LABELS.es,{vehicleType:'Tipo de vehículo',vehicleTypeValue:
Object.assign(EXTRA_LABELS.zh,{skipReasonTitle:'跳拣原因',skipReasonNotFound:'未找到其他货物',skipReasonOutOfStock:'缺货',skipReasonOther:'其他'});
Object.assign(EXTRA_LABELS.en,{skipReasonTitle:'Skip reason',skipReasonNotFound:'No other freight found',skipReasonOutOfStock:'Out of stock',skipReasonOther:'Other'});
Object.assign(EXTRA_LABELS.es,{skipReasonTitle:'Motivo de omisión',skipReasonNotFound:'No se encontró otra carga',skipReasonOutOfStock:'Sin stock',skipReasonOther:'Otro'});
+Object.assign(EXTRA_LABELS.zh,{photoDetails:'照片明细',sitePhotos:'现场照片',photoItem:'照片',noPhotos:'暂无照片',palletPhotoHint:'查看或拍摄托盘现场照片'});
+Object.assign(EXTRA_LABELS.en,{photoDetails:'Photo details',sitePhotos:'Site photos',photoItem:'Photo',noPhotos:'No photos yet',palletPhotoHint:'View or capture pallet site photos'});
+Object.assign(EXTRA_LABELS.es,{photoDetails:'Detalles de fotos',sitePhotos:'Fotos en sitio',photoItem:'Foto',noPhotos:'Aún no hay fotos',palletPhotoHint:'Ver o capturar fotos del pallet'});
+Object.assign(EXTRA_LABELS.zh,{newConsolidation:'新增合托',noConsolidationPallets:'暂无合托托盘',reconsolidate:'重新合托',submitConsolidation:'提交合托',consolidationUpdated:'合托已更新'});
+Object.assign(EXTRA_LABELS.en,{newConsolidation:'New consolidation',noConsolidationPallets:'No consolidated pallets',reconsolidate:'Re-consolidate',submitConsolidation:'Submit consolidation',consolidationUpdated:'Consolidation updated'});
+Object.assign(EXTRA_LABELS.es,{newConsolidation:'Nueva consolidación',noConsolidationPallets:'No hay pallets consolidados',reconsolidate:'Reconsolidar',submitConsolidation:'Enviar consolidación',consolidationUpdated:'Consolidación actualizada'});
+const basePalletListView=palletListView;
+palletListView=function(){const consolidating=state.palletMode==='consolidate';if(!consolidating)return basePalletListView();const created=consolidating ? state.pallets.filter(pallet=>pallet.mode==='consolidate') : [];return layout(`${created.length?`${created.map(pallet=>{const sourcePlan=plans.find(plan=>plan.id===pallet.items[0]?.planNo);return `${t('occupied')} `}).join('')}
`:`${esc(pallet.id)}
${t('destination')}${esc(pallet.destinationCode||'—')}
${t('cartonCount')}${pallet.items.length}
${t('noConsolidationPallets')}
`}`,t('mergeOnly'),t('mergeDesc'),'workbench');};
+function startNewConsolidation(){state.palletMode='consolidate';state.pallet=null;state.palletMessage=null;state.photoPalletId='';startPallet();}
+function reconsolidatePallet(palletId){const saved=state.pallets.find(pallet=>pallet.id===palletId&&pallet.mode==='consolidate');if(!saved)return;state.palletMode='consolidate';state.pallet={...JSON.parse(JSON.stringify(saved)),originalPalletId:palletId};state.palletMessage=null;state.photoPalletId='';state.page='pallet';render();}
+function submitConsolidation(){if(!state.pallet?.items.length){state.palletMessage={type:'error',text:t('emptyPallet')};render();return}const originalPalletId=state.pallet.originalPalletId;const originalIndex=state.pallets.findIndex(pallet=>pallet.id===originalPalletId);if(originalIndex<0){submitPallet();return}const updated=JSON.parse(JSON.stringify(state.pallet));delete updated.originalPalletId;delete updated.persisted;state.pallets[originalIndex]=updated;updated.items.forEach(item=>{const source=cargo.find(c=>c.id===item.id);if(source)source.palletNo=updated.id});state.pallet=null;state.palletMessage=null;toast(t('consolidationUpdated'),'good');state.page='pallet-list';render();}
+photoCaptureButton=function(id='pallet-photo-capture-input'){return ``;};
+photoAddButton=function(){const id='pallet-site-photo-input';return ``;};
+photoDetailView=function(){const key=state.photoPalletId||palletPhotoKey();const saved=state.pallets.find(x=>x.id===key);const plan=plans.find(x=>x.id===saved?.planId)||selectedPlan();return layout(`${t('photoDetails')}
${esc(key)} · ${esc(saved?.destinationCode||plan?.destinationCode||'—')}
${photos.map((src,index)=>`${t('photoItem')} ${index+1}`).join('')}
`:'';const section=document.createElement('section');section.className='work-card pallet-site-photos';section.innerHTML=`${t('sitePhotos')}
${t('palletPhotoHint')}
${photoAddButton()}
`;const bottom=root.querySelector('.bottom-bar');if(bottom)root.insertBefore(section,bottom);else root.appendChild(section);};
+injectPalletListPhotoButtons=function(){if(state.page!=='pallet-list')return;document.querySelectorAll('.list-card .card-actions').forEach(actions=>{actions.querySelector('.btn.ghost')?.style.setProperty('margin-right','auto');});};
+function injectReconsolidationSubmit(){if(state.page!=='pallet'||!state.pallet?.originalPalletId)return;const button=document.querySelector('.bottom-bar .btn.primary');if(!button)return;button.textContent=t('submitConsolidation');button.disabled=!state.pallet.items.length;button.onclick=submitConsolidation;}
+function injectCurrentPalletCleanup(){if(state.page!=='pallet'||!state.pallet)return;document.querySelector('.content > .work-card:first-child .work-head > .status')?.remove();}
+const baseRender=render;
+render=function(){if(state.page==='photo-detail'){document.getElementById('app').innerHTML=photoDetailView();injectIconReplacements();document.documentElement.lang=state.lang==='zh'?'zh-CN':state.lang==='es'?'es':'en';return}baseRender();injectPalletListPhotoButtons();injectPalletPhotoFeatures();injectReconsolidationSubmit();injectCurrentPalletCleanup();};
render();
diff --git a/悦/货代SAAS平台后台/index.html b/悦/货代SAAS平台后台/index.html
index 59030e4..7d9c5e1 100644
--- a/悦/货代SAAS平台后台/index.html
+++ b/悦/货代SAAS平台后台/index.html
@@ -598,6 +598,10 @@ body.dashboard-fullscreen #page-dashboard>.table-card .btn{padding:4px 10px;font
.dispatch-exception-actions a:hover{text-decoration:underline}
.dispatch-exception-actions a.danger{color:#dc2626}
.dispatch-exception-process-note{padding:10px 12px;border:1px solid #fde68a;border-radius:6px;background:#fffbeb;color:#92400e;font-size:12px;line-height:1.5;margin-bottom:14px}
+.customer-followup-file{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:8px 10px;border:1px solid #e5e7eb;border-radius:6px;background:#fff}
+.customer-followup-file-name{min-width:0;overflow:hidden;color:#374151;font-size:12px;text-overflow:ellipsis;white-space:nowrap}
+.customer-followup-file-meta{display:block;margin-top:2px;color:#9ca3af;font-size:11px}
+.customer-followup-file-delete{flex:0 0 auto;padding:3px 7px;border:1px solid #fecaca;border-radius:4px;background:#fff;color:#b91c1c;font-size:11px;cursor:pointer}
.dispatch-doc-cell{width:312px;min-width:312px;padding:2px 0}
.dispatch-doc-summary{display:flex;align-items:center;justify-content:space-between;gap:8px;margin-bottom:7px}
.dispatch-doc-count{font-size:11px;font-weight:600;color:#374151;white-space:nowrap}
@@ -651,7 +655,7 @@ body.dashboard-fullscreen #page-dashboard>.table-card .btn{padding:4px 10px;font
.warehouse-page-tab:hover{color:#1677ff;background:#f7faff}
.warehouse-page-tab.active{border-bottom-color:#1677ff;color:#1677ff;font-weight:650}
.warehouse-page-tab:focus-visible{outline:2px solid #1677ff;outline-offset:2px}
-#page-gen-owned-warehouse .warehouse-table-wrap,#page-gen-fba .warehouse-table-wrap,#page-gen-partner-warehouse .warehouse-table-wrap{width:100%;overflow-x:auto}
+#page-gen-owned-warehouse .warehouse-table-wrap,#page-gen-fba .warehouse-table-wrap,#page-gen-partner-warehouse .warehouse-table-wrap,#page-gen-private-warehouse .warehouse-table-wrap{width:100%;overflow-x:auto}
.warehouse-table-wrap table{min-width:1040px}
.vehicle-owner-tabs{display:inline-flex;align-items:center;margin:14px 0 12px;padding:3px;border:1px solid #dfe5ee;border-radius:6px;background:#f4f6f9}
.vehicle-owner-tab{min-width:104px;height:32px;padding:0 16px;border:0;border-radius:4px;background:transparent;color:#5f6b7a;font-size:13px;cursor:pointer}
@@ -682,7 +686,7 @@ body.dashboard-fullscreen #page-dashboard>.table-card .btn{padding:4px 10px;font
.vehicle-detail-relation.is-current{color:#1677ff;background:#eaf3ff}
.vehicle-detail-relation.is-history{color:#64748b;background:#f1f5f9}
@media(max-width:900px){.vehicle-detail-head{align-items:flex-start;flex-direction:column;padding:16px 18px}.vehicle-detail-head .btn{align-self:flex-end}.vehicle-detail-body{padding:16px 18px 20px}.vehicle-detail-grid{grid-template-columns:1fr}.vehicle-region-tabs{overflow-x:auto}.vehicle-region-tab,.warehouse-page-tab{flex:1;min-width:104px;padding:0 14px}}
-@media(max-width:700px){.dispatch-doc-modal-meta,.dispatch-reject-meta{grid-template-columns:1fr}.dispatch-reject-meta>div:first-child{grid-column:auto}.dispatch-doc-row{grid-template-columns:1fr}.dispatch-doc-controls{justify-content:flex-start}.vehicle-detail-field{grid-template-columns:96px minmax(0,1fr)}.vehicle-detail-empty{position:sticky;left:0;background:#fff;text-align:left!important}}
+@media(max-width:700px){.dispatch-doc-modal-meta,.dispatch-reject-meta,.customer-followup-modal-meta{grid-template-columns:1fr!important}.dispatch-reject-meta>div:first-child{grid-column:auto}.customer-followup-modal-meta>div{grid-column:auto!important}.dispatch-doc-row{grid-template-columns:1fr}.dispatch-doc-controls{justify-content:flex-start}.vehicle-detail-field{grid-template-columns:96px minmax(0,1fr)}.vehicle-detail-empty{position:sticky;left:0;background:#fff;text-align:left!important}}
.inbound-action-row{display:flex;gap:8px;margin-top:12px;padding-top:12px;border-top:1px solid #e5e7eb}
.inbound-action-row .btn{padding:7px 14px;font-size:12px;border-radius:4px;font-weight:600}
.inbound-button-group{display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap}
@@ -981,6 +985,61 @@ body.dashboard-fullscreen #page-dashboard>.table-card .btn{padding:4px 10px;font
#booking-print-sheet{display:block!important;position:absolute!important;left:0!important;top:0!important;width:210mm!important;height:297mm!important;margin:0!important}
#booking-print-sheet>.booking-print-sheet{display:block!important;width:210mm!important;min-height:297mm!important;margin:0!important;transform:none!important;box-shadow:none!important}
}
+/* ===== 派送单 BOL 模板打印 ===== */
+.dispatch-bol-print-modal{padding:20px;box-sizing:border-box;background:rgba(15,23,42,.58)}
+.dispatch-bol-print-panel{width:min(1120px,96vw);height:min(94vh,980px);max-width:1120px;max-height:94vh;display:flex;flex-direction:column;overflow:hidden;background:#fff;border-radius:10px;box-shadow:0 18px 48px rgba(15,23,42,.24)}
+.dispatch-bol-print-toolbar{min-height:64px;display:flex;align-items:center;justify-content:space-between;gap:16px;padding:12px 18px;border-bottom:1px solid #e5e7eb;background:#fff;box-sizing:border-box}
+.dispatch-bol-print-toolbar>div:first-child{display:grid;gap:3px;min-width:0}
+.dispatch-bol-print-toolbar span{font-size:11px;color:#64748b}
+#dispatch-bol-print-title{font-size:15px;color:#1f2937;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dispatch-bol-print-actions{display:flex;align-items:center;gap:8px;flex:0 0 auto}
+.dispatch-bol-print-close{width:34px;height:34px;display:inline-flex;align-items:center;justify-content:center;border:0;border-radius:6px;background:transparent;color:#64748b;font-size:24px;line-height:1;cursor:pointer}
+.dispatch-bol-print-close:hover{background:#f1f5f9;color:#1f2937}
+.dispatch-bol-print-close:focus-visible{outline:2px solid #1677ff;outline-offset:2px}
+.dispatch-bol-print-scroll{flex:1;min-height:0;overflow:auto;padding:24px;background:#eef1f5;box-sizing:border-box}
+#dispatch-bol-print-stage{position:relative;margin:0 auto}
+#dispatch-bol-print-sheet>.dispatch-bol-sheet{width:210mm;min-height:297mm;padding:10mm 12mm 18mm;box-sizing:border-box;background:#fff;color:#000;transform-origin:top left;box-shadow:0 4px 20px rgba(15,23,42,.14);font-family:Arial,"Microsoft YaHei",sans-serif;font-size:10.5pt;line-height:1.24;page:dispatchBol}
+.dispatch-bol-sheet *{box-sizing:border-box}
+.dispatch-bol-document-title{height:15mm;display:flex;align-items:center;justify-content:center;border:1px solid #000;background:#000;color:#fff;font-family:"Times New Roman","SimSun",serif;font-size:24pt;font-weight:700;line-height:1;letter-spacing:.01em}
+.dispatch-bol-summary{display:grid;grid-template-columns:52.5% 47.5%;border-left:1px solid #000;border-right:1px solid #000}
+.dispatch-bol-summary>section{min-width:0;border-bottom:1px solid #000}
+.dispatch-bol-summary>section+section{border-left:1px solid #000}
+.dispatch-bol-section-title{height:9mm;margin:0;padding:0 1mm;display:flex;align-items:center;background:#000;color:#fff;font-family:"Times New Roman","SimSun",serif;font-size:16pt;font-weight:400;line-height:1}
+.dispatch-bol-section-body{padding:2mm 1.5mm}
+.dispatch-bol-top .dispatch-bol-section-body{min-height:36mm;display:flex;flex-direction:column;justify-content:center}
+.dispatch-bol-shipper strong{display:block;margin-bottom:1mm;font-size:16pt;line-height:1.15}
+.dispatch-bol-address{white-space:pre-line;font-size:12pt;line-height:1.28}
+.dispatch-bol-fields{display:grid;grid-template-columns:max-content minmax(0,1fr);align-content:center;gap:.8mm 1.5mm;font-size:11pt}
+.dispatch-bol-fields dt{font-weight:400}
+.dispatch-bol-fields dd{margin:0;min-width:0;overflow-wrap:anywhere}
+.dispatch-bol-fields .is-emphasis{font-weight:700}
+.dispatch-bol-middle .dispatch-bol-section-body{min-height:27mm;padding-top:1.5mm}
+.dispatch-bol-destination-title{font-size:12pt;margin-bottom:.8mm}
+.dispatch-bol-destination-line{font-size:11.5pt;line-height:1.38}
+.dispatch-bol-lines{width:100%;border-collapse:collapse;table-layout:fixed;font-family:"Times New Roman","SimSun",serif;font-size:9.5pt}
+.dispatch-bol-lines th,.dispatch-bol-lines td{border:1px solid #000;padding:1.8mm 1mm;text-align:center;vertical-align:middle;overflow-wrap:anywhere}
+.dispatch-bol-lines th{height:13mm;background:#fff;color:#000;font-family:Arial,"Microsoft YaHei",sans-serif;font-size:9pt;line-height:1.15;white-space:normal}
+.dispatch-bol-lines td{height:9mm;font-size:8.5pt;white-space:nowrap;overflow-wrap:normal}
+.dispatch-bol-lines th:nth-child(1){width:9%}.dispatch-bol-lines th:nth-child(2){width:14%}.dispatch-bol-lines th:nth-child(3){width:12%}.dispatch-bol-lines th:nth-child(4){width:18%}.dispatch-bol-lines th:nth-child(5){width:22%}.dispatch-bol-lines th:nth-child(6){width:18%}.dispatch-bol-lines th:nth-child(7){width:7%}
+.dispatch-bol-lines thead{display:table-header-group}
+.dispatch-bol-lines tr{break-inside:avoid;page-break-inside:avoid}
+.dispatch-bol-empty{height:24mm!important;color:#4b5563;font-family:Arial,"Microsoft YaHei",sans-serif!important}
+.dispatch-bol-total{display:grid;grid-template-columns:1fr auto;align-items:center;gap:12mm;margin:12mm 18mm 0;font-family:"Times New Roman","SimSun",serif;font-size:12pt;break-inside:avoid;page-break-inside:avoid}
+.dispatch-bol-total strong{font-family:Arial,"Microsoft YaHei",sans-serif;font-size:18pt;font-weight:400;line-height:1}
+@media(max-width:680px){.dispatch-bol-print-modal{padding:8px}.dispatch-bol-print-panel{width:calc(100vw - 16px);height:calc(100vh - 16px);max-height:none}.dispatch-bol-print-toolbar{align-items:flex-start;gap:10px;padding:10px 12px;flex-wrap:wrap}.dispatch-bol-print-actions{width:100%;justify-content:flex-end}.dispatch-bol-print-scroll{padding:12px}}
+@page dispatchBol{size:A4 portrait;margin:0}
+@media print{
+ html:has(body.dispatch-bol-printing),body.dispatch-bol-printing{width:210mm!important;min-width:0!important;height:auto!important;min-height:0!important;margin:0!important;padding:0!important;background:#fff!important;overflow:visible!important}
+ body.dispatch-bol-printing>*:not(#modal-dispatch-bol-print){display:none!important}
+ body.dispatch-bol-printing #modal-booking-print-preview,body.dispatch-bol-printing #modal-ct-pallet-label-preview{display:none!important}
+ body.dispatch-bol-printing #modal-dispatch-bol-print{display:block!important;position:static!important;inset:auto!important;width:210mm!important;height:auto!important;padding:0!important;background:#fff!important}
+ body.dispatch-bol-printing #modal-dispatch-bol-print,body.dispatch-bol-printing #modal-dispatch-bol-print *{visibility:visible!important}
+ body.dispatch-bol-printing .dispatch-bol-print-panel{display:block!important;position:static!important;width:210mm!important;height:auto!important;max-width:none!important;max-height:none!important;border:0!important;border-radius:0!important;box-shadow:none!important;overflow:visible!important}
+ body.dispatch-bol-printing .dispatch-bol-print-toolbar{display:none!important}
+ body.dispatch-bol-printing .dispatch-bol-print-scroll{display:block!important;position:static!important;width:210mm!important;height:auto!important;padding:0!important;background:#fff!important;overflow:visible!important}
+ body.dispatch-bol-printing #dispatch-bol-print-stage,body.dispatch-bol-printing #dispatch-bol-print-sheet{display:block!important;position:static!important;width:210mm!important;height:auto!important;margin:0!important}
+ body.dispatch-bol-printing #dispatch-bol-print-sheet>.dispatch-bol-sheet{display:block!important;width:210mm!important;min-height:297mm!important;margin:0!important;transform:none!important;box-shadow:none!important}
+}
/* 基本Tab只读展示 */
.basic-readonly input,.basic-readonly select,.basic-readonly textarea{background:#f5f5f5;color:#666;cursor:not-allowed;pointer-events:none}
/* MB/L 逐行字段 */
@@ -1261,6 +1320,7 @@ body.dashboard-fullscreen #page-dashboard table:has(>thead)>tbody>tr>td{backgrou
@@ -1537,11 +1598,11 @@ body.dashboard-fullscreen #page-dashboard table:has(>thead)>tbody>tr>td{backgrou
-更多 ∨
更多 ∨