From 19cf99863f57e5ca27698a1d50735b883c7ba938 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Wed, 19 Nov 2025 22:43:11 +0800 Subject: [PATCH] =?UTF-8?q?style(components):=20=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=92=8C=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一调整多个 Picker 组件的内边距类名从 p-4 到 p-2.5 - 修改 OrderCost 和 OrderPackage 中图片容器的尺寸类名以适应全屏显示 - 移除 TicketUpload 中冗余的查看计算公式相关 UI 元素 - 更新 DealerInfoSection 中 DealerPicker 的手动输入属性为 false - 优化 PackagingCostSection 中固定成本选择器的可见性控制逻辑 - 调整 SupplierPicker 内部列表项的内边距类名 - 移除 center 页面中角色选中状态的勾选图标显示逻辑 - 格式化 invoice 页面中的导入语句以提高可读性 --- .../dealer/DealerPaymentAccountPicker.tsx | 2 +- .../src/components/dealer/DealerPicker.tsx | 2 +- .../dealer/DealerRebateCustomer.tsx | 2 +- .../dealer/DealerWarehousePicker.tsx | 2 +- .../components/purchase/module/OrderCost.tsx | 2 +- .../purchase/module/OrderPackage.tsx | 4 +- .../purchase/module/TicketUpload.tsx | 80 ++++--------------- .../purchase/section/DealerInfoSection.tsx | 1 + .../purchase/section/PackagingCostSection.tsx | 13 ++- .../components/supplier/SupplierPicker.tsx | 2 +- .../src/pages/main/center/index.tsx | 3 - 11 files changed, 35 insertions(+), 78 deletions(-) diff --git a/packages/app-client/src/components/dealer/DealerPaymentAccountPicker.tsx b/packages/app-client/src/components/dealer/DealerPaymentAccountPicker.tsx index 0f6a6f8..ef181cb 100644 --- a/packages/app-client/src/components/dealer/DealerPaymentAccountPicker.tsx +++ b/packages/app-client/src/components/dealer/DealerPaymentAccountPicker.tsx @@ -97,7 +97,7 @@ export default function DealerPaymentAccountPicker( {dealerPaymentAccountList?.map((dealerPaymentAccountVO) => ( { diff --git a/packages/app-client/src/components/dealer/DealerPicker.tsx b/packages/app-client/src/components/dealer/DealerPicker.tsx index 0fe1817..3c80349 100644 --- a/packages/app-client/src/components/dealer/DealerPicker.tsx +++ b/packages/app-client/src/components/dealer/DealerPicker.tsx @@ -115,7 +115,7 @@ export default function DealerPicker(props: IDealerPickerProps) { {dealerList?.map((dealer) => ( { diff --git a/packages/app-client/src/components/dealer/DealerRebateCustomer.tsx b/packages/app-client/src/components/dealer/DealerRebateCustomer.tsx index 74cc6f0..9acdb8c 100644 --- a/packages/app-client/src/components/dealer/DealerRebateCustomer.tsx +++ b/packages/app-client/src/components/dealer/DealerRebateCustomer.tsx @@ -93,7 +93,7 @@ export default function DealerRebateCustomerPicker( {dealerRebateCustomerList?.map((dealerRebateCustomer) => ( { diff --git a/packages/app-client/src/components/dealer/DealerWarehousePicker.tsx b/packages/app-client/src/components/dealer/DealerWarehousePicker.tsx index b21fbb7..b66c853 100644 --- a/packages/app-client/src/components/dealer/DealerWarehousePicker.tsx +++ b/packages/app-client/src/components/dealer/DealerWarehousePicker.tsx @@ -98,7 +98,7 @@ export default function DealerWarehousePicker( {dealerWarehouseList?.map((dealerWarehouseVO) => ( { diff --git a/packages/app-client/src/components/purchase/module/OrderCost.tsx b/packages/app-client/src/components/purchase/module/OrderCost.tsx index 559870c..f26eba6 100644 --- a/packages/app-client/src/components/purchase/module/OrderCost.tsx +++ b/packages/app-client/src/components/purchase/module/OrderCost.tsx @@ -974,7 +974,7 @@ export default forwardRef( diff --git a/packages/app-client/src/components/purchase/module/OrderPackage.tsx b/packages/app-client/src/components/purchase/module/OrderPackage.tsx index 677ffae..94f5380 100644 --- a/packages/app-client/src/components/purchase/module/OrderPackage.tsx +++ b/packages/app-client/src/components/purchase/module/OrderPackage.tsx @@ -628,10 +628,10 @@ export default forwardRef( > {/* 品牌背景水印 */} {brandInfo?.boxBrandImage && ( - + diff --git a/packages/app-client/src/components/purchase/module/TicketUpload.tsx b/packages/app-client/src/components/purchase/module/TicketUpload.tsx index 1afa78f..d63c317 100644 --- a/packages/app-client/src/components/purchase/module/TicketUpload.tsx +++ b/packages/app-client/src/components/purchase/module/TicketUpload.tsx @@ -20,18 +20,20 @@ export default function TicketUpload(props: ITicketUploadProps) { // 初始化发票和合同图片 if (value.invoiceImg) { - setInvoiceImgList([{ - url: value.invoiceImg[0], - name: 'invoice-image', - status: 'success' - }]); + setInvoiceImgList([ + { + url: value.invoiceImg[0], + name: "invoice-image", + status: "success", + }, + ]); } if (value.contractImg && value.contractImg.length > 0) { const contractImages = value.contractImg.map((url, index) => ({ url: url, name: `contract-image-${index}`, - status: 'success' + status: "success", })); // @ts-ignore setContractImgList(contractImages); @@ -48,7 +50,9 @@ export default function TicketUpload(props: ITicketUploadProps) { // 发票照片 const [invoiceImgList, setInvoiceImgList] = useState([]); // 合同照片 - const [contractImgList, setContractImgList] = useState([]); + const [contractImgList, setContractImgList] = useState( + [], + ); // 发票照片变更处理函数 const handleInvoiceImgChange = (files: UploaderFileItem[]) => { @@ -56,14 +60,14 @@ export default function TicketUpload(props: ITicketUploadProps) { // 如果有文件且上传成功，保存URL到supplierVO if (files.length > 0 && files[0].url) { - setSupplierVO(prev => ({ + setSupplierVO((prev) => ({ ...prev!, invoiceImg: [files[0].url!], invoiceUpload: true, })); } else { // 如果没有文件，清空URL - setSupplierVO(prev => ({ + setSupplierVO((prev) => ({ ...prev!, invoiceImg: undefined, invoiceUpload: false, @@ -76,8 +80,8 @@ export default function TicketUpload(props: ITicketUploadProps) { setContractImgList(files); // 保存所有文件URL到supplierVO - const urls = files.map(file => file.url).filter(url => url) as string[]; - setSupplierVO(prev => ({ + const urls = files.map((file) => file.url).filter((url) => url) as string[]; + setSupplierVO((prev) => ({ ...prev!, contractImg: urls, contractUpload: urls.length > 0, @@ -108,60 +112,6 @@ export default function TicketUpload(props: ITicketUploadProps) { /> - - 查看计算公式 - - - - - - - - - 计算公式详情 - - - - - - - - 基础运费 - - - 1250kg × ¥1.8/kg = ¥2,250.00 - - - - - 包装费用 - - - 50箱 × ¥5/箱 = ¥250.00 - - - - - 辅料费用 - - - 网套: 20个 × ¥3/个 = ¥60.00 - - - 商标: 20个 × ¥1/个 = ¥20.00 - - - - - - 总计金额 - - ¥2,580.00 - - - - - diff --git a/packages/app-client/src/components/purchase/section/DealerInfoSection.tsx b/packages/app-client/src/components/purchase/section/DealerInfoSection.tsx index 6c72d73..b349a0a 100644 --- a/packages/app-client/src/components/purchase/section/DealerInfoSection.tsx +++ b/packages/app-client/src/components/purchase/section/DealerInfoSection.tsx @@ -69,6 +69,7 @@ export default function (props: { {!readOnly && ( { handleDealerSelect(dealer); }} diff --git a/packages/app-client/src/components/purchase/section/PackagingCostSection.tsx b/packages/app-client/src/components/purchase/section/PackagingCostSection.tsx index 6f131f4..4c55fe7 100644 --- a/packages/app-client/src/components/purchase/section/PackagingCostSection.tsx +++ b/packages/app-client/src/components/purchase/section/PackagingCostSection.tsx @@ -369,7 +369,10 @@ export default function PackagingCostSection(props: { color: "var(--nutui-color-title, #1a1a1a)", }} onClick={(event) => { - setPickerVisible((prev) => ({ ...prev, costItem: true })); + setPickerVisible((prev) => ({ + ...prev, + fixedCost: true, + })); event.stopPropagation(); }} > @@ -385,7 +388,13 @@ export default function PackagingCostSection(props: { visible={pickerVisible.fixedCost} options={[ costItemVOList - .filter((item) => item.costType === newCostData.costType) + .filter((item) => { + return ( + item.costType === newCostData.costType && + item.name !== "空箱费" && + item.name !== "纸箱费" + ); + }) .filter((item) => { // 检查该项目是否已经被选择 return !fixedCosts.some( diff --git a/packages/app-client/src/components/supplier/SupplierPicker.tsx b/packages/app-client/src/components/supplier/SupplierPicker.tsx index 4e2054f..687849d 100644 --- a/packages/app-client/src/components/supplier/SupplierPicker.tsx +++ b/packages/app-client/src/components/supplier/SupplierPicker.tsx @@ -85,7 +85,7 @@ export default function SupplierPicker(props: ISupplierPickerProps) { {supplierList?.map((item) => ( { diff --git a/packages/app-client/src/pages/main/center/index.tsx b/packages/app-client/src/pages/main/center/index.tsx index 91713b8..47c3a57 100644 --- a/packages/app-client/src/pages/main/center/index.tsx +++ b/packages/app-client/src/pages/main/center/index.tsx @@ -360,9 +360,6 @@ export default hocAuth(function Page(props: CommonComponent) { {role.description || "暂无描述"} - {userRoleVO?.roleId === role.roleId && ( - - )} ))}