DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-03-02 11:06:17 +08:00
parent 81e98ab751 a9091b425d
commit 76ec1aa2d7
10 changed files with 389 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
klp-ui/src/views/wms/report/zha/day.vue
View File

@@ -65,7 +65,8 @@
<!-- 异常统计 -->
<el-descriptions title="异常统计" :column="4" border>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
}}</el-descriptions-item>
</el-descriptions>
<el-descriptions title="明细信息" :column="3" border>
@@ -312,16 +313,27 @@ 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 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) {
@@ -342,7 +354,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

20
klp-ui/src/views/wms/report/zha/month.vue
View File

@@ -334,16 +334,27 @@ 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 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) {
@@ -364,7 +375,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

22
klp-ui/src/views/wms/report/zha/team.vue
View File

@@ -389,16 +389,27 @@ 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 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) {
@@ -406,7 +417,7 @@ export default {
message: '暂无数据',
type: 'warning',
})
this.list = []
this.lossList = []
this.loading = false
return
}
@@ -419,7 +430,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

22
klp-ui/src/views/wms/report/zha/year.vue
View File

@@ -318,16 +318,27 @@ 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 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) {
@@ -348,7 +359,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

20
klp-ui/src/views/wms/report/zha_.vue
View File

@@ -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,8 +190,19 @@ export default {
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
}).then(res => {
const actions = res.rows
})
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) {
@@ -212,7 +223,6 @@ export default {
this.list = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

23
klp-ui/src/views/wms/report/zinc/day.vue
View File

@@ -65,7 +65,8 @@
<!-- 异常统计 -->
<el-descriptions title="异常统计" :column="4" border>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value }}</el-descriptions-item>
<el-descriptions-item v-for="item in abSummary" :key="item.label" :label="item.label">{{ item.value
}}</el-descriptions-item>
</el-descriptions>
<el-descriptions title="明细信息" :column="3" border>
@@ -298,16 +299,27 @@ 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 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) {
@@ -328,7 +340,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

22
klp-ui/src/views/wms/report/zinc/month.vue
View File

@@ -320,16 +320,27 @@ 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 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) {
@@ -337,7 +348,7 @@ export default {
message: '暂无数据',
type: 'warning',
})
this.lossList = []
this.list = []
this.loading = false
return
}
@@ -350,7 +361,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

20
klp-ui/src/views/wms/report/zinc/team.vue
View File

@@ -376,16 +376,27 @@ 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 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) {
@@ -406,7 +417,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

24
klp-ui/src/views/wms/report/zinc/year.vue
View File

@@ -302,16 +302,27 @@ 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 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) {
@@ -319,7 +330,7 @@ export default {
message: '暂无数据',
type: 'warning',
})
this.lossList = []
this.list = []
this.loading = false
return
}
@@ -332,7 +343,6 @@ export default {
this.lossList = res.rows
this.loading = false
})
})
},
// 导出
exportData() {

20
klp-ui/src/views/wms/report/zinc_.vue
View File

@@ -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,8 +190,19 @@ export default {
pageNum: 1,
startTime: this.queryParams.byCreateTimeStart,
endTime: this.queryParams.byCreateTimeEnd,
}).then(res => {
const actions = res.rows
})
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) {
@@ -212,7 +223,6 @@ export default {
this.list = res.rows
this.loading = false
})
})
},
// 导出
exportData() {