Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl

zhuguifei

7 天以前 2b31fa203f3435a582be51f45899d99164c9917a

 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>