diff --git a/src/assets/styles/global.less b/src/assets/styles/global.less index aaea06d..24f4291 100644 --- a/src/assets/styles/global.less +++ b/src/assets/styles/global.less @@ -89,10 +89,6 @@ html.theme-dark body { text-overflow: unset; } } - - .t-cell__description { - margin-top: 0; - } } .t-dialog__footer { diff --git a/src/components/ProductSelector.vue b/src/components/ProductSelector.vue index 6046cdc..886321a 100644 --- a/src/components/ProductSelector.vue +++ b/src/components/ProductSelector.vue @@ -9,6 +9,7 @@ > + import { BottomPopup } from "timi-tdesign-mobile"; import ProductAPI from "@/api/ProductAPI"; +import ProductSkuFormItem from "@/components/ProductSkuFormItem.vue"; import type { Product, ProductSelection, @@ -143,6 +145,8 @@ const selectedProduct = computed(() => { return props.selectedProduct || productList.value.find(item => item.skuList?.some(sku => sku.id === props.modelValue?.skuId)); }); const selectedProductName = computed(() => selectedProduct.value?.name || ""); +const selectedSku = computed(() => selectedProduct.value?.skuList?.find(sku => sku.id === props.modelValue?.skuId)); +const selectedUnit = computed(() => selectedSku.value?.unitList?.find(unit => unit.id === props.modelValue?.skuUnitId)); const filteredProductList = computed(() => { const text = keyword.value.toLocaleLowerCase(); return productList.value.filter(item => !text || `${item.name}${item.code}`.toLocaleLowerCase().includes(text)); diff --git a/src/components/ProductSkuFormItem.vue b/src/components/ProductSkuFormItem.vue new file mode 100644 index 0000000..a02d26a --- /dev/null +++ b/src/components/ProductSkuFormItem.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/components/ProductSkuSnapshotTags.vue b/src/components/ProductSkuTags.vue similarity index 91% rename from src/components/ProductSkuSnapshotTags.vue rename to src/components/ProductSkuTags.vue index 6c7aea5..a279941 100644 --- a/src/components/ProductSkuSnapshotTags.vue +++ b/src/components/ProductSkuTags.vue @@ -8,6 +8,7 @@ variant="light-outline" :content="tag.content" /> + @@ -15,7 +16,7 @@ import type { ProductSkuSpecSnapshot } from "@/types/Product"; import { getProductSkuSnapshotText } from "@/utils/product"; -defineOptions({ name: "ProductSkuSnapshotTags" }); +defineOptions({ name: "ProductSkuTags" }); interface Props { productName?: string | null; diff --git a/src/pages/fulfillment/OrderFulfillmentCreate.vue b/src/pages/fulfillment/OrderFulfillmentCreate.vue index 2528d3e..289cd0c 100644 --- a/src/pages/fulfillment/OrderFulfillmentCreate.vue +++ b/src/pages/fulfillment/OrderFulfillmentCreate.vue @@ -42,7 +42,7 @@ v-if="item.skuCodeSnapshot || item.skuSpecSnapshot?.length || item.skuNameSnapshot || item.specSummarySnapshot || item.unitSnapshot" class="sku-tags" > -
- @@ -48,12 +47,14 @@ v-text="(item.productNameSnapshot || '产').slice(0, 1)" /> - -