diff --git a/klp-ui/src/views/wms/report/zha/day.vue b/klp-ui/src/views/wms/report/zha/day.vue
index 48ba02fc..946a298a 100644
--- a/klp-ui/src/views/wms/report/zha/day.vue
+++ b/klp-ui/src/views/wms/report/zha/day.vue
@@ -63,9 +63,10 @@
{{ summary.abRate }}
-
+
- {{ item.value }}
+ {{ item.value
+ }}
@@ -268,7 +269,7 @@ export default {
summary() {
return calcSummary(this.list, this.lossList)
},
- abSummary() {
+ abSummary() {
return calcAbSummary(this.list)
}
},
@@ -312,36 +313,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.lossList = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'suanzhakuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.lossList = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zha/month.vue b/klp-ui/src/views/wms/report/zha/month.vue
index 9aab130d..8955a84a 100644
--- a/klp-ui/src/views/wms/report/zha/month.vue
+++ b/klp-ui/src/views/wms/report/zha/month.vue
@@ -334,36 +334,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.lossList = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'suanzhakuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.lossList = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zha/team.vue b/klp-ui/src/views/wms/report/zha/team.vue
index 8771cc09..bbc28ab6 100644
--- a/klp-ui/src/views/wms/report/zha/team.vue
+++ b/klp-ui/src/views/wms/report/zha/team.vue
@@ -389,36 +389,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.list = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'suanzhakuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.lossList = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zha/year.vue b/klp-ui/src/views/wms/report/zha/year.vue
index 50454f8b..f0fc65b9 100644
--- a/klp-ui/src/views/wms/report/zha/year.vue
+++ b/klp-ui/src/views/wms/report/zha/year.vue
@@ -318,36 +318,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 11, // 酸轧工序
- pageSize: 9999,
+ pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.lossList = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'suanzhakuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.lossList = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zha_.vue b/klp-ui/src/views/wms/report/zha_.vue
index cce07f00..ae4c6713 100644
--- a/klp-ui/src/views/wms/report/zha_.vue
+++ b/klp-ui/src/views/wms/report/zha_.vue
@@ -179,9 +179,9 @@ export default {
this.planList = res.rows
})
},
- getList() {
+ async getList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
@@ -190,28 +190,38 @@ export default {
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.list = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.list = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'suanzhakuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.list = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zinc/day.vue b/klp-ui/src/views/wms/report/zinc/day.vue
index 3aa6d401..28643833 100644
--- a/klp-ui/src/views/wms/report/zinc/day.vue
+++ b/klp-ui/src/views/wms/report/zinc/day.vue
@@ -65,7 +65,8 @@
- {{ item.value }}
+ {{ item.value
+ }}
@@ -298,36 +299,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.list = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'duxinkuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zinc/month.vue b/klp-ui/src/views/wms/report/zinc/month.vue
index 3d1b64ea..cf4be4ad 100644
--- a/klp-ui/src/views/wms/report/zinc/month.vue
+++ b/klp-ui/src/views/wms/report/zinc/month.vue
@@ -320,36 +320,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.lossList = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'duxinkuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zinc/team.vue b/klp-ui/src/views/wms/report/zinc/team.vue
index cd69c44b..d4877d4d 100644
--- a/klp-ui/src/views/wms/report/zinc/team.vue
+++ b/klp-ui/src/views/wms/report/zinc/team.vue
@@ -94,62 +94,62 @@
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
- -->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.status === 0 ? '在库' : '已出库' }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status === 0 ? '在库' : '已出库' }}
+
+
+
+
+
+
@@ -376,36 +376,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.list = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'duxinkuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zinc/year.vue b/klp-ui/src/views/wms/report/zinc/year.vue
index 95e9f200..f3469767 100644
--- a/klp-ui/src/views/wms/report/zinc/year.vue
+++ b/klp-ui/src/views/wms/report/zinc/year.vue
@@ -302,36 +302,46 @@ export default {
this.loading = false
})
},
- getLossList() {
+ async getLossList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
actionType: 501, // 镀锌工序
- pageSize: 9999,
+ pageSize: 999,
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.lossList = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.lossList = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'duxinkuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.lossList = res.rows
+ this.loading = false
})
},
// 导出
diff --git a/klp-ui/src/views/wms/report/zinc_.vue b/klp-ui/src/views/wms/report/zinc_.vue
index c8df2f6c..39b80183 100644
--- a/klp-ui/src/views/wms/report/zinc_.vue
+++ b/klp-ui/src/views/wms/report/zinc_.vue
@@ -179,9 +179,9 @@ export default {
this.planList = res.rows
})
},
- getList() {
+ async getList() {
this.loading = true
- listPendingAction({
+ const res1 = await listPendingAction({
// actionStatus: 2,
warehouseId: this.queryParams.planId,
// actionType: 401,
@@ -190,28 +190,38 @@ export default {
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
- }).then(res => {
- const actions = res.rows
- const coilIds = actions.map(item => item.coilId).join(',')
- console.log(coilIds)
- if (!coilIds) {
- this.$message({
- message: '暂无数据',
- type: 'warning',
- })
- this.list = []
- this.loading = false
- return
- }
- listCoilWithIds({
- ...this.queryParams,
- byCreateTimeStart: undefined,
- byCreateTimeEnd: undefined,
- coilIds: coilIds,
- }).then(res => {
- this.list = res.rows
- this.loading = false
+ })
+ const res2 = await listPendingAction({
+ // actionStatus: 2,
+ warehouseId: this.queryParams.planId,
+ // actionType: 401,
+ actionType: 200, // 分条工序
+ pageSize: 999,
+ pageNum: 1,
+ startTime: this.queryParams.byCreateTimeStart,
+ endTime: this.queryParams.byCreateTimeEnd,
+ updateBy: 'duxinkuguan',
+ })
+ const actions = res1.rows.concat(res2.rows)
+ const coilIds = actions.map(item => item.coilId).join(',')
+ console.log(coilIds)
+ if (!coilIds) {
+ this.$message({
+ message: '暂无数据',
+ type: 'warning',
})
+ this.list = []
+ this.loading = false
+ return
+ }
+ listCoilWithIds({
+ ...this.queryParams,
+ byCreateTimeStart: undefined,
+ byCreateTimeEnd: undefined,
+ coilIds: coilIds,
+ }).then(res => {
+ this.list = res.rows
+ this.loading = false
})
},
// 导出