提交

web-admin/src/components/business/clinical-payment-confirm-timeline/index.vue

@@ -459,18 +459,18 @@
   }
 
   .v-timeline-fields {
-    display: grid;
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-    gap: 10px 16px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    gap: 12px 20px;
     margin: 0;
-
-    @media (max-width: 560px) {
-      grid-template-columns: 1fr;
-    }
   }
 
   .v-timeline-field {
+    flex: 1 1 160px;
     min-width: 0;
+    max-width: 100%;
 
     dt {
       margin: 0 0 4px;
@@ -489,7 +489,19 @@
   }
 
   .v-timeline-field--full {
-    grid-column: 1 / -1;
+    flex: 1 1 220px;
+  }
+
+  @media (max-width: 560px) {
+    .v-timeline-fields {
+      flex-direction: column;
+    }
+
+    .v-timeline-field,
+    .v-timeline-field--full {
+      flex: 1 1 auto;
+      width: 100%;
+    }
   }
 
   .v-timeline-field__multiline {

web-admin/src/components/business/sample-transport-form-section/index.vue

@@ -404,6 +404,7 @@
         typeCode?: string
         storagePrice?: number | null
         storageYears?: number | null
+        sampleCodeFilter?: string
       }>
       sampleCodeOptions: Api.BizSampleCode.SampleCodeItem[]
       unitOptions: Array<{ id: string; unitName: string }>
@@ -431,7 +432,7 @@
   const emit = defineEmits<{
     (e: 'update:samples', val: Array<Record<string, any>>): void
     (e: 'price-change'): void
-    (e: 'search-sample-code', query: string): void
+    (e: 'search-sample-code', query: string, codeFilter?: string): void
     (e: 'search-sample-type', query: string): void
     (e: 'search-unit', query: string): void
     (e: 'search-site', query: string): void
@@ -586,12 +587,19 @@
     return props.samples.some((s) => s !== row && String(s.sampleCodeId || '') === sc.id)
   }
 
+  function sampleCodeFilterForRow(row: Record<string, any>): string | undefined {
+    if (!row.sampleTypeId) return undefined
+    const st = props.sampleTypeOptions.find((x) => x.id === row.sampleTypeId)
+    const filterText = (st?.sampleCodeFilter || '').trim()
+    return filterText || undefined
+  }
+
   function handleRemoteSearchSampleCode(query: string) {
-    emit('search-sample-code', query)
+    emit('search-sample-code', query, sampleCodeFilterForRow(sampleDraft))
   }
 
   function onSampleCodeSelectVisible(visible: boolean) {
-    if (visible) emit('search-sample-code', '')
+    if (visible) emit('search-sample-code', '', sampleCodeFilterForRow(sampleDraft))
   }
 
   function handleRemoteSearchSampleType(query: string) {
@@ -628,7 +636,7 @@
 
   function refreshSampleDialogOptions() {
     emit('search-sample-type', '')
-    emit('search-sample-code', '')
+    emit('search-sample-code', '', sampleCodeFilterForRow(sampleDraft))
     emit('search-unit', '')
   }
 
@@ -654,6 +662,9 @@
       }
       row.storageYears = st.storageYears
     }
+    row.sampleCodeId = ''
+    row.sampleCode = ''
+    emit('search-sample-code', '', sampleCodeFilterForRow(row))
   }
 
   function onSampleUnitChange(unitId: string | null | undefined) {