= {
{ field: 'supplier.name', title: '供应商', slots: { default: 'supplier' }, width: 130 },
{ field: 'function', title: '器械功能', width: 200 },
{ field: 'specification', title: '规格型号', width: 120 },
+ {
+ field: 'is_free_shipping',
+ title: '单品包邮',
+ width: 100,
+ slots: { default: 'is_free_shipping' },
+ },
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],
diff --git a/apps/web-antd/src/views/business/product/medical-device/index.vue b/apps/web-antd/src/views/business/product/medical-device/index.vue
index 5a889524..5e1bd39b 100644
--- a/apps/web-antd/src/views/business/product/medical-device/index.vue
+++ b/apps/web-antd/src/views/business/product/medical-device/index.vue
@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
+import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -250,6 +251,9 @@ const openExcelUploadModal = () => {
{{ row.supplier?.name || row.source }}
+
+
+
{{ row.status_txt }}
diff --git a/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue b/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue
index cfc8b488..6078d983 100644
--- a/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue
+++ b/apps/web-antd/src/views/business/product/non-drug/components/ExcelUpload.vue
@@ -73,7 +73,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
-
+
= {
{ field: 'supplier.name', title: '供应商', slots: { default: 'supplier' }, width: 130 },
{ field: 'function', title: '产品功能', width: 200 },
{ field: 'specification', title: '规格', width: 120 },
+ {
+ field: 'is_free_shipping',
+ title: '单品包邮',
+ width: 100,
+ slots: { default: 'is_free_shipping' },
+ },
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],
diff --git a/apps/web-antd/src/views/business/product/non-drug/index.vue b/apps/web-antd/src/views/business/product/non-drug/index.vue
index 9c8c440a..28033892 100644
--- a/apps/web-antd/src/views/business/product/non-drug/index.vue
+++ b/apps/web-antd/src/views/business/product/non-drug/index.vue
@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
+import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -250,6 +251,9 @@ const openExcelUploadModal = () => {
{{ row.supplier?.name || row.source }}
+
+
+
{{ row.status_txt }}
diff --git a/apps/web-antd/src/views/business/product/service-pack/config/table.ts b/apps/web-antd/src/views/business/product/service-pack/config/table.ts
index dc0947f5..52791d3e 100644
--- a/apps/web-antd/src/views/business/product/service-pack/config/table.ts
+++ b/apps/web-antd/src/views/business/product/service-pack/config/table.ts
@@ -50,6 +50,12 @@ export const gridOptions: VxeGridProps
= {
{ field: 'supplier.name', title: '供应商', width: 130 },
{ field: 'function', title: '主要功能', width: 200 },
{ field: 'specification', title: '规格', width: 120 },
+ {
+ field: 'is_free_shipping',
+ title: '单品包邮',
+ width: 100,
+ slots: { default: 'is_free_shipping' },
+ },
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{ type: 'html', title: '操作', fixed: 'right', width: 320, slots: { default: 'action' } },
],
diff --git a/apps/web-antd/src/views/business/product/service-pack/index.vue b/apps/web-antd/src/views/business/product/service-pack/index.vue
index d69c93c8..507f94a4 100644
--- a/apps/web-antd/src/views/business/product/service-pack/index.vue
+++ b/apps/web-antd/src/views/business/product/service-pack/index.vue
@@ -12,6 +12,7 @@ import { TableAction } from '#/components/table-action';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
+import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -219,6 +220,9 @@ const deleteApi = (row: any) => {
@stock-in="openStockIn"
/>
+
+
+
{{ row.status_txt }}
diff --git a/apps/web-antd/src/views/business/product/western-medicine/components/ExcelUpload.vue b/apps/web-antd/src/views/business/product/western-medicine/components/ExcelUpload.vue
index 737d4e0b..01116a2f 100644
--- a/apps/web-antd/src/views/business/product/western-medicine/components/ExcelUpload.vue
+++ b/apps/web-antd/src/views/business/product/western-medicine/components/ExcelUpload.vue
@@ -80,7 +80,7 @@ const handleChange = (info: { file: UploadFile }) => {
};
-
+
= {
width: 100,
slots: { default: 'is_otc' },
},
+ {
+ field: 'is_free_shipping',
+ title: '单品包邮',
+ width: 100,
+ slots: { default: 'is_free_shipping' },
+ },
{ field: 'status', title: '状态', width: 90, slots: { default: 'status' } },
{
field: 'min_adjust_price',
diff --git a/apps/web-antd/src/views/business/product/western-medicine/index.vue b/apps/web-antd/src/views/business/product/western-medicine/index.vue
index 141a862e..d0ff74f9 100644
--- a/apps/web-antd/src/views/business/product/western-medicine/index.vue
+++ b/apps/web-antd/src/views/business/product/western-medicine/index.vue
@@ -13,6 +13,7 @@ import { downloadByData } from '#/util/tool';
import CategoryWarehouseCell from '#/views/business/product/_shared/category-warehouse-cell.vue';
import CentralPriceCell from '#/views/business/product/_shared/central-price-cell.vue';
import CentralStockInModal from '#/views/business/product/_shared/central-stock-in-modal.vue';
+import DrugFreeShippingCell from '#/views/business/product/_shared/drug-free-shipping-cell.vue';
import ProductInfoCell from '#/views/business/product/_shared/product-info-cell.vue';
import WarehouseDrugPriceModal from '#/views/business/warehouse-drug-management/admin/components/modal.vue';
import BindListModal from '#/views/system/delivery-warehouse-drug/components/bind-list-modal.vue';
@@ -298,6 +299,9 @@ const openExcelUploadModal = () => {
{{ row.is_otc === 0 ? '处方药' : '非处方药' }}
+
+
+
{{ row.status_txt }}
diff --git a/apps/web-antd/src/views/finance/monthly-payment-settlement/components/MonthlyPayment.vue b/apps/web-antd/src/views/finance/monthly-payment-settlement/components/MonthlyPayment.vue
index 38cba3c1..3208d830 100644
--- a/apps/web-antd/src/views/finance/monthly-payment-settlement/components/MonthlyPayment.vue
+++ b/apps/web-antd/src/views/finance/monthly-payment-settlement/components/MonthlyPayment.vue
@@ -60,7 +60,7 @@ const [Modal, modalApi] = useVbenModal({
-
+
diff --git a/apps/web-antd/src/views/finance/withdrawal/components/card-modal.vue b/apps/web-antd/src/views/finance/withdrawal/components/card-modal.vue
index d8be93dd..3fb05216 100644
--- a/apps/web-antd/src/views/finance/withdrawal/components/card-modal.vue
+++ b/apps/web-antd/src/views/finance/withdrawal/components/card-modal.vue
@@ -57,7 +57,7 @@ const [Modal, modalApi] = useVbenModal({
-
+
diff --git a/apps/web-antd/src/views/finance/withdrawal/components/withdrawal-modal.vue b/apps/web-antd/src/views/finance/withdrawal/components/withdrawal-modal.vue
index 4e32d28e..8a550394 100644
--- a/apps/web-antd/src/views/finance/withdrawal/components/withdrawal-modal.vue
+++ b/apps/web-antd/src/views/finance/withdrawal/components/withdrawal-modal.vue
@@ -61,7 +61,7 @@ const setAmount = (amount: number) => {
-
+
diff --git a/apps/web-antd/src/views/log/api-log/components/modal.vue b/apps/web-antd/src/views/log/api-log/components/modal.vue
index c09863f3..1f13f00c 100644
--- a/apps/web-antd/src/views/log/api-log/components/modal.vue
+++ b/apps/web-antd/src/views/log/api-log/components/modal.vue
@@ -39,7 +39,7 @@ const [Modal, modalApi] = useVbenModal({
-
+
-
+
{{ data.id }}
diff --git a/apps/web-antd/src/views/log/ledger-log/components/modal.vue b/apps/web-antd/src/views/log/ledger-log/components/modal.vue
index ec710cc9..2a46565c 100644
--- a/apps/web-antd/src/views/log/ledger-log/components/modal.vue
+++ b/apps/web-antd/src/views/log/ledger-log/components/modal.vue
@@ -30,7 +30,7 @@ const [Modal, modalApi] = useVbenModal({
});
-
+