Skip to content

M
mini-wms
Commit 141d9960 by wangchunyang
Options

表格宽度样式调整

parent 3319778d
正在显示 包含 47 行增加 和 47 行删除
ruoyi-admin-vue/src/views/inventory/inbound/details.vue
...@@ -112,17 +112,17 @@ ...@@ -112,17 +112,17 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
:row-key="(row) => row.materialId + '_' + row.orderId + '_' + row.warehousesName + '_' + row.locationName" :row-key="(row) => row.materialId + '_' + row.orderId + '_' + row.warehousesName + '_' + row.locationName"
> >
<el-table-column label="物料SAPNO" align="center" prop="sapNo" width="200"/> <el-table-column label="物料SAPNO" align="center" prop="sapNo" min-width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200"/> <el-table-column label="物料名称" align="center" prop="materialName" min-width="200"/>
<el-table-column label="关联入库单" align="center" prop="orderId" :show-overflow-tooltip="true" width="200"/> <el-table-column label="关联入库单" align="center" prop="orderId" :show-overflow-tooltip="true" min-width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" :show-overflow-tooltip="true" width="200"/> <el-table-column label="批次号" align="center" prop="batchId" :show-overflow-tooltip="true" min-width="200"/>
<el-table-column label="源仓库" align="center" prop="warehousesName" width="200"/> <el-table-column label="源仓库" align="center" prop="warehousesName" min-width="200"/>
<el-table-column label="库位" align="center" prop="locationName" width="200"/> <el-table-column label="库位" align="center" prop="locationName" min-width="200"/>
<el-table-column label="入库数量" align="center" prop="actualQuantity" width="200"/> <el-table-column label="入库数量" align="center" prop="actualQuantity" min-width="200"/>
<el-table-column label="件数" align="center" prop="actualPackages" width="200"/> <el-table-column label="件数" align="center" prop="actualPackages" min-width="200"/>
<el-table-column label="单价" align="center" prop="unitPrice" width="200"/> <el-table-column label="单价" align="center" prop="unitPrice" min-width="200"/>
<el-table-column label="入库批次物料总价" align="center" prop="totalPrice" width="200"/> <el-table-column label="入库批次物料总价" align="center" prop="totalPrice" min-width="200"/>
<el-table-column label="标签颜色" align="center" prop="labelColor" width="200"> <el-table-column label="标签颜色" align="center" prop="labelColor" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="getDictListClass('label_color', scope.row.labelColor)" :type="getDictListClass('label_color', scope.row.labelColor)"
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="200"/> <el-table-column label="备注" align="center" prop="remark" min-width="200"/>
<el-table-column label="入库时间" align="center" prop="inboundDate" width="200"> <el-table-column label="入库时间" align="center" prop="inboundDate" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span>
</template> </template>
......
ruoyi-admin-vue/src/views/inventory/inbound/index.vue
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" fixed /> <el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="入库单号" align="center" prop="orderId" width="200"/> <el-table-column label="入库单号" align="center" prop="orderId" min-width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" width="200"/> <el-table-column label="批次号" align="center" prop="batchId" min-width="200"/>
<el-table-column label="系统编号" align="center" prop="systemNo" width="200"/> <el-table-column label="系统编号" align="center" prop="systemNo" min-width="200"/>
<!-- 新增：表格显示货主名称 --> <!-- 新增：表格显示货主名称 -->
<el-table-column label="货主" align="center" prop="ownerName" width="200"/> <el-table-column label="货主" align="center" prop="ownerName" min-width="200"/>
<el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" width="200"> <el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="getDictListClass('inbound_outbound_type',scope.row.orderTypeId)" :type="getDictListClass('inbound_outbound_type',scope.row.orderTypeId)"
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="200"> <el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag <el-tag
:type="getDictListClass('order_type',scope.row.orderType)" :type="getDictListClass('order_type',scope.row.orderType)"
...@@ -183,15 +183,15 @@ ...@@ -183,15 +183,15 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库单状态" align="center" prop="orderStatus" width="200"> <el-table-column label="入库单状态" align="center" prop="orderStatus" min-width="200">
<!-- 状态显示 --> <!-- 状态显示 -->
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="getDictListClass('inbound_status',scope.row.orderStatus+'')" size="small" width="200"> <el-tag :type="getDictListClass('inbound_status',scope.row.orderStatus+'')" size="small" min-width="200">
{{ getDictLabel('inbound_status',scope.row.orderStatus+"") }} {{ getDictLabel('inbound_status',scope.row.orderStatus+"") }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="入库时间" align="center" prop="inboundDate" width="200"> <el-table-column label="入库时间" align="center" prop="inboundDate" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate,'{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.inboundDate,'{y}-{m}-{d}') }}</span>
</template> </template>
......
ruoyi-admin-vue/src/views/inventory/locations/index.vue
...@@ -228,42 +228,42 @@ ...@@ -228,42 +228,42 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column type="selection" width="55" align="center" fixed /> <el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="库位编码" align="center" prop="locationCode" width="120" fixed /> <el-table-column label="库位编码" align="center" prop="locationCode" min-width="120" fixed />
<el-table-column label="库位名称" align="center" prop="locationName" width="150" /> <el-table-column label="库位名称" align="center" prop="locationName" min-width="150" />
<!-- <el-table-column label="仓库" align="center" prop="warehousesName" width="180"> <!-- <el-table-column label="仓库" align="center" prop="warehousesName" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.warehousesName }} {{ scope.row.warehousesName }}
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="库位类型" align="center" prop="locationType" width="100"> <el-table-column label="库位类型" align="center" prop="locationType" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/> <dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="库位使用" align="center" prop="locationUsage" width="100"> <el-table-column label="库位使用" align="center" prop="locationUsage" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.location_usage" :value="scope.row.locationUsage"/> <dict-tag :options="dict.type.location_usage" :value="scope.row.locationUsage"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上架区" align="center" prop="zoneCode" width="100" /> <el-table-column label="上架区" align="center" prop="zoneCode" min-width="100" />
<el-table-column label="拣货区" align="center" prop="pickingArea" width="100" /> <el-table-column label="拣货区" align="center" prop="pickingArea" min-width="100" />
<el-table-column label="允许混放产品" align="center" prop="allowMixedProducts" width="120"> <el-table-column label="允许混放产品" align="center" prop="allowMixedProducts" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedProducts"/> <dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedProducts"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" width="120" > <el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" min-width="120" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedBatches"/> <dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedBatches"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="上架顺序" align="center" prop="putawayOrder" width="100" /> <el-table-column label="上架顺序" align="center" prop="putawayOrder" min-width="100" />
<el-table-column label="拣货顺序" align="center" prop="pickingOrder" width="100" /> <el-table-column label="拣货顺序" align="center" prop="pickingOrder" min-width="100" />
<el-table-column label="库位容量(千克)" align="center" prop="capacity" width="120" /> <el-table-column label="库位容量(千克)" align="center" prop="capacity" min-width="120" />
<el-table-column label="体积容量(立方米)" align="center" prop="volumeCapacity" width="120" /> <el-table-column label="体积容量(立方米)" align="center" prop="volumeCapacity" min-width="120" />
<el-table-column label="允许存放的危险等级" align="center" prop="allowedHazardLevels" width="140" /> <el-table-column label="允许存放的危险等级" align="center" prop="allowedHazardLevels" min-width="140" />
<el-table-column label="允许存放的物料名称" align="center" prop="allowedCategoryNames" width="200"> <el-table-column label="允许存放的物料名称" align="center" prop="allowedCategoryNames" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip <el-tooltip
:content="scope.row.allowedCategoryNames" :content="scope.row.allowedCategoryNames"
......
ruoyi-admin-vue/src/views/inventory/orders/index.vue
...@@ -190,45 +190,45 @@ ...@@ -190,45 +190,45 @@
:key="tableKey" :key="tableKey"
> >
<el-table-column type="selection" width="55" align="center" fixed /> <el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="出库单号" align="center" prop="orderId" width="150" fixed/> <el-table-column label="出库单号" align="center" prop="orderId" min-width="150" fixed/>
<el-table-column label="系统编号" align="center" prop="systemNo" width="150" /> <el-table-column label="系统编号" align="center" prop="systemNo" min-width="150" />
<el-table-column label="出库类型" align="center" prop="orderTypeId" width="120"> <el-table-column label="出库类型" align="center" prop="orderTypeId" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="dict.type.inbound_outbound_type" :options="dict.type.inbound_outbound_type" :value="scope.row.orderTypeId"/> <dict-tag v-if="dict.type.inbound_outbound_type" :options="dict.type.inbound_outbound_type" :value="scope.row.orderTypeId"/>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- 新增：订单类型列 --> <!-- 新增：订单类型列 -->
<el-table-column label="订单类型" align="center" prop="orderType" width="120"> <el-table-column label="订单类型" align="center" prop="orderType" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="dict.type.order_type" :options="dict.type.order_type" :value="scope.row.orderType"/> <dict-tag v-if="dict.type.order_type" :options="dict.type.order_type" :value="scope.row.orderType"/>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="批次" align="center" prop="batchCode" width="120" /> <el-table-column label="批次" align="center" prop="batchCode" min-width="120" />
<el-table-column label="仓库" align="center" prop="warehouseName" width="120"> <el-table-column label="仓库" align="center" prop="warehouseName" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.warehouseName || '-' }} {{ scope.row.warehouseName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="货主" align="center" prop="ownerName" width="120"> <el-table-column label="货主" align="center" prop="ownerName" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.ownerName || '-' }} {{ scope.row.ownerName || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" align="center" prop="orderStatus" width="150"> <el-table-column label="订单状态" align="center" prop="orderStatus" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="dict.type.outbound_order_status" :options="dict.type.outbound_order_status" :value="scope.row.orderStatus"/> <dict-tag v-if="dict.type.outbound_order_status" :options="dict.type.outbound_order_status" :value="scope.row.orderStatus"/>
<span v-else>-</span> <span v-else>-</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="出库日期" align="center" prop="inboundDate" width="150"> <el-table-column label="出库日期" align="center" prop="inboundDate" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="目的地" align="center" prop="destination" width="150" /> <el-table-column label="目的地" align="center" prop="destination" min-width="150" />
<el-table-column label="备注" align="center" prop="remark" width="150" /> <el-table-column label="备注" align="center" prop="remark" min-width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220" fixed="right"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- 详细查看按钮 - 独立触发 --> <!-- 详细查看按钮 - 独立触发 -->
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论