From e1570f458b2ab42bb1a212be8de63134a50b2af1 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 30 七月 2026 16:09:03 +0800
Subject: [PATCH] 生产核算增加折算工时，隐藏工资
---
src/views/productionManagement/productionCosting/index.vue | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 3653368..8330f34 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -12,7 +12,7 @@
class="left-col">
<div class="left-panel">
<el-alert
- title="宸ヨ祫鏍哥畻鍙ｅ緞锛氫粎缁熻瀹℃牳閫氳繃鐨勫悎鏍兼姤宸ワ紱杞诲井杩斿伐銆佷弗閲嶈繑宸ャ�佹姤搴熷潎涓嶈钖��"
+ title="宸ヨ祫鏍哥畻鍙ｅ緞锛氫粎缁熻瀹℃牳閫氳繃鐨勬姤宸ユ暟鎹��"
type="info"
:closable="false"
show-icon
@@ -75,8 +75,6 @@
<div class="right-panel">
<div class="right-toolbar">
<el-button type="primary" @click="handleBatchAccounting">鎵归噺鏍哥畻</el-button>
- <el-button type="warning" @click="handleSingleAdjust">鍗曚釜淇</el-button>
- <el-button @click="handleOut">瀵煎嚭宸ヨ祫鏉�</el-button>
</div>
<PIMTable rowKey="id"
:column="tableColumn"
@@ -201,6 +199,11 @@
minWidth: 100,
},
{
+ label: "浜у搧鏍囧噯鏁伴噺",
+ prop: "productStandardQuantity",
+ minWidth: 120,
+ },
+ {
label: "瑙勬牸鍨嬪彿",
prop: "productModelName",
minWidth: 100,
@@ -226,11 +229,6 @@
minWidth: 140,
},
{
- label: "宸ユ椂锛坔锛�",
- prop: "workHour",
- minWidth: 100,
- },
- {
label: "琛ヤ慨鐞嗗伐鏃�",
prop: "repairWorkHour",
minWidth: 120,
@@ -241,19 +239,9 @@
minWidth: 100,
},
{
- label: "鍘熷伐璧�",
- prop: "originalWages",
+ label: "鎶樼畻宸ユ椂",
+ prop: "convertedWorkHours",
minWidth: 100,
- },
- {
- label: "淇宸ヨ祫",
- prop: "adjustAmount",
- minWidth: 100,
- },
- {
- label: "淇璇存槑",
- prop: "adjustRemark",
- minWidth: 160,
},
]);
@@ -270,8 +258,8 @@
minWidth: 100,
},
{
- label: "宸ヨ祫",
- prop: "wages",
+ label: "鎶樼畻宸ユ椂鍚堣",
+ prop: "workHours",
minWidth: 100,
},
{
--
Gitblit v1.9.3