From 5b170f26c7ffa60c06c7cb04a40fe78102e3b654 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Wed, 3 Jun 2026 16:33:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/zh-CN.js                           |  3 +++
 .../pages/equipmentLedger/detail.vue           | 17 +++++++++--------
 .../pages/equipmentLedger/index.vue            | 18 ++++++++++++------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/locales/zh-CN.js b/src/locales/zh-CN.js
index b2d66c4..d67bf32 100644
--- a/src/locales/zh-CN.js
+++ b/src/locales/zh-CN.js
@@ -822,6 +822,7 @@ export default {
     dailyAverageValue: '每日报工平均值',
     dataCollectionCapacity: '数据采集产能',
     productionDate: '生产日期',
+	outgoingTime: '出厂日期',
     factoryEntryDate: '入厂日期',
     deviceLocation: '设备位置',
     deviceManagerName: '设备负责人',
@@ -847,6 +848,7 @@ export default {
     placeholderDailyAverageValue: '请输入每日报工平均值',
     placeholderDataCollectionCapacity: '请输入数据采集产能',
     placeholderProductionDate: '请选择生产日期',
+	placeholderOutgoingTime: '请选择出厂日期',
     placeholderFactoryEntryDate: '请选择入厂日期',
     placeholderDeviceLocation: '请输入设备位置',
     placeholderRemark: '请输入备注',
@@ -854,6 +856,7 @@ export default {
     validatorDeviceNameRequired: '设备名称不能为空',
     validatorDeviceTypeRequired: '设备类型不能为空',
     validatorProductionDateRequired: '生产日期不能为空',
+	validatorOutgoingTimeRequired: '出厂日期不能为空',
     validatorFactoryEntryDateRequired: '入厂日期不能为空',
     validatorRatedCapacityRequired: '额定产能不能为空',
     validatorDailyAverageValueRequired: '每日报工平均值不能为空',
diff --git a/src/pages_function/pages/equipmentLedger/detail.vue b/src/pages_function/pages/equipmentLedger/detail.vue
index 52ca6d9..a1d83dd 100644
--- a/src/pages_function/pages/equipmentLedger/detail.vue
+++ b/src/pages_function/pages/equipmentLedger/detail.vue
@@ -49,22 +49,23 @@
               <text class="info-label">{{ t('equipmentLedger.ratedCapacity') }}</text>
               <text class="info-value">{{ fieldValue('ratedCapacity') }}</text>
             </view>
-            <view v-if="detailData?.isScheduled === 1 || detailData?.isSchedueld === 1" class="info-row">
+        <!--    <view v-if="detailData?.isScheduled === 1 || detailData?.isSchedueld === 1" class="info-row">
               <text class="info-label">{{ t('equipmentLedger.dailyAverageValue') }}</text>
               <text class="info-value">{{ fieldValue('dailyAverageValue') }}</text>
-            </view>
-            <view v-if="detailData?.isScheduled === 1 || detailData?.isSchedueld === 1" class="info-row">
+            </view> -->
+        <!--    <view v-if="detailData?.isScheduled === 1 || detailData?.isSchedueld === 1" class="info-row">
               <text class="info-label">{{ t('equipmentLedger.dataCollectionCapacity') }}</text>
               <text class="info-value">{{ fieldValue('dataCollectionCapacity') }}</text>
-            </view>
-            <view class="info-row">
-              <text class="info-label">{{ t('equipmentLedger.productionDate') }}</text>
-              <text class="info-value">{{ formatDateValue(detailData?.productionDate) }}</text>
-            </view>
+            </view> -->
+
             <view class="info-row">
               <text class="info-label">{{ t('equipmentLedger.factoryEntryDate') }}</text>
               <text class="info-value">{{ formatDateValue(detailData?.factoryEntryDate) }}</text>
             </view>
+			<view class="info-row">
+			  <text class="info-label">{{ t('equipmentLedger.productionDate') }}</text>
+			  <text class="info-value">{{ formatDateValue(detailData?.outgoingTime) }}</text>
+			</view>
             <view class="info-row">
               <text class="info-label">{{ t('equipmentLedger.deviceLocation') }}</text>
               <text class="info-value">{{ fieldValue('deviceLocation') }}</text>
diff --git a/src/pages_function/pages/equipmentLedger/index.vue b/src/pages_function/pages/equipmentLedger/index.vue
index 8b3c111..91711dc 100644
--- a/src/pages_function/pages/equipmentLedger/index.vue
+++ b/src/pages_function/pages/equipmentLedger/index.vue
@@ -25,9 +25,9 @@
         </view>
       </picker>
       <view class="reset-filter-btn" @click="resetFilters">{{ resetFilterText }}</view>
-      <view class="scan-btn" @click="handleScan">
+    <!--  <view class="scan-btn" @click="handleScan">
         <uni-icons type="scan" size="24" color="#1f2937"></uni-icons>
-      </view>
+      </view> -->
     </view>
 
     <view class="list-scroll">
@@ -445,10 +445,10 @@ function formatDateValue(value) {
 
 .filter-bar {
   display: grid;
-  grid-template-columns: minmax(0, 1fr) 150rpx 96rpx 64rpx;
+  grid-template-columns: minmax(0, 1fr) 160rpx 70rpx 0rpx;
   gap: 14rpx;
   align-items: center;
-  padding: 18rpx 4rpx 20rpx;
+  padding: 18rpx 3rpx 20rpx;
 }
 
 .keyword-wrap,
@@ -474,6 +474,9 @@ function formatDateValue(value) {
 }
 
 .status-filter {
+  min-width: 140rpx;
+  flex: 1;
+  max-width: 300rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -496,9 +499,9 @@ function formatDateValue(value) {
 
 .status-filter-text,
 .line-filter-text {
-  min-width: 0;
+  min-width: 0rpx;
   flex: 1;
-  max-width: 96rpx;
+  width: 120rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -528,6 +531,9 @@ function formatDateValue(value) {
 }
 
 .reset-filter-btn {
+	min-width: 10rpx;
+	flex: 1;
+	width: 80rpx;
   height: 64rpx;
   display: flex;
   align-items: center;