Merge remote-tracking branch 'origin/master'

src/api/report/reportAPI.js

@@ -203,6 +203,7 @@ export function weldLeakRateList(query) {
   return request({
     url: '/report/qualityReport/weldLeakRateList',
     method: 'get',
+    timeout: 100000,
     params: query
   })
 }

src/views/report/boxTurnoverTraceabilityReport/index.vue

@@ -111,6 +111,7 @@
       <el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
       <el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
       <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="280"/>
+      <el-table-column label="内胆码" align="center" prop="LINER_CODE" v-if="columns[11].visible" width="200"/>
       <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
       <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
       <el-table-column label="MES码打印时间" align="center" prop="PRINT_TIME" v-if="columns[10].visible" width="180"/>
@@ -251,6 +252,7 @@ export default {
         { key: 8, label: `MES条码`, visible: true },
         { key: 9, label: `成品条码`, visible: true },
         { key: 10, label: `MES码打印时间`, visible: true },
+        { key: 11, label: `内胆码`, visible: true },
       ],
       // 产线选项
       productLineList: [],

src/views/report/supplementBarCode/index.vue

@@ -140,6 +140,7 @@
         </template>
       </el-table-column>
       <el-table-column label="是否打印" align="center" prop="isPrint" v-if="columns[8].visible"/>
+      <el-table-column label="记录人" align="center" prop="createBy" v-if="columns[11].visible"/>
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->
@@ -264,6 +265,7 @@ export default {
             { key: 8, label: `是否打印`, visible: true },
             { key: 9, label: `打印原因`, visible: true },
             { key: 10, label: `记录时间`, visible: true },
+            { key: 11, label: `记录人`, visible: true },
         ]
     };
   },