feat(web-admin): wire protocol sample freight batch UI

Replace per-sample transport fee entry with shared freight batch config in storage and donation protocol dialogs, and show mode/amount in view dialogs.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-10-08 07:51:56 +08:00
1 parent 468a7c5e12
commit 5dd545ba5c
6 files changed
+551 -293

No files matched your search

@@ -469,6 +469,8 @@
</div>
<SampleTransportFormSection
v-model:samples="formData.samples"
sample-source="cell_storage"
:protocol-id="formData.id || ''"
hide-dialog-collect-amount-unit
:sample-type-options="sampleTypeOptions"
:sample-type-options-loading="sampleTypeLoading"
@@ -476,17 +478,11 @@
:sample-code-options-loading="sampleCodeLoading"
:unit-options="unitOptions"
:unit-options-loading="unitLoading"
:site-options="siteOptions"
:site-options-loading="siteLoading"
:express-company-options="expressCompanyOptions"
:express-company-options-loading="expressCompanyLoading"
:show-price="true"
@price-change="onSamplePriceChange"
@search-sample-code="remoteSearchSampleCodes"
@search-sample-type="remoteSearchSampleTypes"
@search-unit="remoteSearchUnits"
@search-site="remoteSearchSites"
@search-express-company="remoteSearchExpressCompanies"
/>
</div>
</div>
@@ -850,7 +846,8 @@
class="detail-badge"
:class="{
'badge-green': detail.payStatus === 'yjf',
'badge-amber': detail.payStatus === 'dfj' || detail.payStatus === 'jfqrz',
'badge-primary': detail.payStatus === 'dfj',
'badge-amber': detail.payStatus === 'jfqrz',
'badge-gray': detail.payStatus === 'tfqrz' || detail.payStatus === 'ytf'
}"
>
@@ -908,6 +905,7 @@
<el-date-picker
v-model="detail.transferTime"
type="datetime"
format="YYYY-MM-DD HH:mm"
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="选择时间"
clearable
@@ -917,20 +915,11 @@
</el-form-item>
<el-form-item label="缴费状态">
<el-tag
v-if="isPayDetailLocked(detail)"
:type="payStatusTagType(String(detail.payStatus))"
:type="payStatusTagType(String(detail.payStatus || 'dfj'))"
size="small"
>
{{ payStatusLabel(String(detail.payStatus)) }}
{{ payStatusLabel(String(detail.payStatus || 'dfj')) }}
</el-tag>
<el-select
v-else
v-model="detail.payStatus"
placeholder="状态"
style="width: 100%"
>
<el-option label="待缴费" value="dfj" />
</el-select>
</el-form-item>
<el-form-item label="应缴费时间">
<el-date-picker
@@ -2367,13 +2356,14 @@
sampleCollectTime: formData.sampleCollectTime || undefined,
maternalBloodCollectTime: formData.maternalBloodCollectTime || undefined
},
samples: formData.samples.map(({ _rowKey, transport, ...s }) => ({
samples: formData.samples.map(({ _rowKey, transport, freight, freightDraft, ...s }) => ({
...s,
sampleStatus:
s.sampleStatus != null && String(s.sampleStatus).trim() !== ''
? String(s.sampleStatus).trim()
: null,
transport: transport?.transportType ? { ...transport } : undefined
freightId: freight?.id || s.freightId || undefined,
freightDraft: freightDraft || undefined
}))
}
@@ -4238,6 +4228,11 @@
color: #065f46;
}
&.badge-primary {
background: #ecfdf5;
color: #047857;
}
&.badge-amber {
background: #fffbeb;
color: #d97706;