From a5bc2c77ec49a73b205c2053ea141151134a02ce Mon Sep 17 00:00:00 2001
From: zds <2388969634@qq.com>
Date: Tue, 23 Aug 2022 11:44:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/wms/pdm/produce/worktask/index.vue  | 19 +++++++++++++++++--
 .../wms/pdm/produce/worktask/print2Dialog.vue |  4 ++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
index 1a1caf4c..56f21d5a 100644
--- a/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
+++ b/mes/qd/src/views/wms/pdm/produce/worktask/index.vue
@@ -99,7 +99,7 @@
               end-placeholder="结束日期"
               :default-time="['00:00:00', '23:59:59']"
               @input="onInput()"
-              @change="crud.toQuery"
+              @change="mytoQuery"
             />
           </el-form-item>
           <rrOperation />
@@ -279,6 +279,7 @@ export default {
       printShow: false,
       currentRow: null,
       checkrows: [],
+      query_flag: true,
       XLList: []
     }
   },
@@ -296,12 +297,26 @@ export default {
       this.XLList = res
     })
     this.crud.query.createTime = [new Date().daysAgo(2), new Date()]
-    this.crud.toQuery()
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
+      if(this.query_flag){
+        this.crud.query.begin_time = (new Date().daysAgo(2)).toISOString()
+        this.crud.query.end_time = (new Date()).toISOString()
+        this.query_flag = false
+      }
       this.handleCurrentChange()
     },
+    mytoQuery(array1){
+      if(array1 === null){
+        this.crud.query.begin_time = ''
+        this.crud.query.end_time = ''
+      }else{
+        this.crud.query.begin_time = array1[0]
+        this.crud.query.end_time = array1[1]
+      }
+      this.crud.toQuery()
+    },
     toView(index, row) {
       this.mstrow = row
       this.viewShow = true
diff --git a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
index c4fe9b56..a4308f58 100644
--- a/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
+++ b/mes/qd/src/views/wms/pdm/produce/worktask/print2Dialog.vue
@@ -156,8 +156,8 @@ export default {
           LODOP.ADD_PRINT_TEXT('43mm', '65mm', '80mm', '27mm', '桶号：' + item.bucketunique + '')
 
           LODOP.ADD_PRINT_TEXT('59mm', '6mm', '140mm', '27mm', '编码：' + item.material_code + '')
-          LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '牌号：' + item.old_mark + '')
-          LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '名称：' + item.material_name + '')
+          LODOP.ADD_PRINT_TEXT('72mm', '6mm', '140mm', '27mm', '牌号：' + item.old_mark + '')
+          LODOP.ADD_PRINT_TEXT('85mm', '6mm', '140mm', '27mm', '名称：' + item.material_name + '')
           LODOP.ADD_PRINT_TEXT('85mm', '110mm', '60mm', '27mm', '序号：' + item.order_no + '')
           // LODOP.PREVIEW()// 预览
           LODOP.PRINT()// 打印