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

Compare commits

base: DeXun:2068c412b0b75670f118fec13d1f67d23be8c587
Branches Tags
DeXun:0.8.X DeXun:feat/erp-purchase-plan DeXun:test.X
...
compare: DeXun:bb97d0d2a704974441098a47e25847be830f1bb3
Branches Tags
DeXun:0.8.X DeXun:feat/erp-purchase-plan DeXun:test.X

4 Commits
2068c412b0 ... bb97d0d2a7

Author SHA1 Message Date
砂糖
bb97d0d2a7 fix(wms): 修正异常钢卷导出接口路径和文件名 
将导出接口从'materialCoil/export'改为'materialCoil/exportAbnormal'，同时将导出文件名从'materialCoil'改为'abnormalCoil'以更准确反映功能
 2026-05-06 17:45:22 +08:00
砂糖
484d16017d Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X 2026-05-06 17:31:36 +08:00
砂糖
5950118c86 feat(wms): 添加excludeBound参数并调整表格列顺序 
- 在delivery/canuse页面添加excludeBound参数
- 修复coil/panels/do页面颜色渐变语法错误
- 在report/receive页面透视表配置中添加规格字段
- 调整coil/panels/base页面表格列顺序
 2026-05-06 16:21:32 +08:00
砂糖
d26f98440f feat(warehouse): 增加支持拆分的列数 
将 splitColumns 从 [1,2,3] 扩展为 [1,2,3,4,5]，以支持更多列的拆分操作
 2026-05-06 16:21:06 +08:00
6 changed files with 19 additions and 16 deletions
Expand all files Collapse all files

20
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -213,6 +213,16 @@
</el-table-column> </el-table-column>
<el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" /> <el-table-column v-if="hasTransferType" label="实际库区" align="center" prop="actualWarehouseName" />
<el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
<el-table-column v-if="moreColumn" label="物料" prop="itemName"></el-table-column>
<el-table-column v-if="moreColumn" label="材质" prop="material"></el-table-column>
<el-table-column v-if="moreColumn" label="厂家" prop="manufacturer"></el-table-column>
<el-table-column v-if="moreColumn" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
<el-table-column v-if="moreColumn" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="moreColumn" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="moreColumn" label="包装" prop="packagingRequirement"></el-table-column>
<el-table-column v-if="moreColumn" label="镀层质量" prop="zincLayer"></el-table-column>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip /> <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column v-if="hasTransferType" label="调拨类型" align="center" prop="transferType" /> <el-table-column v-if="hasTransferType" label="调拨类型" align="center" prop="transferType" />
@@ -323,15 +333,7 @@
{{ formatDuration(scope.row.productionDuration * 60 * 1000) }} {{ formatDuration(scope.row.productionDuration * 60 * 1000) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="moreColumn" label="物料" prop="itemName"></el-table-column>
<el-table-column v-if="moreColumn" label="规格" prop="specification"></el-table-column>
<el-table-column v-if="moreColumn" label="材质" prop="material"></el-table-column>
<el-table-column v-if="moreColumn" label="厂家" prop="manufacturer"></el-table-column>
<el-table-column v-if="moreColumn" label="表面处理" prop="surfaceTreatmentDesc"></el-table-column>
<el-table-column v-if="moreColumn" label="品质" prop="qualityStatus"></el-table-column>
<el-table-column v-if="moreColumn" label="切边" prop="trimmingRequirement"></el-table-column>
<el-table-column v-if="moreColumn" label="包装" prop="packagingRequirement"></el-table-column>
<el-table-column v-if="moreColumn" label="镀层质量" prop="zincLayer"></el-table-column>
<el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width" v-if="!moreColumn"> <el-table-column prop="action" label="操作" align="center" class-name="small-padding fixed-width" v-if="!moreColumn">
<template slot-scope="scope"> <template slot-scope="scope">

2
klp-ui/src/views/wms/coil/panels/do.vue
View File

@@ -525,7 +525,7 @@ export default {
// 双机架修复工序 // 双机架修复工序
else if (this.acidRollingActionType == 524) { else if (this.acidRollingActionType == 524) {
return { return {
background: 'linear-gradient(45deg, #orange 0% 90%, #FFAACC 90% 100%)', background: 'linear-gradient(45deg, orange 0% 90%, #FFAACC 90% 100%)',
color: '#fff' color: '#fff'
} }
} }

3
klp-ui/src/views/wms/delivery/canuse/index.vue
View File

@@ -26,7 +26,8 @@ export default {
materialType: '成品', materialType: '成品',
itemType: 'product', itemType: 'product',
status: 0, status: 0,
orderBy: true orderBy: true,
excludeBound: true,
}, },
labelType: '3', labelType: '3',
showStatus: true, showStatus: true,

4
klp-ui/src/views/wms/report/abnormal.vue
View File

@@ -348,9 +348,9 @@ export default {
this.$message.warning('暂无数据可导出') this.$message.warning('暂无数据可导出')
return return
} }
this.download('wms/materialCoil/export', { this.download('wms/materialCoil/exportAbnormal', {
coilIds: this.outList.map(item => item.coilId).join(',') coilIds: this.outList.map(item => item.coilId).join(',')
}, `materialCoil_${new Date().getTime()}.xlsx`) }, `abnormalCoil_${new Date().getTime()}.xlsx`)
}, },
// 导出消耗钢卷 // 导出消耗钢卷

4
klp-ui/src/views/wms/report/receive.vue
View File

@@ -163,8 +163,8 @@ export default {
// 厂家材质透视表配置 // 厂家材质透视表配置
hierarchicalPivotConfig: { hierarchicalPivotConfig: {
groupFields: ['manufacturer', 'material'], groupFields: ['manufacturer', 'material', 'specification'],
groupLabels: ['厂家', '材质'], groupLabels: ['厂家', '材质', '规格'],
summaryFields: [ summaryFields: [
{ prop: 'count', label: '求和项:件数', field: '', align: 'center' }, { prop: 'count', label: '求和项:件数', field: '', align: 'center' },
{ prop: 'weight', label: '求和项:重量', field: 'netWeight', align: 'center' } { prop: 'weight', label: '求和项:重量', field: 'netWeight', align: 'center' }

2
klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue
View File

@@ -147,7 +147,7 @@ export default {
small: 43 + 42, small: 43 + 42,
rows: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26], rows: [0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26],
// 支持拆分的列 // 支持拆分的列
splitColumns: [1, 2, 3] splitColumns: [1, 2, 3, 4, 5]
} }
}, },
dialogOpen: false, dialogOpen: false,