diff --git a/inventory-web/src/views/stock/inbound/product.vue b/inventory-web/src/views/stock/inbound/product.vue
index 4c0d5b6..48163b6 100644
--- a/inventory-web/src/views/stock/inbound/product.vue
+++ b/inventory-web/src/views/stock/inbound/product.vue
@@ -156,7 +156,7 @@
-
+
{{ formatMoney(scope.row[col.prop]) }}
@@ -567,7 +567,8 @@ const allColumns = [
{ prop: 'bom_code', label: 'BOM', minWidth: '100' },
{ prop: 'production_manager', label: '负责人', minWidth: '100' },
{ prop: 'raw_material_cost', label: '原料成本', minWidth: '100' },
- { prop: 'manual_cost', label: '人工成本', minWidth: '100' },
+ { prop: 'unit_total_cost', label: '单件成本', minWidth: '100' },
+ { prop: 'total_price', label: '总成本', minWidth: '100' },
{ prop: 'inbound_date', label: '生产日期', minWidth: '120' },
{ prop: 'detail_link', label: '详情', minWidth: '100' }
]
@@ -592,7 +593,8 @@ const permissionMap: Record = {
bom_code: 'inbound_product:bom_code',
production_manager: 'inbound_product:production_manager',
raw_material_cost: 'inbound_product:raw_material_cost',
- manual_cost: 'inbound_product:manual_cost',
+ unit_total_cost: 'inbound_product:unit_total_cost',
+ total_price: 'inbound_product:total_price',
inbound_date: 'inbound_product:inbound_date',
detail_link: 'inbound_product:detail_link',
}
diff --git a/inventory-web/src/views/stock/inbound/semi.vue b/inventory-web/src/views/stock/inbound/semi.vue
index 6d32479..6363d62 100644
--- a/inventory-web/src/views/stock/inbound/semi.vue
+++ b/inventory-web/src/views/stock/inbound/semi.vue
@@ -182,7 +182,7 @@
-
+
{{ formatMoney(scope.row[col.prop]) }}
@@ -643,8 +643,8 @@ const stockColumns = [
{prop: 'bom_version', label: 'BOM版本', minWidth: '90'},
{prop: 'work_order_code', label: '工单号', minWidth: '120'},
{prop: 'raw_material_cost', label: '原料成本', minWidth: '100'},
- {prop: 'manual_cost', label: '单件成本', minWidth: '100'}, // 原人工成本,现为单件成本
- {prop: 'unit_total_cost', label: '总成本', minWidth: '100'}, // 原单件总本,现为总成本
+ {prop: 'unit_total_cost', label: '单件成本', minWidth: '100'},
+ {prop: 'total_price', label: '总成本', minWidth: '100'},
{prop: 'production_manager', label: '生产负责人', minWidth: '100'},
{prop: 'production_start_time', label: '生产开始', minWidth: '160'},
{prop: 'production_end_time', label: '生产结束', minWidth: '160'},
@@ -678,8 +678,8 @@ const permissionMap: Record = {
bom_version: 'inbound_semi:bom_version',
work_order_code: 'inbound_semi:work_order_code',
raw_material_cost: 'inbound_semi:raw_material_cost',
- manual_cost: 'inbound_semi:manual_cost',
unit_total_cost: 'inbound_semi:unit_total_cost',
+ total_price: 'inbound_semi:total_price',
production_manager: 'inbound_semi:production_manager',
production_start_time: 'inbound_semi:production_start_time',
production_end_time: 'inbound_semi:production_end_time',