diff --git a/src/api/report/reportAPI.js b/src/api/report/reportAPI.js index 8048136..e0e760c 100644 --- a/src/api/report/reportAPI.js +++ b/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 }) } diff --git a/src/views/report/boxTurnoverTraceabilityReport/index.vue b/src/views/report/boxTurnoverTraceabilityReport/index.vue index ed500b0..133a6dd 100644 --- a/src/views/report/boxTurnoverTraceabilityReport/index.vue +++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue @@ -111,6 +111,7 @@ + @@ -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: [], diff --git a/src/views/report/supplementBarCode/index.vue b/src/views/report/supplementBarCode/index.vue index 22c3f8b..96ea504 100644 --- a/src/views/report/supplementBarCode/index.vue +++ b/src/views/report/supplementBarCode/index.vue @@ -140,6 +140,7 @@ + @@ -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 }, ] }; },