0412 新看板

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>

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){

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",