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

Compare commits

base: DeXun:cdf49ab8fe8814e28af6d421317cb264d0edf60c
Branches Tags
DeXun:0.8.X DeXun:test.X
...
compare: DeXun:9cf0d289c39d7f68bee6eea5132121b41b2f62b7
Branches Tags
DeXun:0.8.X DeXun:test.X

3 Commits
cdf49ab8fe ... 9cf0d289c3

Author SHA1 Message Date
砂糖
9cf0d289c3 feat(wms): 添加表面处理字段显示和查询功能 
在发货单明细表和钢卷选择器中添加表面处理字段的显示和查询功能
同时优化钢卷选择时的品质状态校验逻辑
 2026-03-30 11:02:36 +08:00
砂糖
4988630db9 Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-03-30 10:29:07 +08:00
砂糖
a43cedc00f feat(wms/delivery): 改进发货单页面布局和交互 
添加可拖拽分割线调整表格和详情区域高度
固定顶部操作栏和表格区域滚动
优化页面整体样式和用户体验
 2026-03-30 09:50:52 +08:00
3 changed files with 141 additions and 58 deletions
Expand all files Collapse all files

13
klp-ui/src/components/CoilSelector/index.vue
View File

@@ -47,6 +47,9 @@
<muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家" <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
clearable /> clearable />
</el-form-item> </el-form-item>
<el-form-item label="表面处理">
<el-input v-model="queryParams.itemSurfaceTreatmentDesc" placeholder="请输入表面处理" clearable size="small" />
</el-form-item>
<el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy"> <el-form-item label="切边" prop="trimmingRequirement" v-if="orderBy">
<el-select v-model="queryParams.trimmingRequirement" placeholder="请选择切边" clearable style="width: 100%"> <el-select v-model="queryParams.trimmingRequirement" placeholder="请选择切边" clearable style="width: 100%">
<el-option label="净边" value="净边" /> <el-option label="净边" value="净边" />
@@ -78,6 +81,7 @@
<!-- 自定义列 --> <!-- 自定义列 -->
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop" <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
:width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" /> :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column> <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column> <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column> <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
@@ -95,6 +99,7 @@
<!-- 自定义列 --> <!-- 自定义列 -->
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align"
:prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" /> :prop="column.prop" :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column> <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column> <el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column> <el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
@@ -121,7 +126,10 @@
<el-table v-if="multiple && selectedCoils.length > 0" :data="selectedCoils"> <el-table v-if="multiple && selectedCoils.length > 0" :data="selectedCoils">
<el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop" <el-table-column v-for="column in renderColumns" :label="column.label" :align="column.align" :prop="column.prop"
:width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" /> :width="column.width" :show-overflow-tooltip="column.showOverflowTooltip" />
<el-table-column v-if="orderBy" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
<el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column> <el-table-column v-if="orderBy" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="orderBy" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="orderBy" label="包装" prop="packagingRequirement"></el-table-column>
<el-table-column label="操作" width="50"> <el-table-column label="操作" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -518,8 +526,9 @@ export default {
this.$message.warning('您没有权限选择此钢卷'); this.$message.warning('您没有权限选择此钢卷');
return; // 终止后续逻辑 return; // 终止后续逻辑
} }
if (this.disableO && row.qualityStatus == 'O') { const disabledOList = ['O', 'C+', 'C', 'C-', 'D+', 'D', 'D-']
this.$message.warning('O卷不能选择'); if (this.disableO && disabledOList.includes(row.qualityStatus)) {
this.$message.warning(`${row.qualityStatus}卷不能选择`);
return; return;
} }
this.handleSelect(row); this.handleSelect(row);

7
klp-ui/src/views/wms/delivery/components/detailTable.vue
View File

