diff --git a/src/api/production/calendarInfo.js b/src/api/production/calendarInfo.js
index 5e795e9..bc08cda 100644
--- a/src/api/production/calendarInfo.js
+++ b/src/api/production/calendarInfo.js
@@ -31,7 +31,8 @@ export function addSAPCalendar(data) {
return request({
url: '/sap/port/addSAPCalendar',
method: 'post',
- data: data
+ data: data,
+ timeout: 1000 * 60 * 10
})
}
diff --git a/src/views/report/WIPInquiryReport/index.vue b/src/views/report/WIPInquiryReport/index.vue
index 50c623b..975965b 100644
--- a/src/views/report/WIPInquiryReport/index.vue
+++ b/src/views/report/WIPInquiryReport/index.vue
@@ -96,7 +96,8 @@
icon="el-icon-edit"
@click="handleOrderDetails(scope.row)"
v-hasPermi="['report:pointDnb:edit']"
- >查看订单明细
+ >查看订单明细
+
@@ -117,7 +118,6 @@ import {
} from '@/api/report/reportAPI'
import { findProductLineList } from '@//api/base/productLine'
import { parseTime } from '@//utils/ruoyi'
-import { getPointDnb } from '@//api/report/pointDnb'
export default {
name: 'ReportInfo',
@@ -153,8 +153,8 @@ export default {
beginBeginTime: null,
endBeginTime: null,
productLineCode: 'CX_02',
- beginStationCode: null,
- endStationCode: null,
+ beginStationCode: '109',
+ endStationCode: '280',
ORDER_CODE: null,
MATERIAL_CODE: null,
MATERIAL_NAME: null,
@@ -175,7 +175,7 @@ export default {
{ key: 5, label: `物料名称`, visible: true },
{ key: 6, label: `产品编号`, visible: true },
{ key: 7, label: `产品名称`, visible: true },
- { key: 8, label: `数量`, visible: true },
+ { key: 8, label: `数量`, visible: true }
],
// 产线选项
productLineList: [],
@@ -193,7 +193,7 @@ export default {
findProductLineList({ productLineType: 1 }).then(response => {
this.productLineList = response.data
}).then(() => {
- return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
+ return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1'})
}).then(response => {
this.findStationList = response.data
})
@@ -208,7 +208,7 @@ export default {
this.loading = true
WIPInquiryReportList(this.queryParams).then(response => {
this.reportList = response.data
- this.totalSum = 0;
+ this.totalSum = 0
this.reportList.forEach(e => {
this.totalSum += e.COMP_AMOUNT
})
@@ -254,9 +254,9 @@ export default {
/** 获取工位方法 */
getStationList() {
- this.queryParams.beginStationCode = null;
- this.queryParams.endStationCode = null;
- findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
+ this.queryParams.beginStationCode = null
+ this.queryParams.endStationCode = null
+ findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode, executionSort: '1'})
.then(response => {
this.findStationList = response.data
})
diff --git a/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue b/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
index 4122e5b..6aa7bd8 100644
--- a/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
+++ b/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
@@ -57,6 +57,16 @@
>导出
+
+ 缺陷明细导出
+
+
@@ -300,6 +310,13 @@ export default {
this.download('/report/qualityReport/qualityDefectsStatisticalAnalysisList/export', {
...this.queryParams
}, `质量缺陷统计分析_${new Date().getTime()}.xlsx`)
+ },
+
+ /** 导出按钮操作 */
+ handleDetailExport() {
+ this.download('/report/qualityReport/qualityDefectsDetailList/export', {
+ ...this.queryParams
+ }, `质量缺陷统计分析明细_${new Date().getTime()}.xlsx`)
}
}