From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl
---
ruoyi-plus-soybean/src/views/report/silk-storage-output/index.vue | 106 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/report/silk-storage-output/index.vue b/ruoyi-plus-soybean/src/views/report/silk-storage-output/index.vue
index a0585d7..8dfe396 100755
--- a/ruoyi-plus-soybean/src/views/report/silk-storage-output/index.vue
+++ b/ruoyi-plus-soybean/src/views/report/silk-storage-output/index.vue
@@ -362,7 +362,7 @@
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
- link.download = `鍌ㄤ笣鏌滃嚭鏂欎骇閲忔姤琛╛${formatNow()}.csv`;
+ link.download = `鍌ㄤ笣鏌滃嚭鏂欎骇閲忔姤琛╛${formatNow()}.csv`;
link.click();
URL.revokeObjectURL(url);
} finally {
@@ -529,7 +529,13 @@
<NFormItemGi span="24 s:12 m:8" label="鎵规鍙�" label-width="auto" path="batchcode" class="pr-24px">
<NInput v-model:value="searchParams.batchcode" clearable placeholder="璇疯緭鍏ユ壒娆″彿" />
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:8" label="鎶曟枡鏃ユ湡" label-width="auto" path="actualstarttime" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8"
+ label="鎶曟枡鏃ユ湡"
+ label-width="auto"
+ path="actualstarttime"
+ class="pr-24px"
+ >
<NDatePicker
v-model:formatted-value="searchParams.actualstarttime"
type="date"
@@ -538,12 +544,20 @@
class="w-full"
/>
</NFormItemGi>
- <NFormItemGi span="24 s:12 m:8" label="鍑烘枡鏃堕棿" label-width="auto" path="params.beginTime" class="pr-24px">
+ <NFormItemGi
+ span="24 s:12 m:8"
+ label="鍑烘枡鏃堕棿"
+ label-width="auto"
+ path="params.beginTime"
+ class="pr-24px"
+ >
<NDatePicker
v-model:formatted-value="searchDateRange"
type="datetimerange"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
+ :default-time="['00:00:00', '23:59:59']"
+ class="w-full"
@update:formatted-value="onDateRangeUpdate"
/>
</NFormItemGi>
@@ -583,7 +597,7 @@
<NCard
:bordered="false"
size="small"
- class="card-wrapper flex flex-col sm:flex-1-hidden"
+ class="flex flex-col card-wrapper sm:flex-1-hidden"
content-style="padding: 0; flex: 1; min-height: 0; display: flex; flex-direction: column; overflow: hidden;"
>
<div class="report-root">
@@ -628,50 +642,50 @@
<!-- 鎶ヨ〃鏍囬 -->
<div class="report-title">鎵规浜ч噺缁熻鎶ヨ〃</div>
- <!-- 鏃ユ湡鑼冨洿鏄剧ず -->
- <div class="report-date-range">
- <span class="report-date-range__text">{{ dateRangeText }}</span>
- </div>
+ <!-- 鏃ユ湡鑼冨洿鏄剧ず -->
+ <div class="report-date-range">
+ <span class="report-date-range__text">{{ dateRangeText }}</span>
+ </div>
- <!-- 鏁版嵁琛ㄦ牸 -->
- <div class="report-table-scroll">
- <table id="report-table" class="report-table">
- <thead>
- <tr>
- <th rowspan="2" class="col-batch-no">鎵规鍙�</th>
- <th rowspan="2" class="col-brand">鐗屽彿</th>
- <th rowspan="2" class="col-time">鎵规寮�濮嬫椂闂�</th>
- <th rowspan="2" class="col-time">鎵规缁撴潫鏃堕棿</th>
- <th rowspan="2" class="col-cabinet">鏌滃彿</th>
- <th rowspan="2" class="col-weight">鐑熶笣閲嶉噺</th>
- <th rowspan="2" class="col-unit">鐢熶骇鏈虹粍</th>
- <th class="col-output">鍗风儫鏈烘�讳骇</th>
- <th class="col-output">鍖呰鏈烘�讳骇</th>
- <th class="col-output">鎻愬崌鏈烘�讳骇</th>
- </tr>
- <tr>
- <th class="col-output">閲忥紙绠憋級</th>
- <th class="col-output">閲忥紙绠憋級</th>
- <th class="col-output">閲忥紙绠憋級</th>
- </tr>
- </thead>
- <tbody>
- <tr v-for="row in tableRows" :key="row.id">
- <td>{{ row.batchcode }}</td>
- <td class="report-left">{{ row.materialname }}</td>
- <td>{{ row.distimebegin }}</td>
- <td>{{ row.distimeend }}</td>
- <td>{{ formatSiloId(row.siloid) }}</td>
- <td>{{ calculateSilkWeight(row.jobinput, row.weight) }}</td>
- <td>{{ formatProductionUnits(row.rollerDetailList) }}</td>
- <td>{{ calcRollerBox(row.rollerOutput) }}</td>
- <td>{{ calcPackerBox(row.packerOutput) }}</td>
- <td>{{ calcPackerBox(row.packerOutput) }}</td>
- </tr>
- </tbody>
- </table>
+ <!-- 鏁版嵁琛ㄦ牸 -->
+ <div class="report-table-scroll">
+ <table id="report-table" class="report-table">
+ <thead>
+ <tr>
+ <th rowspan="2" class="col-batch-no">鎵规鍙�</th>
+ <th rowspan="2" class="col-brand">鐗屽彿</th>
+ <th rowspan="2" class="col-time">鎵规寮�濮嬫椂闂�</th>
+ <th rowspan="2" class="col-time">鎵规缁撴潫鏃堕棿</th>
+ <th rowspan="2" class="col-cabinet">鏌滃彿</th>
+ <th rowspan="2" class="col-weight">鐑熶笣閲嶉噺</th>
+ <th rowspan="2" class="col-unit">鐢熶骇鏈虹粍</th>
+ <th class="col-output">鍗风儫鏈烘�讳骇</th>
+ <th class="col-output">鍖呰鏈烘�讳骇</th>
+ <th class="col-output">鎻愬崌鏈烘�讳骇</th>
+ </tr>
+ <tr>
+ <th class="col-output">閲忥紙绠憋級</th>
+ <th class="col-output">閲忥紙绠憋級</th>
+ <th class="col-output">閲忥紙绠憋級</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="row in tableRows" :key="row.id">
+ <td>{{ row.batchcode }}</td>
+ <td class="report-left">{{ row.materialname }}</td>
+ <td>{{ row.distimebegin }}</td>
+ <td>{{ row.distimeend }}</td>
+ <td>{{ formatSiloId(row.siloid) }}</td>
+ <td>{{ row.weight }}</td>
+ <td>{{ formatProductionUnits(row.rollerDetailList) }}</td>
+ <td>{{ calcRollerBox(row.rollerOutput) }}</td>
+ <td>{{ calcPackerBox(row.packerOutput) }}</td>
+ <td> - </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</div>
- </div>
</NSpin>
</div>
</div>
--
Gitblit v1.9.3