0412 新看板

src/api/board.js

@@ -13,6 +13,7 @@ export const getPrintsList = data => createAPI(`board/getPrintsList/${data}`,'ge
 export const getStockPrintList= data => createAPI(`board/getStockPrintList/${data}`,'get',data)
 //
 export const getStockPrintListHunlian= data => createAPI(`board/getStockPrintListHunlian/${data}`,'get',data)
+export const getStockPrintListHunlianReturn= data => createAPI(`board/getStockPrintListHunlianReturn/${data}`,'get',data)
 export const updateStockPrintFlag= data => createAPI(`board/updateStockPrintFlag`,'post',data)
 export const SORoutingBoardForXiuBian= data => createAPI(`board/SORoutingBoardForXiuBian`,'post',data)
 export const SORoutingBoardForJianYan= data => createAPI(`board/SORoutingBoardForJianYan`,'post',data)

src/router/index.js

@@ -36,6 +36,7 @@ const globalRoutes = [
   { path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } },
   { path: '/autoPrint', component: _import('modules/autoPrint/autoPrint'), name: 'autoPrint', meta: { title: '自动打印标签' } },
   { path: '/autoPrintStockHunlian', component: _import('modules/autoPrint/autoPrintStockHunlian'), name: 'autoPrintStockHunlian', meta: { title: '自动打印混炼胶库存' } },
+  { path: '/autoPrintStockHunlianReturn', component: _import('modules/autoPrint/autoPrintStockHunlianReturn'), name: 'autoPrintStockHunlianReturn', meta: { title: '自动打印混炼胶退料' } },
   { path: '/SORoutingBoardForXiuBian', component: _import('modules/board/SORoutingBoardForXiuBian'), name: 'SORoutingBoardForXiuBian', meta: { title: '修边工序看板' } },
   { path: '/PODetailForW', component: _import('modules/board/PODetailForW'), name: 'PODetailForW', meta: { title: '外购件检验看板' } },
   { path: '/transFerBoardForHunlian', component: _import('modules/board/transFerBoardForHunlian'), name: 'transFerBoardForHunlian', meta: { title: '混炼待入库看板' } },

src/views/modules/autoPrint/autoPrintStockHunlian.vue

@@ -70,25 +70,7 @@
               }
               printMaterialLabelPreview(array2);
             }
-            if(data.rows8.length>0){
-              let array8=[];
-              for (let i = 0; i < data.rows8.length; i++) {
-                for (let j = 0; j <data.rows8[i].printQty ; j++) {
-                  array8.push(data.rows8[i])
-                }
-              }
-              printMaterialLabelReturn(array8);
-              for (let i = 0; i < data.rows8.length; i++) {
-                let inData={
-                  transNo:data.rows8[i].transNo,
-                  site:data.rows8[i].site
-                }
-                updateStockPrintFlag(inData).then(({data}) => {
 
-                })
-              }
-
-            }
           }
         })
       },

src/views/modules/autoPrint/autoPrintStockHunlianReturn.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="mod-config">
+    <h1>自动打印库存标签</h1>
+  </div>
+</template>
+
+<script>
+  let autoPrint = '' //数据刷新定时器
+  import {
+    getStockPrintListHunlianReturn,
+    updateStockPrintFlag
+  } from '@/api/board.js'
+  import {
+    printMaterialLabel,
+  } from "@/views/modules/print/print_stock_label.js"
+  import {
+    printMaterialLabelReturn,
+  } from "@/views/modules/print/print_stock_labelReturn.js"
+  import {
+    printMaterialLabelPreview,
+  } from "@/views/modules/print/print_stock_label_preview.js"
+  export default {
+    name: 'autoPrintStock',
+    data () {
+      return {
+        ip:this.$route.query.ip
+      }
+    },
+    mounted () {
+      this.refreshTable ()
+    },
+    methods: {
+      refreshTable () {
+        autoPrint = setInterval(() => {
+          this.printStock()
+        }, 3000)
+      },
+      printStock(){
+        let ipp='no'
+        if(this.ip){
+          ipp=this.ip
+        }
+        getStockPrintListHunlianReturn(ipp).then(({data}) => {
+          if (data.code == 0) {
+            if(data.rows8.length>0){
+              let array8=[];
+              for (let i = 0; i < data.rows8.length; i++) {
+                for (let j = 0; j <data.rows8[i].printQty ; j++) {
+                  array8.push(data.rows8[i])
+                }
+              }
+              printMaterialLabelReturn(array8);
+              for (let i = 0; i < data.rows8.length; i++) {
+                let inData={
+                  transNo:data.rows8[i].transNo,
+                  site:data.rows8[i].site
+                }
+                updateStockPrintFlag(inData).then(({data}) => {
+
+                })
+              }
+
+            }
+          }
+        })
+      },
+    },
+  }
+</script>
+
+<style >
+
+
+  .board2 .el-table .cell {
+    line-height: 13px;
+    font-size: 12px;
+    height: 13px;
+    padding: 0px;
+  }
+
+  .board2 .el-table .success-row {
+    background: #1bb61b;
+  }
+  .board2 .el-table .false-row {
+    /*background: #cbcb14;*/
+    background: #db1212;
+  }
+  .board2 .el-table .yellow-row{
+    background: #ffff00;
+  }
+</style>

src/views/modules/print/print_inspect_labelForB.js

@@ -74,18 +74,18 @@ export function printInspectLabelForB(printList) {
       LODOP.ADD_PRINT_TEXT(63,259,100,25,"确认结果:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",0);
-      LODOP.ADD_PRINT_TEXT(87,208,173,46,printData.remark);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",24);
-      LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
-      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+      // LODOP.ADD_PRINT_TEXT(87,208,173,46,printData.remark);
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",24);
+      // LODOP.SET_PRINT_STYLEA(0,"Alignment",2);
+      // LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(42,249,93,25,"Inspector:");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(42,329,59,25,printData.userId);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
-      LODOP.ADD_PRINT_TEXT(133,221,156,44,printData.inspectRemark);
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      // LODOP.ADD_PRINT_TEXT(133,221,156,44,printData.inspectRemark);
+      // LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
       LODOP.ADD_PRINT_TEXT(12,232,128,24,printData.type);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);