zhangafei il y a 1 mois
Parent
commit
eb380fa317

+ 618 - 0
src/App.vue

@@ -104,4 +104,622 @@
   .ant-modal div[aria-hidden='true']:not([class]) {
     display: none !important;
   }
+
+  html[data-theme='light'] {
+    --bg-color: #01396c;
+    --bg-s-color: #00315e;
+    --fn-color: #dbdbdb;
+    .ant-layout {
+      background-color: var(--bg-color);
+      --sider-logo-bg-color: #01396c;
+
+      .ant-layout-sider-light {
+        background-color: var(--bg-color);
+
+        .jeecg-menu-light {
+          background-color: var(--bg-color);
+          color: var(--fn-color);
+          font-size: 16px;
+
+          .jeecg-menu-item {
+            font-size: 16px;
+          }
+
+          .jeecg-menu {
+            color: var(--fn-color);
+          }
+
+          .jeecg-menu-submenu-title {
+            .anticon {
+              color: var(--fn-color);
+            }
+
+            &:hover {
+              .anticon {
+                color: #1890ff;
+              }
+            }
+          }
+        }
+
+        .jeecg-simple-menu-sub-title {
+          font-size: 16px;
+        }
+      }
+
+      .ant-layout-header {
+        background: var(--bg-color) !important;
+      }
+      .jeecg-layout-header--light {
+        background: var(--bg-color) !important;
+        color: var(--fn-color);
+        border-bottom: 1px solid var(--bg-color);
+        border-left: 1px solid var(--bg-color);
+
+        svg {
+          fill: var(--fn-color);
+        }
+
+        .jeecg-layout-header-action__item {
+          color: var(--fn-color);
+        }
+      }
+
+      .jeecg-header-user-dropdown--light .jeecg-header-user-dropdown__name {
+        color: var(--fn-color);
+      }
+
+      .jeecg-multiple-tabs.jeecg-multiple-tabs--theme-card {
+        .ant-tabs.ant-tabs-card .ant-tabs-nav {
+          background-color: var(--bg-color);
+
+          .ant-tabs-tab {
+            background-color: #01284c;
+
+            .ant-tabs-tab-btn {
+              color: var(--fn-color);
+            }
+
+            svg {
+              fill: var(--fn-color);
+            }
+          }
+
+          .ant-tabs-tab-active {
+          }
+        }
+
+        .jeecg-multiple-tabs-content__extra-redo {
+          color: var(--fn-color);
+          border-left: 1px solid #01284c;
+
+          .jeecg-svg-icon {
+            fill: var(--fn-color);
+            color: var(--fn-color);
+          }
+        }
+      }
+    }
+
+    .jeecg-basic-table-form-container .ant-form {
+      background: var(--bg-s-color);
+
+      .ant-form-item .ant-form-item-label > label {
+        color: var(--fn-color);
+      }
+    }
+
+    .ant-table {
+      color: var(--fn-color);
+    }
+
+    .jeecg-basic-table .ant-table-wrapper {
+      background: var(--bg-s-color);
+
+      .ant-table {
+        background: var(--bg-s-color);
+
+        .ant-btn-primary:disabled {
+          color: rgba(51 51 51, 0.65);
+          background-color: rgb(211 211 211);
+        }
+      }
+
+      .ant-table-cell-fix-left,
+      .ant-table-cell-fix-right {
+        background: var(--bg-s-color);
+        color: var(--fn-color);
+      }
+
+      .jeecg-basic-table-row__striped td {
+        background: var(--bg-color);
+      }
+
+      .ant-table-thead > tr > th,
+      .ant-table-thead > tr > td {
+        background: var(--bg-color);
+        color: var(--fn-color);
+      }
+
+      .ant-table-tbody > tr.ant-table-row:hover > td,
+      .ant-table-tbody > tr > td.ant-table-cell-row-hover {
+        background-color: #00509c;
+      }
+    }
+
+    .ant-btn.ant-btn-link.is-disabled {
+      color: #afafaf;
+    }
+
+    .ant-pagination {
+      color: var(--fn-color);
+
+      .ant-pagination-item a {
+        color: var(--fn-color);
+      }
+
+      .ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-ellipsis,
+      .ant-pagination-jump-next .ant-pagination-item-container .ant-pagination-item-ellipsis {
+        color: var(--fn-color);
+      }
+
+      .ant-pagination-prev,
+      .ant-pagination-next,
+      .ant-pagination-jump-prev,
+      .ant-pagination-jump-next {
+        color: var(--fn-color);
+      }
+    }
+
+    // 热送单
+    .hot-delivery-container {
+      .basic-container {
+        background: var(--bg-s-color);
+
+        .ant-form-item .ant-form-item-label > label {
+          color: var(--fn-color);
+        }
+      }
+    }
+
+    .ant-statistic .ant-statistic-title {
+      color: var(--fn-color);
+    }
+
+    .ant-descriptions .ant-descriptions-item-content {
+      color: var(--fn-color);
+    }
+
+    .ant-descriptions-title {
+      color: var(--fn-color);
+    }
+
+    .nb-title .dtl {
+      color: var(--fn-color);
+    }
+
+    .nb-title .nick {
+      color: var(--fn-color);
+    }
+
+    .common-table {
+      background: var(--bg-s-color);
+      color: var(--fn-color);
+
+      .ant-descriptions .ant-descriptions-item-label {
+        color: var(--fn-color);
+      }
+
+      .dtl {
+        color: var(--fn-color);
+      }
+
+      .nick {
+        color: var(--fn-color);
+      }
+
+      .ant-descriptions.ant-descriptions-bordered .ant-descriptions-item-label,
+      .ant-descriptions.ant-descriptions-bordered .ant-descriptions-item-content {
+        border-inline-end: 1px solid rgb(255 255 255 / 11%);
+      }
+    }
+
+    // 模态框还是用原来的颜色
+    .ant-modal {
+      .jeecg-basic-table-form-container .ant-form {
+        background: #ffffff;
+
+        .ant-form-item .ant-form-item-label > label {
+          color: rgba(0, 0, 0, 0.85);
+        }
+      }
+
+      .ant-table {
+        color: rgba(0, 0, 0, 0.65);
+      }
+
+      .jeecg-basic-table .ant-table-wrapper {
+        background: #ffffff;
+
+        .ant-table {
+          background: #ffffff;
+
+          .ant-btn-primary:disabled {
+            color: rgba(51 51 51, 0.65);
+            background-color: rgb(211 211 211);
+          }
+        }
+
+        .ant-table-cell-fix-left,
+        .ant-table-cell-fix-right {
+          background: #ffffff;
+          color: rgba(0, 0, 0, 0.65);
+        }
+
+        .jeecg-basic-table-row__striped td {
+          background: #ffffff;
+        }
+
+        .ant-table-thead > tr > th,
+        .ant-table-thead > tr > td {
+          background: #ffffff;
+          color: rgba(0, 0, 0, 0.65);
+        }
+
+        .ant-table-tbody > tr.ant-table-row:hover > td,
+        .ant-table-tbody > tr > td.ant-table-cell-row-hover {
+          background-color: #a1ccf4;
+        }
+      }
+
+      .ant-pagination {
+        color: rgba(0, 0, 0, 0.85);
+
+        .ant-pagination-item a {
+          color: rgba(0, 0, 0, 0.85);
+        }
+
+        .ant-pagination-jump-prev .ant-pagination-item-container .ant-pagination-item-ellipsis,
+        .ant-pagination-jump-next .ant-pagination-item-container .ant-pagination-item-ellipsis {
+          color: rgba(0, 0, 0, 0.85);
+        }
+
+        .ant-pagination-prev,
+        .ant-pagination-next,
+        .ant-pagination-jump-prev,
+        .ant-pagination-jump-next {
+          color: rgba(0, 0, 0, 0.85);
+        }
+      }
+      .ant-table-pagination.ant-pagination .ant-pagination-item-active a,
+      .ant-table-pagination.ant-pagination .ant-pagination-item-active:hover a {
+        color: #fff;
+      }
+    }
+
+    // 工作台
+    .workbench-container {
+      .ant-page-header {
+        background-color: var(--bg-s-color);
+
+        .workbench-header-top-title {
+          color: var(--fn-color);
+        }
+
+        .workbench-header .casting-title {
+          color: var(--fn-color);
+        }
+
+        .ant-statistic .ant-statistic-content {
+          color: var(--fn-color);
+        }
+      }
+
+      .ant-card {
+        background-color: #052d51;
+
+        .ant-card-head {
+          color: var(--fn-color);
+        }
+
+        .dtl-list-item .title {
+          background-color: transparent;
+          color: var(--fn-color);
+        }
+
+        .ant-statistic .ant-statistic-content {
+          color: var(--fn-color);
+        }
+
+        .ant-statistic .ant-statistic-content-value-int,
+        .ant-statistic .ant-statistic-content-value-decimal,
+        .legend-text,
+        .chart .chart-content .chart-item .chart-item-title,
+        .chart .chart-content .chart-item-divider .chart-item-title,
+        .chart .chart-content .chart-item-divider .chart-divider .chart-divider-text {
+          color: var(--fn-color);
+        }
+      }
+
+      .ant-tabs {
+        color: var(--fn-color);
+      }
+
+      .on-duty-shipment .ant-statistic {
+        background-color: var(--bg-color);
+        border-radius: 8px;
+        overflow: hidden;
+      }
+
+      .jeecg-basic-table .ant-table-wrapper {
+        .ant-table {
+          background-color: #052d51;
+        }
+
+        .jeecg-basic-title.jeecg-basic-table-title {
+          color: var(--fn-color);
+        }
+      }
+
+      .on-duty-driving {
+        .driving-list {
+          background-color: #004a8d;
+
+          .driving-title {
+            color: var(--fn-color);
+          }
+
+          .driving-list-item {
+            background-color: var(--bg-s-color);
+
+            .driving-item {
+              color: var(--fn-color);
+            }
+
+            .ant-statistic .ant-statistic-content-value-int,
+            .ant-statistic .ant-statistic-content-value-decimal {
+              color: var(--fn-color);
+            }
+
+            &:hover {
+              .ant-statistic .ant-statistic-content-value-int,
+              .ant-statistic .ant-statistic-content-value-decimal {
+                color: var(--sd-cl);
+              }
+            }
+          }
+        }
+      }
+
+      .historical-schedule {
+        .schedule-title {
+          color: var(--fn-color);
+        }
+
+        .ant-picker-calendar {
+          background-color: var(--bg-s-color);
+          color: var(--fn-color);
+          border-radius: 4px;
+
+          .ant-picker-content th {
+            color: var(--fn-color);
+          }
+
+          .ant-picker-panel {
+            background-color: var(--bg-s-color);
+          }
+
+          .ant-picker-cell {
+            color: var(--fn-color);
+          }
+
+          .ant-picker-calendar-date {
+            border-top-color: var(--bg-color);
+          }
+
+          .ant-picker-cell-in-view.ant-picker-cell-selected .ant-picker-calendar-date,
+          .ant-picker-cell-in-view.ant-picker-cell-selected .ant-picker-calendar-date-today {
+            background-color: #0056a4;
+            border-radius: 6px;
+          }
+          .ant-badge.ant-badge-status .ant-badge-status-text {
+            color: var(--fn-color);
+
+            &:hover {
+              color: var(--sd-cl);
+            }
+          }
+        }
+      }
+    }
+
+    // 班次实绩
+    .shift-performance-container {
+      .ant-tabs {
+        color: var(--fn-color);
+      }
+
+      .chart-container {
+        .workbench-header .workbench-header-top-title {
+          color: var(--fn-color);
+        }
+
+        .ant-card {
+          background-color: #052d51;
+
+          .ant-card-head {
+            color: var(--fn-color);
+          }
+
+          .ant-statistic .ant-statistic-content {
+            color: var(--fn-color);
+          }
+
+          .ant-statistic .ant-statistic-content-value-int,
+          .ant-statistic .ant-statistic-content-value-decimal,
+          .legend-text,
+          .chart .chart-content .chart-item .chart-item-title,
+          .chart .chart-content .chart-item-divider .chart-item-title,
+          .chart .chart-content .chart-item-divider .chart-divider .chart-divider-text {
+            color: var(--fn-color);
+          }
+        }
+
+        .statistic-wrapper {
+          .ant-card {
+            background-color: #fff;
+
+            .ant-card-head {
+              color: var(--fn-color);
+            }
+
+            .ant-statistic .ant-statistic-content-value-int,
+            .ant-statistic .ant-statistic-content-value-decimal {
+              color: rgba(0, 0, 0, 0.85);
+            }
+          }
+        }
+        .chart-wrapper .title {
+          color: var(--fn-color);
+        }
+
+        .chart-wrapper .driving-wrapper {
+          .driving-list {
+            background-color: #004a8d;
+
+            .driving-title {
+              color: var(--fn-color);
+            }
+
+            .driving-list-item {
+              background-color: var(--bg-s-color);
+
+              .driving-item {
+                color: var(--fn-color);
+              }
+
+              .ant-statistic .ant-statistic-content-value-int,
+              .ant-statistic .ant-statistic-content-value-decimal {
+                color: var(--fn-color);
+              }
+
+              &:hover {
+                .ant-statistic .ant-statistic-content-value-int,
+                .ant-statistic .ant-statistic-content-value-decimal {
+                  color: var(--sd-cl);
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    // 堆垛管理
+    .stacking-manage-wrapper {
+      background-color: var(--bg-s-color);
+
+      .stacking-manage-center .stacking-list-row {
+        background-color: #005baf;
+
+        .stack-col {
+          border-right-color: var(--bg-s-color);
+        }
+      }
+    }
+
+    // 储运中心
+    .storageAndTransportation {
+      .search-wrapper {
+        background-color: var(--bg-s-color);
+
+        .ant-form-item .ant-form-item-label > label {
+          color: var(--fn-color);
+        }
+      }
+
+      .ant-list {
+        background-color: var(--bg-s-color);
+        font-size: 14px;
+
+        .ant-list-item .ant-list-item-meta .ant-list-item-meta-title {
+          color: var(--fn-color);
+        }
+
+        .ant-card-bordered {
+          border-color: var(--bg-color);
+        }
+
+        .ant-card {
+          background-color: #004d94;
+          color: var(--fn-color);
+
+          .ant-card-head {
+            border-bottom-color: #0085ff;
+          }
+
+          .heat-title {
+            font-size: 16px;
+            color: var(--fn-color);
+          }
+
+          .ant-table-wrapper .ant-table {
+            background-color: var(--bg-color);
+          }
+
+          .ant-table-wrapper .ant-table-thead > tr > th,
+          .ant-table-wrapper .ant-table-thead > tr > td {
+            background-color: var(--bg-color);
+            color: var(--fn-color);
+            font-size: 16px;
+          }
+
+          .ant-table-wrapper .ant-table-tbody > tr.ant-table-row:hover > td,
+          .ant-table-wrapper .ant-table-tbody > tr > td.ant-table-cell-row-hover {
+            background-color: var(--bg-s-color);
+          }
+
+          .ant-table-wrapper .ant-table.ant-table-small {
+            font-size: 16px;
+          }
+        }
+      }
+
+      .next-ticket {
+        border-left-color: orange;
+        background: var(--bg-s-color);
+
+        .ant-descriptions .ant-descriptions-item-content {
+          font-size: 15px;
+        }
+
+        .ant-descriptions .ant-descriptions-item-label {
+          color: var(--fn-color);
+          font-size: 16px;
+        }
+      }
+
+      .ticket-content {
+        .ant-descriptions-view {
+          border-color: var(--fn-color);
+
+          .ant-descriptions-row {
+            border-color: var(--fn-color);
+          }
+
+          .ant-descriptions-item-label,
+          .ant-descriptions-item-content {
+            border-inline-end-color: var(--fn-color);
+          }
+        }
+      }
+    }
+
+    // 打印
+    #printContent {
+      .ant-descriptions .ant-descriptions-item-content {
+        color: rgba(51, 51, 51, 0.88);
+      }
+    }
+  }
 </style>

+ 2 - 1
src/layouts/default/tabs/components/TabRedo.vue

@@ -1,6 +1,7 @@
 <template>
   <span :class="`${prefixCls}__extra-redo`" @click="handleRedo">
-    <SvgIcon name="reload-01"></SvgIcon>
+    <!-- <SvgIcon name="reload-01"></SvgIcon> -->
+    <Icon icon="ant-design:sync-outlined" />
   </span>
 </template>
 <script lang="ts">

+ 1 - 1
src/views/billet/BilletLiftingBillList/BilletLiftingBill.data.ts

@@ -7,7 +7,7 @@ import { groupArray } from '/@/views/billet/hotDelivery/common.data';
 const liftingTypeObj = {
   '0': { label: '热送', value: '0', color: 'red' },
   '1': { label: '热装', value: '1', color: 'orange' },
-  '2': { label: '堆垛', value: '2', color: 'default' },
+  '2': { label: '堆垛', value: '2', color: 'pink' },
 };
 
 //列表数据

+ 15 - 13
src/views/billet/shippingBill/components/printModal.vue

@@ -1,6 +1,6 @@
 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose title="装运单打印" :height="400" :width="800" ok-text="打印" @ok="onPrint">
-    <section ref="print" style="padding: 20px 10px; position: relative; border: 1px solid #c5c5c5; background: beige" id="printContent">
+    <section ref="print" style="padding: 10px 10px 0; position: relative; border: 1px solid #c5c5c5; background: beige; width: 98%" id="printContent">
       <span style="position: absolute; right: 20px; top: 10px; font-size: 16px; font-weight: bold"
         >{{ info.ccmNo }}#机 / {{ info.btype == 1 ? '冷' : '热' }}</span
       >
@@ -10,40 +10,42 @@
             龙钢公司钢坯装运单
           </p>
         </div>
-        <div class="flex" style="line-height: 24px;">
+        <div class="flex" style="line-height: 24px">
           <div class="flex-1">库名:{{ info.destination }}</div>
-          <div class="flex-1" style="text-align: center;">{{ dayjs(info.arrivalTime).format('YYYY 年 MM 月 DD 日 HH 时 mm 分') }}</div>
-          <div class="flex-1" style="text-align: right;font-size: 12px;">
+          <div class="flex-1" style="text-align: center; font-size: 13px">{{
+            dayjs(info.arrivalTime).format('YYYY 年 MM 月 DD 日 HH 时 mm 分')
+          }}</div>
+          <div class="flex-1" style="text-align: right; font-size: 12px">
             {{ dayjs(info.arrivalTime).format('YYYYMMDDHHmmss') }}/{{ info.carNum }}/{{ info.carAllNum }}/{{ info.shift_dictText }}/{{
               info.shiftGroup_dictText
             }}
           </div>
         </div>
-        <a-descriptions style="margin-top: 10px; margin-bottom: 10px" layout="vertical" bordered :column="8" size="small">
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="序号">
+        <a-descriptions style="margin-top: 6px; margin-bottom: 4px" layout="vertical" bordered :column="8" size="small">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="序号">
             <div style="min-height: 80px; display: flex; align-items: center; justify-content: center"
               ><span>{{ info.carAllNum }}</span></div
             >
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="车号">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="车号">
             {{ info.licensePlate }}
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="牌号">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="牌号">
             <component :is="renderDictTag(info.brandNum, 'billet_spec')" />
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="炉号">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="炉号">
             <div v-for="item in headDtl" :key="item.id">{{ item.heatNo }} - {{ item.billetNos.length }}</div>
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="规格">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="规格">
             170 / {{ info.size }}
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="名称">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="名称">
             方坯
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="支数">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="支数">
             {{ info.amountTotal }}
           </a-descriptions-item>
-          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center" label="重量">
+          <a-descriptions-item style="border: 1px solid #bfbfbf; font-size: 12px; padding: 4px; text-align: center; height: 36px" label="重量">
             {{ weight > 0 ? weight.toFixed(4) : 0 }}
           </a-descriptions-item>
         </a-descriptions>

+ 2 - 1
src/views/billet/shippingBill/index.vue

@@ -353,7 +353,8 @@
         fixed: 'right',
       },
       pagination: {
-        pageSizeOptions: ['10', '20', '30'],
+        pageSizeOptions: ['5', '10', '15', '20', '30'],
+        defaultPageSize: 5,
       },
       rowSelection: { type: 'checkbox' },
     },

+ 8 - 8
src/views/billet/stackingManage/components/stacking.vue

@@ -525,14 +525,14 @@
     const { layer, address, steelBillet } = data;
     // 上一层是否有数据
     const upperLayerData = stackingInfoList.value[Number(layer) + 1];
-    if (upperLayerData) {
-      const hasBillet = upperLayerData.some((item) => item.steelBillet.length);
-      if (hasBillet) {
-        // 上一层有数据,就直接将数据放到上一层
-        createMessage.success(`请先删除第${Number(layer) + 1}层钢坯数据`);
-        return;
-      }
-    }
+    // if (upperLayerData) {
+    //   const hasBillet = upperLayerData.some((item) => item.steelBillet.length);
+    //   if (hasBillet) {
+    //     // 上一层有数据,就直接将数据放到上一层
+    //     createMessage.success(`请先删除第${Number(layer) + 1}层钢坯数据`);
+    //     return;
+    //   }
+    // }
 
     const diffKeys = selectedGpRows.value.filter((item) => steelBillet.includes(item.billetNo)).map((item) => item.id);
     stackingInfoList.value[layer][STEEL_MAX_POSITION_NUM - Number(address)].steelBillet = [];

+ 17 - 9
src/views/billet/storageAndTransportation/index.vue

@@ -57,7 +57,7 @@
                         </div>
                       </a-descriptions-item>
                     </a-descriptions>
-                    <a-descriptions layout="vertical" bordered :column="8" size="small">
+                    <a-descriptions class="ticket-content" layout="vertical" bordered :column="8" size="small">
                       <a-descriptions-item label="序号">{{ sval.carNum }}</a-descriptions-item>
                       <a-descriptions-item label="炉号">{{ sval.heatNo }}</a-descriptions-item>
                       <a-descriptions-item label="车号">{{ sval.licensePlate }}</a-descriptions-item>
@@ -97,7 +97,9 @@
   import dayjs from 'dayjs';
   import { render } from '/@/utils/common/renderUtils';
   import { useMethods } from '/@/hooks/system/useMethods';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
+  const { createMessage } = useMessage();
   //导入导出方法
   const { handleExportXls } = useMethods();
 
@@ -140,14 +142,14 @@
         dictCode: 'lg_bb',
       },
     },
-    {
-      label: '炉次日期',
-      field: 'createTime',
-      component: 'RangePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-      },
-    },
+    // {
+    //   label: '炉次日期',
+    //   field: 'createTime',
+    //   component: 'RangePicker',
+    //   componentProps: {
+    //     valueFormat: 'YYYY-MM-DD',
+    //   },
+    // },
     {
       label: '装运日期',
       field: 'storageTime',
@@ -191,6 +193,7 @@
   const listData = ref<Record<string, any>>([]);
   const loading = ref(false);
   const columnLine = [
+    { title: '日期', dataIndex: 'createTime' },
     { title: '定尺', dataIndex: 'size' },
     { title: '规格', dataIndex: 'spec' },
     { title: '支数', dataIndex: 'amount' },
@@ -316,6 +319,11 @@
   const onExportXls = () => {
     const values = getFieldsValue();
 
+    if (!values.storageTime_begin) {
+      createMessage.error('请选择装运日期');
+      return;
+    }
+
     if (!values.ccmNo) {
       values.ccmNo = '5';
     }