From 4039f4dce566ffddf444bed260906acdff0b164f Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 16 五月 2026 15:58:08 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_NEW_pro_鹤壁
---
src/pages/productionManagement/productionReporting/ledger.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/pages/productionManagement/productionReporting/ledger.vue b/src/pages/productionManagement/productionReporting/ledger.vue
index b71a9a3..fb5d1dd 100644
--- a/src/pages/productionManagement/productionReporting/ledger.vue
+++ b/src/pages/productionManagement/productionReporting/ledger.vue
@@ -49,6 +49,10 @@
<text class="detail-value highlight">{{ item.nickName || '-' }}</text>
</view>
<view class="detail-row">
+ <text class="detail-label">宸ユ椂(h)</text>
+ <text class="detail-value">{{ item.workHour || 0 }}</text>
+ </view>
+ <view class="detail-row">
<text class="detail-label">鎵�灞炲伐搴�</text>
<view class="detail-value">
<up-tag :text="item.process || '-'"
@@ -60,6 +64,10 @@
<view class="detail-row">
<text class="detail-label">宸ュ崟缂栧彿</text>
<text class="detail-value">{{ item.workOrderNo || '-' }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">閿�鍞悎鍚屽彿</text>
+ <text class="detail-value">{{ item.salesContractNo || '-' }}</text>
</view>
<view class="detail-row">
<text class="detail-label">浜у搧鍚嶇О</text>
@@ -91,11 +99,11 @@
plain
text="鍙傛暟璇︽儏"
@click="handleShowParams(item)"></up-button>
- <up-button type="error"
+ <!-- <up-button type="error"
size="small"
plain
text="鍒犻櫎"
- @click="handleDelete(item)"></up-button>
+ @click="handleDelete(item)"></up-button> -->
</view>
</view>
</view>
@@ -120,16 +128,20 @@
:key="idx"
class="detail-item">
<view class="detail-row">
- <text class="detail-label">鎶曞叆浜у搧</text>
- <text class="detail-value font-bold">{{ input.productName }}</text>
+ <text class="detail-label">鎶ュ伐鍗曞彿</text>
+ <text class="detail-value">{{ input.productNo || '-' }}</text>
</view>
<view class="detail-row">
- <text class="detail-label">瑙勬牸鍨嬪彿</text>
- <text class="detail-value">{{ input.model }}</text>
+ <text class="detail-label">鎶曞叆浜у搧鍚嶇О</text>
+ <text class="detail-value font-bold">{{ input.productName || '-' }}</text>
+ </view>
+ <view class="detail-row">
+ <text class="detail-label">鎶曞叆浜у搧鍨嬪彿</text>
+ <text class="detail-value">{{ input.model || '-' }}</text>
</view>
<view class="detail-row">
<text class="detail-label">鎶曞叆鏁伴噺</text>
- <text class="detail-value highlight">{{ input.quantity }} {{ input.unit }}</text>
+ <text class="detail-value highlight">{{ input.quantity || 0 }} {{ input.unit || '' }}</text>
</view>
<up-divider></up-divider>
</view>
--
Gitblit v1.9.3