导出的字段修改为与页面的一致

This commit is contained in:
猫猫guowen
2025-08-22 14:44:45 +08:00
parent 05ce4b6080
commit 853acbc9a3
31 changed files with 683 additions and 523 deletions

View File

@@ -319,12 +319,16 @@
<!-- <el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="left" prop="roadwayId" />-->
<el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewInJobFlow.priority')" align="right" prop="priority" />
<el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">
<!-- <el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.inOrOut')" align="left" prop="inOrOut" />
<el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="left" prop="entranceId" />
<el-table-column :label="$t('searchViewInJobFlow.productId')" align="left" prop="productId" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="left" prop="lotNo" />-->
@@ -338,7 +342,7 @@
<el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="left" prop="inOrOutId" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="left" prop="inOrOutDId" />
<el-table-column :label="$t('searchViewInJobFlow.createTime')" align="left" prop="createTime" width="180" />
<el-table-column :label="$t('searchViewInJobFlow.startTime')" align="left" prop="startTime" width="180" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.startTime')" align="left" prop="startTime" width="180" />-->
<el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="left" prop="finishTime" width="180" />
<el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" align="left" prop="productName" />
@@ -516,7 +520,7 @@ import { listViewInJobFlow, getViewInJobFlow, delViewInJobFlow, addViewInJobFlow
import { listWarehouse } from "@/api/bas/warehouse"
export default {
name: "ViewInJobFlow",
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'],
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','in_job_type'],
data() {
return {
// 遮罩层

View File

@@ -296,7 +296,7 @@
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
@click="confirmExport"
v-hasPermi="['search:ViewOutJobFlow:export']"
>{{$t('searchViewOutJobFlow.export')}} <!-- 导出 -->
</el-button>
@@ -322,12 +322,16 @@
<el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="left" prop="theColumn"/>
<el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="left" prop="theFloor"/>
<el-table-column :label="$t('searchViewOutJobFlow.priority')" align="right" prop="priority"/>
<el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="left" prop="executionPhase">
<!-- <el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="left" prop="executionPhase">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
<dict-tag :options="dict.type.out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOut')" align="left" prop="inOrOut"/>
<el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="left" prop="exitId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productId')" align="left" prop="productId"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="left" prop="lotNo"/>-->
@@ -347,7 +351,7 @@
<el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="left" prop="warehouseId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productName')" align="left" prop="productName"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.spec')" align="left" prop="spec"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/>
<!-- <el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="left" prop="cargoNo"/>-->
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="left" prop="unit"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="left" prop="customerName"/>
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
@@ -388,7 +392,7 @@
<!-- 导出对话框 -->
<el-dialog :title="$t('searchViewOutJobFlow.export')" :visible.sync="exportOpen" width="400px" append-to-body>
<div class="el-message-box__status el-icon-question">{{$t('searchViewOutJobFlow.confirmExport')}}</div>
<!-- <div class="el-message-box__status el-icon-question">{{$t('searchViewOutJobFlow.confirmExport')}}</div>-->
<div slot="footer" class="dialog-footer">
<el-button @click="exportOpen = false">{{$t('searchViewOutJobFlow.cancel')}} <!-- 取消 --></el-button>
<el-button type="primary" @click="confirmExport">{{$t('searchViewOutJobFlow.confirm')}} <!-- 确定 --></el-button>
@@ -537,7 +541,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default {
name: "ViewOutJobFlow",
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status'],
dicts: ['execution_phase_type', 'mydo_job_status', 'stock_status','out_job_type'],
data() {
return {
// 遮罩层

View File

@@ -93,63 +93,84 @@
<el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
<!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
<el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
<el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
<!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
<el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
<el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 -->
<el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 -->
<el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> <!-- 列 -->
<el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> <!-- 层 -->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
<el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 -->
<el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 -->
<el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> &lt;!&ndash; 货位类型名称 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -337,6 +358,7 @@ import { listWarehouse } from "@/api/bas/warehouse"
export default {
name: "ViewStockSecure",
dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
data() {
return {
// 遮罩层

View File

@@ -92,82 +92,102 @@
</el-row>
<el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewStockWarning.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockWarning.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
<el-table-column :label="$t('searchViewStockWarning.productStatus')" align="center" prop="productStatus" /> <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('searchViewStockWarning.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
<el-table-column :label="$t('searchViewStockWarning.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockWarning.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockWarning.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('searchViewStockWarning.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('searchViewStockWarning.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockWarning.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockWarning.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('searchViewStockWarning.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
<el-table-column :label="$t('searchViewStockWarning.spare1')" align="center" prop="spare1" /> <!-- 库存预警标识 -->
<!-- <el-table-column label="${comment}" align="center" prop="spare2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare3" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare4" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare5" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockWarning.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockWarning.address')" align="center" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewStockWarning.cDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewStockWarning.warehouseKind')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('searchViewStockWarning.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewStockWarning.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<el-table-column :label="$t('searchViewStockWarning.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockWarning.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockWarning.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockWarning.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockWarning.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockWarning.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
<el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
<el-table-column :label="$t('searchViewStockWarning.theTypeName')" align="center" prop="theTypeName" /> <!-- 货位类型名称 -->
<el-table-column :label="$t('searchViewStockWarning.thePlatoon')" align="center" prop="thePlatoon" /> <!-- 排 -->
<el-table-column :label="$t('searchViewStockWarning.theColumn')" align="center" prop="theColumn" /> <!-- 列 -->
<el-table-column :label="$t('searchViewStockWarning.theFloor')" align="center" prop="theFloor" /> <!-- 层 -->
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
<el-table-column :label="$t('searchViewStockWarning.groupCodingNo')" align="center" prop="groupCodingNo" /> <!-- 双货位分组编码 -->
<el-table-column :label="$t('searchViewStockWarning.groupCoding')" align="center" prop="groupCoding" /> <!-- 双货位分组编码 -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> <!-- 双货位标识 -->
<el-table-column :label="$t('searchViewStockWarning.thisCargoArea')" align="center" prop="thisCargoArea" /> <!-- 本仓库区域 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockWarning:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockWarning:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewStockSecure.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus" > <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus" > <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单ID -->
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockSecure.inType')" align="center" prop="inType" > <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseId')" align="center" prop="warehouseId" /> &lt;!&ndash; 仓库ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.spare1')" align="center" prop="spare1" /> &lt;!&ndash; 库存预警标识 &ndash;&gt;-->
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />-->
<!-- <el-table-column label="备用字段3" align="center" prop="spare3" />-->
<!-- <el-table-column label="备用字段4" align="center" prop="spare4" />-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />-->
<!-- <el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column :label="$t('searchViewStockSecure.productId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewStockSecure.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewStockSecure.enName')" align="center" prop="enName" /> <!-- 英文名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.address')" align="center" prop="address" /> &lt;!&ndash; 仓库地址 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cDesc')" align="center" prop="cDesc" /> &lt;!&ndash; 仓库描述 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseKind')" align="center" prop="warehouseKind" /> &lt;!&ndash; 仓库级别 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.warehouseType')" align="center" prop="warehouseType" /> &lt;!&ndash; 仓库类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.isCurrent')" align="center" prop="isCurrent" /> &lt;!&ndash; 是否可用 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockSecure.unit')" align="center" prop="unit" /> <!-- 单位 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.weight')" align="center" prop="weight" /> <!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockSecure.longMM')" align="center" prop="longMM" /> <!-- 长MM -->
<el-table-column :label="$t('searchViewStockSecure.wide')" align="center" prop="wide" /> <!-- 宽MM -->
<el-table-column :label="$t('searchViewStockSecure.hight')" align="center" prop="hight" /> <!-- 高MM -->
<el-table-column :label="$t('searchViewStockSecure.volume')" align="center" prop="volume" /> <!-- 体积m³ -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<!-- <el-table-column :label="$t('searchViewStockSecure.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash; 巷道ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theTypeName')" align="center" prop="theTypeName" /> &lt;!&ndash; 货位类型名称 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thePlatoon')" align="center" prop="thePlatoon" /> &lt;!&ndash; 排 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theColumn')" align="center" prop="theColumn" /> &lt;!&ndash; 列 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.theFloor')" align="center" prop="theFloor" /> &lt;!&ndash; 层 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockSecure.cargoStatus')" align="center" prop="cargoStatus" > <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockSecure.locked')" align="center" prop="locked" > <!-- 是否锁定 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.locked"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoHight')" align="center" prop="cargoHight" /> &lt;!&ndash; 货位高度 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCodingNo')" align="center" prop="groupCodingNo" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.groupCoding')" align="center" prop="groupCoding" /> &lt;!&ndash; 双货位分组编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.cargoSpaceLogo')" align="center" prop="cargoSpaceLogo" /> &lt;!&ndash; 双货位标识 &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockSecure.thisCargoArea')" align="center" prop="thisCargoArea" /> &lt;!&ndash; 本仓库区域 &ndash;&gt;-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@@ -340,6 +360,7 @@ import {listWarehouse} from "@/api/bas/warehouse";
export default {
name: "ViewStockWarning",
dicts: ['stock_status','product_status','in_job_type','cargo_space_lock_status','cargo_space_status'],
data() {
return {
// 遮罩层

View File

@@ -188,16 +188,16 @@
<!-- :placeholder="$t('searchViewStockinHistory.selectPrintDate')">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> &lt;!&ndash; 库存状态 &ndash;&gt;-->
<!-- <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.stock_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单价" prop="price">-->
<!-- <el-input-->
<!-- v-model="queryParams.price"-->
@@ -350,11 +350,11 @@
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="left" prop="stockStatus">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewStockinHistory.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="left" prop="unit" />

View File

@@ -71,7 +71,7 @@
<dict-tag :options="dict.type.stock_status" :value="scope.row.currStatus"/>
</template>
</el-table-column><!-- 现库位状态 -->
<el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> <!-- 操作 -->
<!-- <el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> &lt;!&ndash; 操作 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->