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

@@ -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">
@@ -662,11 +676,11 @@
                    <td>{{ row.distimebegin }}</td>
                    <td>{{ row.distimeend }}</td>
                    <td>{{ formatSiloId(row.siloid) }}</td>
                    <td>{{ calculateSilkWeight(row.jobinput, row.weight) }}</td>
                      <td>{{ row.weight }}</td>
                    <td>{{ formatProductionUnits(row.rollerDetailList) }}</td>
                    <td>{{ calcRollerBox(row.rollerOutput) }}</td>
                    <td>{{ calcPackerBox(row.packerOutput) }}</td>
                    <td>{{ calcPackerBox(row.packerOutput) }}</td>
                      <td> - </td>
                  </tr>
                </tbody>
              </table>