fix: 修复钢卷管理相关页面问题和优化功能

- 修复钢卷历史页面控制显示问题
- 在交货报表中添加dataType参数
- 修改checkCoilNo接口支持coilId参数
- 优化镀锌报表查询逻辑,使用Promise.all并行请求
- 修复轧硬报表仓库ID错误问题
- 移除钢卷入库页面的只读限制
- 修复钢卷删除功能,支持删除带coilId的记录
This commit is contained in:
砂糖
2026-01-16 13:07:30 +08:00
parent 4526db8b0e
commit ea9f7fce34
6 changed files with 64 additions and 44 deletions

View File

@@ -137,6 +137,7 @@ export default {
pageNum: 1,
pageSize: 9999,
status: 1,
dataType: 1,
byExportTimeStart: startTime,
byExportTimeEnd: endTime,
selectType: 'product',

View File

@@ -90,9 +90,6 @@
<script>
import { listCoilWithIds } from "@/api/wms/coil";
import {
listPendingAction,
} from '@/api/wms/pendingAction';
import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue";
@@ -175,16 +172,16 @@ export default {
...this.queryParams,
pageSize: 9999,
pageNum: 1,
dataType: 1,
// dataType: 1,
createBy: 'suanzhakuguan',
warehouseId: '1988150323162836993'
warehouseId: '1988150099140866050'
}),
// 镀锌原料库
listCoilWithIds({
...this.queryParams,
pageSize: 9999,
pageNum: 1,
dataType: 1,
// dataType: 1,
selectType: 'raw_material',
createBy: 'suanzhakuguan',
warehouseId: '1988150263284953089'
@@ -194,7 +191,7 @@ export default {
...this.queryParams,
pageSize: 9999,
pageNum: 1,
dataType: 1,
// dataType: 1,
selectType: 'raw_material',
createBy: 'suanzhakuguan',
warehouseId: '1988150545175736322'
@@ -204,7 +201,7 @@ export default {
...this.queryParams,
pageSize: 9999,
pageNum: 1,
dataType: 1,
// dataType: 1,
selectType: 'raw_material',
createBy: 'suanzhakuguan',
warehouseId: '1988150150521090049'

View File

@@ -166,15 +166,30 @@ export default {
methods: {
getList() {
this.loading = true
// 镀锌原料库,镀锌纵剪分条原料库
listCoilWithIds({
...this.queryParams,
pageSize: 9999,
pageNum: 1,
dataType: 1,
warehouseIds: '1988150263284953089,1988150487185289217'
}).then(res => {
const list = [...res.rows];
Promise.all([
// 镀锌成品库
listCoilWithIds({
...this.queryParams,
pageSize: 9999,
pageNum: 1,
// dataType: 1,
selectType: 'product',
// createBy: 'suanzhakuguan',
warehouseId: '1988150323162836993'
}),
// 镀锌纵剪分条原料库
listCoilWithIds({
...this.queryParams,
pageSize: 9999,
pageNum: 1,
// dataType: 1,
selectType: 'raw_material',
// createBy: 'suanzhakuguan',
warehouseId: '1988150487185289217'
}),
]).then(([res1, res2]) => {
console.log(res1, res2)
const list = [...res1.rows, ...res2.rows]
// 按照createTime 降序排序
this.list = list.sort(
(a, b) => new Date(b.createTime) - new Date(a.createTime)