From d41ed132b3c392d2b69ff0bfaf43991097a76dcb Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 13 Dec 2023 16:38:53 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/pad/padPart1.vue              |  2 +-
 src/views/modules/production/generateReport.vue |  2 ++
 .../modules/production/shopOrderProductView.vue | 17 +++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue
index 9808d63..f430570 100644
--- a/src/views/modules/pad/padPart1.vue
+++ b/src/views/modules/pad/padPart1.vue
@@ -57,7 +57,7 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" @click="jumpPadPartAttribute(scope.row)">属性</a> &nbsp&nbsp|&nbsp&nbsp
-          <a type="text" size="small" @click="jumpPadPartPhoto(scope.row)">SOP</a>
+          <a type="text" size="small" @click="jumpPadPartPhoto(scope.row)">图纸</a>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/modules/production/generateReport.vue b/src/views/modules/production/generateReport.vue
index fc8a82a..38ae571 100644
--- a/src/views/modules/production/generateReport.vue
+++ b/src/views/modules/production/generateReport.vue
@@ -861,6 +861,8 @@
             // this.search()
             let inList=[];
             if(data.transData!=null){
+              //他们要打印2张
+              inList.push(data.transData)
               inList.push(data.transData)
             }
             if(data.badData!=null){
diff --git a/src/views/modules/production/shopOrderProductView.vue b/src/views/modules/production/shopOrderProductView.vue
index 96b8ae8..cabebf2 100644
--- a/src/views/modules/production/shopOrderProductView.vue
+++ b/src/views/modules/production/shopOrderProductView.vue
@@ -162,6 +162,23 @@
             serialNumber: null,
             columnType: null,
             align: 'right'
+          }, {
+            tableId: "orderView",
+            tableName: this.$route.meta.title,
+            columnProp: "firstReportDate",
+            columnLabel: "首次报工日期",
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            columnWidth: 60,
+            format: null,
+            functionId: this.$route.meta.menuId,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            serialNumber: null,
+            columnType: null,
+            align: 'center'
           },
           {
             tableId: "orderView",