feat: 增加调拨单审批功能及界面优化

fix(调拨单): 修正审批状态校验逻辑
feat(调拨单): 添加审批API接口
refactor(调拨单明细): 重构表格组件支持不同状态操作
style(调拨单): 优化界面显示和操作按钮
perf(发货单): 自动设置发货时间为当前时间
chore: 删除无用调拨记录页面
This commit is contained in:
砂糖
2026-04-10 11:10:30 +08:00
parent c323ef7a52
commit 9b52621df1
9 changed files with 324 additions and 1758 deletions

View File

@@ -1,359 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="钢卷id" prop="coilId">
<el-input
v-model="queryParams.coilId"
placeholder="请输入钢卷id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调拨前itemId" prop="itemIdBefore">
<el-input
v-model="queryParams.itemIdBefore"
placeholder="请输入调拨前itemId"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调拨后itemId" prop="itemIdAfter">
<el-input
v-model="queryParams.itemIdAfter"
placeholder="请输入调拨后itemId"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
<el-input
v-model="queryParams.materialTypeBefore"
placeholder="请输入修改前物料类型 1-原料 2-成品"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
<el-input
v-model="queryParams.materialTypeAfter"
placeholder="请输入修改后物料类型 1-原料 2-成品"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
<el-input
v-model="queryParams.warehouseIdBefore"
placeholder="请输入调拨前逻辑库区ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
<el-input
v-model="queryParams.warehouseIdAfter"
placeholder="请输入调拨后逻辑库区ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<TransferItemTable :data="list" />
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改调拨单明细对话框 -->
<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="关联调拨单ID" prop="transferId">
<el-input v-model="form.transferId" placeholder="请输入关联调拨单ID" />
</el-form-item>
<el-form-item label="钢卷id" prop="coilId">
<el-input v-model="form.coilId" placeholder="请输入钢卷id" />
</el-form-item>
<el-form-item label="调拨前itemId" prop="itemIdBefore">
<el-input v-model="form.itemIdBefore" placeholder="请输入调拨前itemId" />
</el-form-item>
<el-form-item label="调拨后itemId" prop="itemIdAfter">
<el-input v-model="form.itemIdAfter" placeholder="请输入调拨后itemId" />
</el-form-item>
<el-form-item label="修改前物料类型 1-原料 2-成品" prop="materialTypeBefore">
<el-input v-model="form.materialTypeBefore" placeholder="请输入修改前物料类型 1-原料 2-成品" />
</el-form-item>
<el-form-item label="修改后物料类型 1-原料 2-成品" prop="materialTypeAfter">
<el-input v-model="form.materialTypeAfter" placeholder="请输入修改后物料类型 1-原料 2-成品" />
</el-form-item>
<el-form-item label="调拨前逻辑库区ID" prop="warehouseIdBefore">
<el-input v-model="form.warehouseIdBefore" placeholder="请输入调拨前逻辑库区ID" />
</el-form-item>
<el-form-item label="调拨后逻辑库区ID" prop="warehouseIdAfter">
<el-input v-model="form.warehouseIdAfter" placeholder="请输入调拨后逻辑库区ID" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listTransferOrderItem, getTransferOrderItem, delTransferOrderItem, addTransferOrderItem, updateTransferOrderItem } from "@/api/wms/transferOrderItem";
import TransferItemTable from "./components/tranferItemTable.vue";
export default {
name: "TransferOrderItem",
components: {
TransferItemTable,
},
data() {
return {
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 调拨单明细表格数据
transferOrderItemList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
transferId: undefined,
coilId: undefined,
itemIdBefore: undefined,
itemIdAfter: undefined,
materialTypeBefore: undefined,
materialTypeAfter: undefined,
warehouseIdBefore: undefined,
warehouseIdAfter: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
orderItemId: [
{ required: true, message: "调拨明细主键ID不能为空", trigger: "blur" }
],
transferId: [
{ required: true, message: "关联调拨单ID不能为空", trigger: "blur" }
],
coilId: [
{ required: true, message: "钢卷id不能为空", trigger: "blur" }
],
itemIdBefore: [
{ required: true, message: "调拨前itemId不能为空", trigger: "blur" }
],
itemIdAfter: [
{ required: true, message: "调拨后itemId不能为空", trigger: "blur" }
],
materialTypeBefore: [
{ required: true, message: "修改前物料类型 1-原料 2-成品不能为空", trigger: "blur" }
],
materialTypeAfter: [
{ required: true, message: "修改后物料类型 1-原料 2-成品不能为空", trigger: "blur" }
],
warehouseIdBefore: [
{ required: true, message: "调拨前逻辑库区ID不能为空", trigger: "blur" }
],
warehouseIdAfter: [
{ required: true, message: "调拨后逻辑库区ID不能为空", trigger: "blur" }
],
remark: [
{ required: true, message: "备注不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询调拨单明细列表 */
getList() {
this.loading = true;
listTransferOrderItem(this.queryParams).then(response => {
this.transferOrderItemList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
orderItemId: undefined,
transferId: undefined,
coilId: undefined,
itemIdBefore: undefined,
itemIdAfter: undefined,
materialTypeBefore: undefined,
materialTypeAfter: undefined,
warehouseIdBefore: undefined,
warehouseIdAfter: undefined,
remark: undefined,
delFlag: undefined,
createBy: undefined,
updateBy: undefined,
createTime: undefined,
updateTime: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.orderItemId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加调拨单明细";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const orderItemId = row.orderItemId || this.ids
getTransferOrderItem(orderItemId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改调拨单明细";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.orderItemId != null) {
updateTransferOrderItem(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addTransferOrderItem(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const orderItemIds = row.orderItemId || this.ids;
this.$modal.confirm('是否确认删除调拨单明细编号为"' + orderItemIds + '"的数据项?').then(() => {
this.loading = true;
return delTransferOrderItem(orderItemIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/transferOrderItem/export', {
...this.queryParams
}, `transferOrderItem_${new Date().getTime()}.xlsx`)
}
}
};
</script>