Merge remote-tracking branch 'origin/master'

# Conflicts: # ruoyi-ui/src/lang/zh.js
2025-06-10 17:35:03 +08:00
parent b80c625e11 f0a45775e8
commit 163abf604d
14 changed files with 3319 additions and 46 deletions
--- a/ruoyi-ui/src/views/in/stockIn/index.vue
+++ b/ruoyi-ui/src/views/in/stockIn/index.vue
@@ -323,6 +323,7 @@ import {
  confirmationStockIn
 } from "@/api/in/stockIn"
 import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail"
+import {getLodop} from "@/plugins/LodopFuncs.js"


 export default {
@@ -552,15 +553,51 @@ export default {
    },
    /** 打印条码按钮操作 */
    handleBarcodePrinting(row){
-      const stockInId =  row.stockinDetailId ||this.detailIds;
-      //console.log(stockInId)
-      var data = {
-        "stockinIdList": stockInId
+      let printData = this.stockInDetailListSelected
+
+
+
+      if (printData.length === 0) {
+        this.$modal.msgWarning("请选择要打印的数据")
+        return
+      }
+      console.log(printData)
+
+      this.printBarcode(printData)
+    },
+    /** 打印条码 */
+    printBarcode(printData) {
+      try {
+        // 获取Lodop打印对象
+        let LODOP = getLodop()
+        if (!LODOP) {
+          this.$modal.msgError("打印控件未安装或启动失败")
+          return
+        }
+        LODOP.SET_SHOW_MODE("LANGUAGE", 0);
+        LODOP.PRINT_INITA(10, 10, 1000, 800, "物资条码");
+        LODOP.SET_PRINT_PAGESIZE(1, 1000, 500, 0);
+        LODOP.SET_PRINT_MODE("AUTO_CLOSE_PREWINDOW", 1);
+
+        for (let i = 0; i < printData.length; i++) {
+          LODOP.NewPage();
+          LODOP.ADD_PRINT_BARCODE(17,35,120,120,"QRCode",printData[i].stockinDetailId);
+          LODOP.ADD_PRINT_TEXT(22,147,72,20,"物料编码:");
+          LODOP.ADD_PRINT_TEXT(22,205,180,20,printData[i].productId);
+          LODOP.ADD_PRINT_TEXT(44,147,66,20,"物料名称:");
+          LODOP.ADD_PRINT_TEXT(44,206,180,35,printData[i].extraField.materialDesc);
+          LODOP.ADD_PRINT_TEXT(66,148,64,20,"英文描述:");
+          LODOP.ADD_PRINT_TEXT(66,205,180,20,printData[i].extraField.englishDesc);
+          LODOP.ADD_PRINT_TEXT(88,148,64,20,"包装方式:");
+          LODOP.ADD_PRINT_TEXT(88,205,180,20,printData[i].extraField.packingMethod);
+          LODOP.ADD_PRINT_TEXT(110,147,61,20,"箱码:");
+          LODOP.ADD_PRINT_TEXT(110,196,180,20,printData[i].extraField.cartonNo);
+        }
+        LODOP.PREVIEW();
+      } catch (error) {
+        console.error('打印失败:', error)
+        this.$modal.msgError("打印失败: " + error.message)
      }
-      barcodePrinting(data).then(response => {
-        this.$modal.msgSuccess("打印成功")
-        this.getList()
-      })
    },
    /** 提交按钮 */
    submitForm() {
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -5,24 +5,24 @@
      <div class="col-sm-6" style="height: 45vh; padding: 10px;">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
-            <span>未完成入库任务概览</span>
+            <span>{{$t('viewsMain.unfinishedInboundTask')}}</span>
          </div>
          <el-table
            :data="table1Data"
            style="width: 100%"
            :height="tableHeight"
            v-loading="loading1">
-            <el-table-column prop="workValue" label="任务键值" />
-            <el-table-column prop="workName" label="未完成入库任务" />
-            <el-table-column prop="workNum" label="全部未完成数量">
+            <el-table-column prop="workValue"  :label="$t('viewsMain.taskKey')"  /> <!-- 任务键值 -->
+            <el-table-column prop="workName" :label="$t('viewsMain.unfinishedInboundTaskName')"  /><!-- 未完成入库任务 -->
+            <el-table-column prop="workNum" :label="$t('viewsMain.totalUnfinishedCount')" ><!-- 全部未完成数量 -->
 <!--              <template slot-scope="scope">-->
 <!--                {{ Number(scope.row.workNum).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
-            <el-table-column prop="by1" label="今日未完成数量">
-<!--              <template slot-scope="scope">-->
-<!--                {{ Number(scope.row.by1).toFixed(6) }}-->
-<!--              </template>-->
+            <el-table-column prop="by1" :label="$t('viewsMain.todayUnfinishedCount')"> <!-- 今日未完成数量 -->
+<!--              <template slot-scope="scope">
+  {{ Number(scope.row.by1).toFixed(6) }}
+         </template>-->
            </el-table-column>
          </el-table>
        </el-card>
@@ -32,23 +32,23 @@
      <div class="col-sm-6" style="height: 45vh; padding: 10px;">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
-            <span>已完成入库任务概览</span>
+            <span>{{$t('viewsMain.finishedInboundTask')}}</span>
          </div>
          <el-table
            :data="table2Data"
            style="width: 100%"
            :height="tableHeight"
            v-loading="loading2">
-            <el-table-column prop="workValue" label="任务键值" />
-            <el-table-column prop="workName" label="已完成入库任务" />
-            <el-table-column prop="workNum" label="全部已完成数量">
+            <el-table-column prop="workValue" :label="$t('viewsMain.taskKey')" /><!-- 任务键值 -->
+            <el-table-column prop="workName" :label="$t('viewsMain.finishedInboundTaskName')"  /><!-- 已完成入库任务 -->
+            <el-table-column prop="workNum" :label="$t('viewsMain.totalFinishedCount')" ><!-- 全部已完成数量 -->
 <!--              <template slot-scope="scope">-->
 <!--                {{ Number(scope.row.workNum).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
-            <el-table-column prop="by1" label="今日已完成数量">
-<!--              <template slot-scope="scope">-->
-<!--                {{ Number(scope.row.by1).toFixed(6) }}-->
+            <el-table-column prop="by1" :label="$t('viewsMain.todayFinishedCount')"> <!-- 今日已完成数量 -->
+<!--              <template slot-scope="scope">
+     {{ Number(scope.row.by1).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
          </el-table>
@@ -59,23 +59,23 @@
      <div class="col-sm-6" style="height: 45vh; padding: 10px;">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
-            <span>未完成出库任务概览</span>
+            <span>{{$t('viewsMain.unfinishedOutboundTask')}}</span>
          </div>
          <el-table
            :data="table3Data"
            style="width: 100%"
            :height="tableHeight"
            v-loading="loading3">
-            <el-table-column prop="workValue" label="任务键值" />
-            <el-table-column prop="workName" label="未完成出库任务" />
-            <el-table-column prop="workNum" label="全部未完成数量">
+            <el-table-column prop="workValue" :label="$t('viewsMain.taskKey')" /><!-- 任务键值 -->
+            <el-table-column prop="workName" :label="$t('viewsMain.unfinishedOutboundTaskName')" /><!-- 未完成出库任务 -->
+            <el-table-column prop="workNum" :label="$t('viewsMain.totalUnfinishedCount')"><!-- 全部未完成数量 -->
 <!--              <template slot-scope="scope">-->
 <!--                {{ Number(scope.row.workNum).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
-            <el-table-column prop="by1" label="今日未完成数量">
-<!--              <template slot-scope="scope">-->
-<!--                {{ Number(scope.row.by1).toFixed(6) }}-->
+            <el-table-column prop="by1" :label="$t('viewsMain.todayUnfinishedCount')"> <!-- 今日未完成数量 -->
+<!--              <template slot-scope="scope">
+             {{ Number(scope.row.by1).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
          </el-table>
@@ -86,23 +86,23 @@
      <div class="col-sm-6" style="height: 45vh; padding: 10px;">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
-            <span>已完成出库任务概览</span>
+            <span>{{$t('viewsMain.finishedOutboundTask')}}</span>
          </div>
          <el-table
            :data="table4Data"
            style="width: 100%"
            :height="tableHeight"
            v-loading="loading4">
-            <el-table-column prop="workValue" label="任务键值" />
-            <el-table-column prop="workName" label="已完成出库任务" />
-            <el-table-column prop="workNum" label="全部已完成数量">
+            <el-table-column prop="workValue" :label="$t('viewsMain.taskKey')" /><!-- 任务键值 -->
+            <el-table-column prop="workName" :label="$t('viewsMain.finishedOutboundTaskName')"  /><!-- 已完成出库任务 -->
+            <el-table-column prop="workNum" :label="$t('viewsMain.totalFinishedCount')" ><!-- 全部已完成数量 -->
 <!--              <template slot-scope="scope">-->
 <!--                {{ Number(scope.row.workNum).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
-            <el-table-column prop="by1" label="今日已完成数量">
-<!--              <template slot-scope="scope">-->
-<!--                {{ Number(scope.row.by1).toFixed(6) }}-->
+            <el-table-column prop="by1" :label="$t('viewsMain.todayFinishedCount')"> <!-- 今日已完成数量 -->
+<!--              <template slot-scope="scope">
+             {{ Number(scope.row.by1).toFixed(6) }}-->
 <!--              </template>-->
            </el-table-column>
          </el-table>