@@ -1,7 +1,8 @@
<template> <template>
<div v-loading="loading"> <div v-loading="loading" style="position: relative; top: 0; background-color: #f5f7fa;">
<div v-if="waybillId"> <div v-if="waybillId">
<el-row :gutter="10" class="mb8"> <!-- 这一部分始终定在最上方 -->
<el-row :gutter="10" class="mb8" style="position: sticky; top: 0; z-index: 10; padding: 10px; background-color: #fff;">
<el-col :span="2" style="font-weight: 900;">发货单明细</el-col> <el-col :span="2" style="font-weight: 900;">发货单明细</el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
@@ -46,6 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column label="规格" align="center" prop="specification" /> <el-table-column label="规格" align="center" prop="specification" />
<el-table-column label="材质" align="center" prop="material" /> <el-table-column label="材质" align="center" prop="material" />
<el-table-column label="表面处理" align="center" prop="surfaceTreatmentDesc" />
<!-- <el-table-column label="数量" align="center" prop="quantity" /> --> <!-- <el-table-column label="数量" align="center" prop="quantity" /> -->
<el-table-column label="重量" align="center" prop="weight" /> <el-table-column label="重量" align="center" prop="weight" />
<!-- <el-table-column label="单价" align="center" prop="unitPrice" /> --> <!-- <el-table-column label="单价" align="center" prop="unitPrice" /> -->
@@ -238,6 +240,7 @@ export default {
const coil = coilResponse.rows.find(c => c.coilId === item.coilId); const coil = coilResponse.rows.find(c => c.coilId === item.coilId);
if (coil) { if (coil) {
item.actualWarehouseName = coil.actualWarehouseName; item.actualWarehouseName = coil.actualWarehouseName;
item.surfaceTreatmentDesc = coil.surfaceTreatmentDesc;
} }
}); });
} }

177
klp-ui/src/views/wms/delivery/waybill/index.vue
View File

