Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

2026-01-13 10:32:07 +08:00
parent 567e0262c5 c1cca9e7a1
commit 7c2bf4022b
4 changed files with 76 additions and 30 deletions
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -138,6 +138,8 @@
                  </el-popover>

                  <i class="el-icon-view param-icon" @click="handlePreviewLabel(item)" title="查看标签"></i>
+                  <!-- <el-button style="margin-left: 0px; padding: 4px !important;" type="text" size="mini" @click="handlePreviewLabel(item)" title="查看标签">预览</el-button> -->
+                  <el-button style="margin-left: 0px; padding: 4px !important;" type="text" size="mini" @click="handlePrintLabel(item)" title="打印标签">打印</el-button>
                </div>
              </div>

@@ -328,7 +330,7 @@
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="info" @click="handleAbnormal">查看异常</el-button>
-        <el-button :loading="buttonLoading" type="primary" @click="confirmException">确 定</el-button>
+        <el-button type="primary" @click="confirmException">确 定</el-button>
        <el-button @click="cancelException">取 消</el-button>
      </div>
    </el-dialog>
@@ -337,6 +339,8 @@
    <el-dialog title="标签预览" :visible.sync="labelRender.visible" append-to-body>
      <label-render :content="labelRender.data" :labelType="labelRender.type" />
    </el-dialog>
+
+    <label-render ref="labelRender" v-show="false" :content="labelRender.data" :labelType="labelRender.type" />
  </div>
 </template>

@@ -477,6 +481,21 @@ export default {
  },
  methods: {
    parseTime,
+    // 打印标签
+    handlePrintLabel(row) {
+      const item = row.itemType === 'product' ? row.product : row.rawMaterial;
+      const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || '';
+
+      this.labelRender.type = row.itemType === 'product' ? '3' : '2'
+      this.labelRender.data = {
+        ...row,
+        itemName: itemName,
+        updateTime: row.updateTime?.split(' ')[0] || '',
+      };
+      this.$nextTick(() => {
+        this.$refs.labelRender.printLabel();
+      })
+    },

     /** 预览标签 */
    handlePreviewLabel(row) {
--- a/klp-ui/src/views/wms/report/delivery.vue
+++ b/klp-ui/src/views/wms/report/delivery.vue
@@ -3,12 +3,12 @@
    <el-row>
      <el-form label-width="80px" inline>
        <el-form-item label="开始时间" prop="startTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择开始时间"></el-date-picker>
+          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeStart" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
        </el-form-item>
        <el-form-item label="结束时间" prop="endTime">
-          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择结束时间"></el-date-picker>
+          <el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeEnd" type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
        </el-form-item>
        <el-form-item label="入场钢卷号" prop="endTime">
          <el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
@@ -113,15 +113,24 @@ export default {
    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
    const addZero = (num) => num.toString().padStart(2, '0')

-    const now = new Date()
-    // 基于【本地北京时间】获取年月日
-    const year = now.getFullYear()
-    const month = addZero(now.getMonth() + 1) // 月份+1 补零
-    const day = addZero(now.getDate())
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)

-    // ✅ 正确的 北京时间 今日开始/结束时间
-    const startTime = `${year}-${month}-${day} 00:00:00`
-    const endTime = `${year}-${month}-${day} 23:59:59`
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00`
    return {
      list: [],
      queryParams: {
--- a/klp-ui/src/views/wms/report/receive.vue
+++ b/klp-ui/src/views/wms/report/receive.vue
@@ -122,15 +122,24 @@ export default {
    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
    const addZero = (num) => num.toString().padStart(2, '0')

-    const now = new Date()
-    // 基于【本地北京时间】获取年月日
-    const year = now.getFullYear()
-    const month = addZero(now.getMonth() + 1) // 月份+1 补零
-    const day = addZero(now.getDate())
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)

-    // ✅ 正确的 北京时间 今日开始/结束时间
-    const startTime = `${year}-${month}-${day} 00:00:00`
-    const endTime = `${year}-${month}-${day} 23:59:59`
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00`
    return {
      list: [],
      queryParams: {
--- a/klp-ui/src/views/wms/report/zha.vue
+++ b/klp-ui/src/views/wms/report/zha.vue
@@ -112,18 +112,27 @@ export default {
  },
  dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
  data() {
-    // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
+   // 工具函数：个位数补零，保证格式统一（比如 9 → 09，5 → 05）
    const addZero = (num) => num.toString().padStart(2, '0')

-    const now = new Date()
-    // 基于【本地北京时间】获取年月日
-    const year = now.getFullYear()
-    const month = addZero(now.getMonth() + 1) // 月份+1 补零
-    const day = addZero(now.getDate())
+    const now = new Date() // 当前本地北京时间
+    // 核心：获取【昨天】的日期对象（自动处理跨月/跨年，无边界问题）
+    const yesterday = new Date(now)
+    yesterday.setDate(yesterday.getDate() - 1)

-    // ✅ 正确的 北京时间 今日开始/结束时间
-    const startTime = `${year}-${month}-${day} 00:00:00`
-    const endTime = `${year}-${month}-${day} 23:59:59`
+    // 昨天的年、月、日（补零格式化）
+    const yesYear = yesterday.getFullYear()
+    const yesMonth = addZero(yesterday.getMonth() + 1)
+    const yesDay = addZero(yesterday.getDate())
+
+    // 今天的年、月、日（补零格式化）
+    const nowYear = now.getFullYear()
+    const nowMonth = addZero(now.getMonth() + 1)
+    const nowDay = addZero(now.getDate())
+
+    // ✅ 目标时间区间：昨天早上6点 至 今天早上6点
+    const startTime = `${yesYear}-${yesMonth}-${yesDay} 06:00:00`
+    const endTime = `${nowYear}-${nowMonth}-${nowDay} 06:00:00`
    return {
      list: [],
      queryParams: {