feat(wms): 添加更多列显示选项和样式优化
- 在delivery/canuse页面添加moreColumn属性控制额外列显示 - 在coil/panels/base页面添加moreColumn属性和相关列显示逻辑 - 优化表格容器样式防止内容溢出 - 为表格添加边框样式
This commit is contained in:
@@ -117,10 +117,10 @@
|
|||||||
overflowX: 'hidden' }">
|
overflowX: 'hidden' }">
|
||||||
<warehouse-tree warehouseType="logic" @node-click="handleWarehouseNodeClick" />
|
<warehouse-tree warehouseType="logic" @node-click="handleWarehouseNodeClick" />
|
||||||
</div>
|
</div>
|
||||||
<div style="flex: 1;">
|
<div style="flex: 1; width: 100%; overflow: hidden;">
|
||||||
<KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange"
|
<KLPTable v-loading="loading" :data="materialCoilList" @selection-change="handleSelectionChange"
|
||||||
:floatLayer="true" :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"
|
:floatLayer="true" :floatLayerConfig="floatLayerConfig" @row-click="handleRowClick"
|
||||||
:height="showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)'">
|
:height="showAbnormal ? 'calc(100vh - 400px)' : 'calc(100vh - 300px)'" border>
|
||||||
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
<!-- <el-table-column type="selection" width="55" align="center" /> -->
|
||||||
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
<el-table-column label="入场钢卷号" align="center" prop="enterCoilNo">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -136,7 +136,7 @@
|
|||||||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
|
<el-table-column label="逻辑库位" align="center" prop="warehouseName" v-if="!hideWarehouseQuery" />
|
||||||
<el-table-column label="实际库区" align="center" prop="actualWarehouseName"
|
<el-table-column label="实际库区" align="center" prop="actualWarehouseName"
|
||||||
v-if="!hideWarehouseQuery && !showExportTime" />
|
v-if="!hideWarehouseQuery && !showExportTime" />
|
||||||
<el-table-column label="产品类型" align="center" width="180">
|
<el-table-column label="产品类型" align="center" width="180" v-if="!moreColumn">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
|
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row" />
|
||||||
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
|
<RawMaterialInfo v-else-if="scope.row.itemType === 'raw_material'" :material="scope.row" />
|
||||||
@@ -302,8 +302,17 @@
|
|||||||
{{ 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">
|
<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">
|
||||||
<el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
|
<el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
|
||||||
预览标签
|
预览标签
|
||||||
@@ -786,6 +795,10 @@ export default {
|
|||||||
type: Array,
|
type: Array,
|
||||||
default: () => [],
|
default: () => [],
|
||||||
},
|
},
|
||||||
|
moreColumn: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
:showLength="showLength"
|
:showLength="showLength"
|
||||||
:canExportAll="canExportAll"
|
:canExportAll="canExportAll"
|
||||||
:leftWarehouseQuery="leftWarehouseQuery"
|
:leftWarehouseQuery="leftWarehouseQuery"
|
||||||
|
:moreColumn="moreColumn"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -33,7 +34,8 @@ export default {
|
|||||||
showLength: true,
|
showLength: true,
|
||||||
canExportAll: true,
|
canExportAll: true,
|
||||||
showOrderBy: false,
|
showOrderBy: false,
|
||||||
leftWarehouseQuery: true
|
leftWarehouseQuery: true,
|
||||||
|
moreColumn: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user