@@ -39,64 +39,68 @@
</el-descriptions> </el-descriptions>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: calc(100vh - 184px); overflow-y: scroll; overflow-x: hidden;"> <div style="height: calc(100vh - 204px); overflow: hidden; display: flex; flex-direction: column;">
<el-table v-loading="loading" border :data="deliveryWaybillList" highlight-current-row <div :style="{ height: topHeight + 'px', overflow: 'auto' }">
@row-click="handleRowClick"> <el-table v-loading="loading" border :data="deliveryWaybillList" highlight-current-row
<el-table-column label="发货单唯一ID" align="center" prop="waybillId" v-if="false" /> @row-click="handleRowClick">
<el-table-column label="发货单名称" align="center" prop="waybillName" /> <el-table-column label="发货单唯一ID" align="center" prop="waybillId" v-if="false" />
<el-table-column label="车牌" align="center" prop="licensePlate" width="100" /> <el-table-column label="发货单名称" align="center" prop="waybillName" />
<el-table-column label="收货单位" align="center" prop="consigneeUnit" /> <el-table-column label="车牌" align="center" prop="licensePlate" width="100" />
<!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> --> <el-table-column label="收货单位" align="center" prop="consigneeUnit" />
<el-table-column label="订单编号" align="center" prop="orderNo"> <!-- <el-table-column label="发货单位" align="center" prop="senderUnit" /> -->
<template slot-scope="scope"> <el-table-column label="订单编号" align="center" prop="orderNo">
<span v-if="scope.row.orderId">{{ scope.row.orderCode }}</span> <template slot-scope="scope">
<span v-else>{{ scope.row.principalPhone }}</span> <span v-if="scope.row.orderId">{{ scope.row.orderCode }}</span>
</template> <span v-else>{{ scope.row.principalPhone }}</span>
</el-table-column> </template>
<el-table-column label="发货时间" align="center" prop="deliveryTime" width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="发货时间" align="center" prop="deliveryTime" width="100">
<span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.deliveryTime, '{y}-{m}-{d}') }}</span>
</el-table-column> </template>
<el-table-column label="负责人" align="center" prop="principal" width="60" /> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="100" show-overflow-tooltip /> <el-table-column label="负责人" align="center" prop="principal" width="60" />
<el-table-column label="备注" align="center" prop="remark" width="100" show-overflow-tooltip />
<!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> --> <!-- <el-table-column label="负责人电话" align="center" prop="principalPhone" width="100" /> -->
<el-table-column label="完成状态" align="center" prop="status" width="120"> <el-table-column label="完成状态" align="center" prop="status" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.status" placeholder="请选择完成状态" @change="handleStatusChange(scope.row)"> <el-select v-model="scope.row.status" placeholder="请选择完成状态" @change="handleStatusChange(scope.row)">
<el-option label="已发货" :value="1" /> <el-option label="已发货" :value="1" />
<el-option label="未发货" :value="0" /> <el-option label="未发货" :value="0" />
<el-option label="已打印" :value="2" /> <el-option label="已打印" :value="2" />
<el-option label="未打印" :value="3" /> <el-option label="未打印" :value="3" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-view" <el-button size="mini" type="text" icon="el-icon-view"
@click.stop="handlePrint(scope.row, 0)">打印发货单</el-button> @click.stop="handlePrint(scope.row, 0)">打印发货单</el-button>
<el-button size="mini" type="text" icon="el-icon-view" <el-button size="mini" type="text" icon="el-icon-view"
@click.stop="handlePrint(scope.row, 1)">简单打印</el-button> @click.stop="handlePrint(scope.row, 1)">简单打印</el-button>
<el-button size="mini" type="text" icon="el-icon-copy" <el-button size="mini" type="text" icon="el-icon-copy"
@click.stop="handleCopy(scope.row)">复制新增</el-button> @click.stop="handleCopy(scope.row)">复制新增</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1" <el-button size="mini" type="text" icon="el-icon-edit" :disabled="scope.row.status === 1"
title="已发货的发货单不能修改" @click.stop="handleUpdate(scope.row)">修改</el-button> title="已发货的发货单不能修改" @click.stop="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" :disabled="scope.row.status === 1" <el-button size="mini" type="text" icon="el-icon-delete" :disabled="scope.row.status === 1"
title="已发货的发货单不能删除" @click.stop="handleDelete(scope.row)">删除</el-button> title="已发货的发货单不能删除" @click.stop="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
<el-divider style="margin: 20px 0;" /> <!-- 可拖拽的分割线 -->
<div class="resizer" ref="resizer" @mousedown="startResize"></div>
<DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" /> <div :style="{ flex: 1, overflowY: 'auto', overflowX: 'hidden' }">
<el-empty v-else description="已发货，不可修改，点击打印查看详情" /> <DeliveryWaybillDetail v-if="canEdit" ref="detailTable" :waybillId="waybillId" :coilList="coilList" />
<el-empty v-else description="已发货，不可修改，点击打印查看详情" />
</div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
@@ -196,6 +200,8 @@ export default {
// 发货单表格数据 // 发货单表格数据
deliveryWaybillList: [], deliveryWaybillList: [],
waybillId: null, waybillId: null,
// 上部分高度
topHeight: 300,
// 打印相关数据 // 打印相关数据
printDialogVisible: false, printDialogVisible: false,
currentWaybill: {}, currentWaybill: {},
@@ -262,6 +268,33 @@ export default {
this.planListOption = response.rows || []; this.planListOption = response.rows || [];
}); });
}, },
/** 开始拖拽 */
startResize(e) {
e.preventDefault();
// 记录初始位置
const container = this.$el.querySelector('.el-card__body');
const containerRect = container.getBoundingClientRect();
this.startY = e.clientY;
this.startTopHeight = this.topHeight;
document.addEventListener('mousemove', this.resize);
document.addEventListener('mouseup', this.stopResize);
},
/** 拖拽中 */
resize(e) {
const container = this.$el.querySelector('.el-card__body');
const containerRect = container.getBoundingClientRect();
// 基于初始位置计算相对变化
const deltaY = e.clientY - this.startY;
const newHeight = this.startTopHeight + deltaY;
if (newHeight > 100 && newHeight < containerRect.height - 100) {
this.topHeight = newHeight;
}
},
/** 结束拖拽 */
stopResize() {
document.removeEventListener('mousemove', this.resize);
document.removeEventListener('mouseup', this.stopResize);
},
getList() { getList() {
this.loading = true; this.loading = true;
// 确保查询参数包含planId // 确保查询参数包含planId
@@ -524,4 +557,42 @@ export default {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
} }
.resizer {
width: 100%;
height: 4px;
background-color: #818181;
cursor: row-resize;
position: relative;
transition: background-color 0.3s;
}
.resizer:hover {
background-color: #409eff;
}
.resizer::before {
content: '';
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
width: 40px;
height: 2px;
background-color: #c0c4cc;
border-radius: 1px;
transition: background-color 0.3s;
}
.resizer:hover::before {
background-color: #409eff;
}
.resizer:active {
background-color: #409eff;
}
.resizer:active::before {
background-color: #fff;
}
</style> </style>