duxingchen/KCGL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: replace manual_cost with unit_total_cost and total_price

Browse Source 
Co-authored-by: aider (openai/DeepSeek-V3.2-Thinking) <aider@aider.chat>
This commit is contained in:
dxc
2026-03-02 11:39:49 +08:00
parent 68ea351c99
commit b08196c479
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inventory-web/src/views/stock/inbound/product.vue
View File

@ -156,7 +156,7 @@
</el-link> </el-link>
</template> </template>
<template #default="scope" v-else-if="['sale_price', 'raw_material_cost', 'manual_cost'].includes(col.prop)"> <template #default="scope" v-else-if="['sale_price', 'raw_material_cost', 'unit_total_cost', 'total_price'].includes(col.prop)">
<span class="money-text">{{ formatMoney(scope.row[col.prop]) }}</span> <span class="money-text">{{ formatMoney(scope.row[col.prop]) }}</span>
</template> </template>
@ -567,7 +567,8 @@ const allColumns = [
{ prop: 'bom_code', label: 'BOM', minWidth: '100' }, { prop: 'bom_code', label: 'BOM', minWidth: '100' },
{ prop: 'production_manager', label: '负责人', minWidth: '100' }, { prop: 'production_manager', label: '负责人', minWidth: '100' },
{ prop: 'raw_material_cost', 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: 'inbound_date', label: '生产日期', minWidth: '120' },
{ prop: 'detail_link', label: '详情', minWidth: '100' } { prop: 'detail_link', label: '详情', minWidth: '100' }
] ]
@ -592,7 +593,8 @@ const permissionMap: Record<string, string> = {
bom_code: 'inbound_product:bom_code', bom_code: 'inbound_product:bom_code',
production_manager: 'inbound_product:production_manager', production_manager: 'inbound_product:production_manager',
raw_material_cost: 'inbound_product:raw_material_cost', 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', inbound_date: 'inbound_product:inbound_date',
detail_link: 'inbound_product:detail_link', detail_link: 'inbound_product:detail_link',
} }

8
inventory-web/src/views/stock/inbound/semi.vue
View File

@ -182,7 +182,7 @@
</el-link> </el-link>
</template> </template>
<template #default="scope" v-else-if="['raw_material_cost', 'manual_cost', 'unit_total_cost'].includes(col.prop)"> <template #default="scope" v-else-if="['raw_material_cost', 'unit_total_cost', 'total_price'].includes(col.prop)">
<span class="money-text">{{ formatMoney(scope.row[col.prop]) }}</span> <span class="money-text">{{ formatMoney(scope.row[col.prop]) }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -643,8 +643,8 @@ const stockColumns = [
{prop: 'bom_version', label: 'BOM版本', minWidth: '90'}, {prop: 'bom_version', label: 'BOM版本', minWidth: '90'},
{prop: 'work_order_code', label: '工单号', minWidth: '120'}, {prop: 'work_order_code', label: '工单号', minWidth: '120'},
{prop: 'raw_material_cost', label: '原料成本', minWidth: '100'}, {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_manager', label: '生产负责人', minWidth: '100'},
{prop: 'production_start_time', label: '生产开始', minWidth: '160'}, {prop: 'production_start_time', label: '生产开始', minWidth: '160'},
{prop: 'production_end_time', label: '生产结束', minWidth: '160'}, {prop: 'production_end_time', label: '生产结束', minWidth: '160'},
@ -678,8 +678,8 @@ const permissionMap: Record<string, string> = {
bom_version: 'inbound_semi:bom_version', bom_version: 'inbound_semi:bom_version',
work_order_code: 'inbound_semi:work_order_code', work_order_code: 'inbound_semi:work_order_code',
raw_material_cost: 'inbound_semi:raw_material_cost', raw_material_cost: 'inbound_semi:raw_material_cost',
manual_cost: 'inbound_semi:manual_cost',
unit_total_cost: 'inbound_semi:unit_total_cost', unit_total_cost: 'inbound_semi:unit_total_cost',
total_price: 'inbound_semi:total_price',
production_manager: 'inbound_semi:production_manager', production_manager: 'inbound_semi:production_manager',
production_start_time: 'inbound_semi:production_start_time', production_start_time: 'inbound_semi:production_start_time',
production_end_time: 'inbound_semi:production_end_time', production_end_time: 'inbound_semi:production_end_time',