feat(钢卷异常): 重构异常记录功能,增加开始/结束位置字段

refactor(发货单): 添加发货计划选择功能

feat(报表): 新增合并报表页面,支持投入产出钢卷统计

style: 移除多余的空格和注释代码
This commit is contained in:
砂糖
2026-03-17 14:52:54 +08:00
parent 3c745b8ce4
commit b6387a53d8
10 changed files with 367 additions and 26 deletions

View File

@@ -100,6 +100,12 @@
<!-- 添加或修改发货单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="发货计划" prop="planId">
<!-- <PlanSelector v-model="form.planId" /> -->
<el-select v-model="form.planId" placeholder="请选择发货计划" filterable>
<el-option v-for="plan in planListOption" :key="plan.planId" :label="plan.planName" :value="plan.planId" />
</el-select>
</el-form-item>
<el-form-item label="发货单名称" prop="waybillName">
<el-input v-model="form.waybillName" placeholder="请输入发货单名称" />
</el-form-item>
@@ -147,6 +153,7 @@
<script>
import { listDeliveryWaybill, getDeliveryWaybill, delDeliveryWaybill, addDeliveryWaybill, updateDeliveryWaybill, updateDeliveryWaybillStatus } from "@/api/wms/deliveryWaybill";
import { listSelectableCoils } from "@/api/wms/deliveryPlan"; // 导入发货计划API
import { listDeliveryPlan } from "@/api/wms/deliveryPlan";
import { listCoilByIds } from "@/api/wms/coil";
import { listDeliveryWaybillDetail } from "@/api/wms/deliveryWaybillDetail";
import MemoInput from "@/components/MemoInput";
@@ -154,7 +161,7 @@ import DeliveryWaybillDetail from "../components/detailTable.vue";
import WayBill from "../components/wayBill.vue";
import PlanList from "../components/planList.vue";
import WayBill2 from "../components/wayBill2.vue";
import PlanSelector from "../components/planSelector.vue";
export default {
name: "DeliveryWaybill",
@@ -163,7 +170,8 @@ export default {
DeliveryWaybillDetail,
WayBill,
PlanList,
WayBill2
WayBill2,
PlanSelector
},
data() {
return {
@@ -194,6 +202,8 @@ export default {
printType: 0,
// 是否显示弹出层
open: false,
// 发货计划列表
planListOption: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -228,6 +238,7 @@ export default {
};
},
created() {
this.loadPlanList();
this.getList();
},
computed: {
@@ -242,6 +253,11 @@ export default {
},
methods: {
/** 查询发货单列表 */
loadPlanList() {
listDeliveryPlan({ pageSize: 100, pageNum: 1, planType: 0 }).then(response => {
this.planListOption = response.rows || [];
});
},
getList() {
this.loading = true;
// 确保查询参数包含planId