feat(wms): 添加excludeBound参数并调整表格列顺序

- 在delivery/canuse页面添加excludeBound参数
- 修复coil/panels/do页面颜色渐变语法错误
- 在report/receive页面透视表配置中添加规格字段
- 调整coil/panels/base页面表格列顺序
This commit is contained in:
2026-05-06 16:21:32 +08:00
parent d26f98440f
commit 5950118c86
4 changed files with 16 additions and 13 deletions

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">

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'
} }
} }

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,

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' }