lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页色系修改，表格数值右对齐，其余左对齐

Browse Source
This commit is contained in:
猫猫guowen
2025-07-05 15:04:20 +08:00
parent d9ea6f3de3
commit f24ca20206
39 changed files with 747 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ruoyi-ui/src/views/bas/BasCustomer/index.vue
View File

@@ -80,26 +80,26 @@
<el-table v-loading="loading" :data="BasCustomerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('basCustomer.customerNo')" align="center" prop="customerNo" /> <!-- 客户编号 -->
<el-table-column :label="$t('basCustomer.customerGroupNo')" align="center" prop="customerGroupNo" /> <!-- 客户基本分类 -->
<el-table-column :label="$t('basCustomer.customerName')" align="center" prop="customerName" /> <!-- 客户名称 -->
<el-table-column :label="$t('basCustomer.simpleName')" align="center" prop="simpleName" /> <!-- 客户简称 -->
<el-table-column :label="$t('basCustomer.useable')" align="center" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('basCustomer.remark')" align="center" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('basCustomer.businessDepartment')" align="center" prop="businessDepartment" /> <!-- 业务部门 -->
<el-table-column :label="$t('basCustomer.salesman')" align="center" prop="salesman" /> <!-- 业务员 -->
<el-table-column :label="$t('basCustomer.mnemonicCode')" align="center" prop="mnemonicCode" /> <!-- 助忆码 -->
<el-table-column :label="$t('basCustomer.type')" align="center" prop="type" /> <!-- 客户类型 -->
<el-table-column :label="$t('basCustomer.taxpayerRegistrationNumber')" align="center" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('basCustomer.organization')" align="center" prop="organization" /> <!-- 对应财务组织 -->
<el-table-column :label="$t('basCustomer.supCustomer')" align="center" prop="supCustomer" /> <!-- 上级客户 -->
<el-table-column :label="$t('basCustomer.retailInvestor')" align="center" prop="retailInvestor" /> <!-- 散户 -->
<el-table-column :label="$t('basCustomer.country')" align="center" prop="country" /> <!-- 国家/地区 -->
<el-table-column :label="$t('basCustomer.timeZone')" align="center" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('basCustomer.dataFormat')" align="center" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('basCustomer.contactName')" align="center" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('basCustomer.shipment')" align="center" prop="shipment" /> <!-- 发货国家 -->
<el-table-column :label="$t('basCustomer.taxCategory')" align="center" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('basCustomer.customerNo')" align="left" prop="customerNo" /> <!-- 客户编号 -->
<el-table-column :label="$t('basCustomer.customerGroupNo')" align="left" prop="customerGroupNo" /> <!-- 客户基本分类 -->
<el-table-column :label="$t('basCustomer.customerName')" align="left" prop="customerName" /> <!-- 客户名称 -->
<el-table-column :label="$t('basCustomer.simpleName')" align="left" prop="simpleName" /> <!-- 客户简称 -->
<el-table-column :label="$t('basCustomer.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('basCustomer.remark')" align="left" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('basCustomer.businessDepartment')" align="left" prop="businessDepartment" /> <!-- 业务部门 -->
<el-table-column :label="$t('basCustomer.salesman')" align="left" prop="salesman" /> <!-- 业务员 -->
<el-table-column :label="$t('basCustomer.mnemonicCode')" align="left" prop="mnemonicCode" /> <!-- 助忆码 -->
<el-table-column :label="$t('basCustomer.type')" align="left" prop="type" /> <!-- 客户类型 -->
<el-table-column :label="$t('basCustomer.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('basCustomer.organization')" align="left" prop="organization" /> <!-- 对应财务组织 -->
<el-table-column :label="$t('basCustomer.supCustomer')" align="left" prop="supCustomer" /> <!-- 上级客户 -->
<el-table-column :label="$t('basCustomer.retailInvestor')" align="left" prop="retailInvestor" /> <!-- 散户 -->
<el-table-column :label="$t('basCustomer.country')" align="left" prop="country" /> <!-- 国家/地区 -->
<el-table-column :label="$t('basCustomer.timeZone')" align="left" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('basCustomer.dataFormat')" align="left" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('basCustomer.contactName')" align="left" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('basCustomer.shipment')" align="left" prop="shipment" /> <!-- 发货国家 -->
<el-table-column :label="$t('basCustomer.taxCategory')" align="left" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('basCustomer.operation')" 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="['bas:BasCustomer:edit']">{{$t('basCustomer.modify')}}</el-button> <!-- 修改 -->

27
ruoyi-ui/src/views/bas/BasProduct/index.vue
View File

@@ -201,22 +201,17 @@
<el-table v-loading="loading" :data="BasProductList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column :label="$t('BasProduct.productId')" align="center" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('BasProduct.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('BasProduct.spare1')" align="center" prop="spare1"/> <!-- 英文描述 -->
<el-table-column :label="$t('BasProduct.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('BasProduct.spare2')" align="center" prop="spare2" /> <!-- 单件净重KG -->
<!-- <el-table-column :label="$t('BasProduct.spare3')" align="center" prop="spare3" /> &lt;!&ndash; 箱号 &ndash;&gt;-->
<!-- <el-table-column :label="$t('BasProduct.spare4')" align="center" prop="spare4" /> &lt;!&ndash; 包装方式 &ndash;&gt;-->
<el-table-column :label="$t('BasProduct.spare5')" align="center" prop="spare5" /> <!-- 长MM -->
<el-table-column :label="$t('BasProduct.spare6')" align="center" prop="spare6" /> <!-- 宽MM -->
<el-table-column :label="$t('BasProduct.spare7')" align="center" prop="spare7" /> <!-- 高MM -->
<el-table-column :label="$t('BasProduct.spare8')" align="center" prop="spare8" /> <!-- 体积m³ -->
<!-- <el-table-column label="净重KG" align="center" prop="spare8" />
<el-table-column label="毛重KG" align="center" prop="spare9" />-->
<el-table-column :label="$t('BasProduct.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('BasProduct.remark')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('BasProduct.productId')" align="left" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('BasProduct.productName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('BasProduct.spare1')" align="left" prop="spare1"/> <!-- 英文描述 -->
<el-table-column :label="$t('BasProduct.unit')" align="left" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('BasProduct.spare2')" align="right" prop="spare2" /> <!-- 单件净重KG -->
<el-table-column :label="$t('BasProduct.spare5')" align="right" prop="spare5" /> <!-- 长MM -->
<el-table-column :label="$t('BasProduct.spare6')" align="right" prop="spare6" /> <!-- 宽MM -->
<el-table-column :label="$t('BasProduct.spare7')" align="right" prop="spare7" /> <!-- 高MM -->
<el-table-column :label="$t('BasProduct.spare8')" align="right" prop="spare8" /> <!-- 体积m³ -->
<el-table-column :label="$t('BasProduct.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('BasProduct.remark')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('BasProduct.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button

36
ruoyi-ui/src/views/bas/BasSupplier/index.vue
View File

@@ -191,24 +191,24 @@
<el-table v-loading="loading" :data="BasSupplierList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('BasSupplier.supplierNo')" align="center" prop="supplierNo" /> <!-- 供应商编号 -->
<el-table-column :label="$t('BasSupplier.supplierGroupNo')" align="center" prop="supplierGroupNo" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.supplierName')" align="center" prop="supplierName" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.simpleName')" align="center" prop="simpleName" /> <!-- 简称 -->
<el-table-column :label="$t('BasSupplier.useable')" align="center" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('BasSupplier.remark')" align="center" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('BasSupplier.supplierArae')" align="center" prop="supplierArae" /> <!-- 地区分类 -->
<el-table-column :label="$t('BasSupplier.taxpayerRegistrationNumber')" align="center" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('BasSupplier.country')" align="center" prop="country" /> <!-- 国家 -->
<el-table-column :label="$t('BasSupplier.timeZone')" align="center" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('BasSupplier.dataFormat')" align="center" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('BasSupplier.receivingCountry')" align="center" prop="receivingCountry" /> <!-- 收货国家 -->
<el-table-column :label="$t('BasSupplier.taxCategory')" align="center" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('BasSupplier.legalPerson')" align="center" prop="legalPerson" /> <!-- 法人 -->
<el-table-column :label="$t('BasSupplier.registeredCapital')" align="center" prop="registeredCapital" /> <!-- 注册资金 -->
<el-table-column :label="$t('BasSupplier.address')" align="center" prop="address" /> <!-- 企业地址 -->
<el-table-column :label="$t('BasSupplier.contactName')" align="center" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('BasSupplier.contactNumber')" align="center" prop="contactNumber" /> <!-- 联系电话 -->
<el-table-column :label="$t('BasSupplier.supplierNo')" align="left" prop="supplierNo" /> <!-- 供应商编号 -->
<el-table-column :label="$t('BasSupplier.supplierGroupNo')" align="left" prop="supplierGroupNo" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.supplierName')" align="left" prop="supplierName" /> <!-- 供应商名称 -->
<el-table-column :label="$t('BasSupplier.simpleName')" align="left" prop="simpleName" /> <!-- 简称 -->
<el-table-column :label="$t('BasSupplier.useable')" align="left" prop="useable" /> <!-- 是否可用 -->
<el-table-column :label="$t('BasSupplier.remark')" align="left" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('BasSupplier.supplierArae')" align="left" prop="supplierArae" /> <!-- 地区分类 -->
<el-table-column :label="$t('BasSupplier.taxpayerRegistrationNumber')" align="left" prop="taxpayerRegistrationNumber" /> <!-- 纳税人登记号 -->
<el-table-column :label="$t('BasSupplier.country')" align="left" prop="country" /> <!-- 国家 -->
<el-table-column :label="$t('BasSupplier.timeZone')" align="left" prop="timeZone" /> <!-- 时区 -->
<el-table-column :label="$t('BasSupplier.dataFormat')" align="left" prop="dataFormat" /> <!-- 数据格式 -->
<el-table-column :label="$t('BasSupplier.receivingCountry')" align="left" prop="receivingCountry" /> <!-- 收货国家 -->
<el-table-column :label="$t('BasSupplier.taxCategory')" align="left" prop="taxCategory" /> <!-- 税类 -->
<el-table-column :label="$t('BasSupplier.legalPerson')" align="left" prop="legalPerson" /> <!-- 法人 -->
<el-table-column :label="$t('BasSupplier.registeredCapital')" align="right" prop="registeredCapital" /> <!-- 注册资金 -->
<el-table-column :label="$t('BasSupplier.address')" align="left" prop="address" /> <!-- 企业地址 -->
<el-table-column :label="$t('BasSupplier.contactName')" align="left" prop="contactName" /> <!-- 联系人姓名 -->
<el-table-column :label="$t('BasSupplier.contactNumber')" align="left" prop="contactNumber" /> <!-- 联系电话 -->
<el-table-column :label="$t('BasSupplier.operation')" align="center" class-name="small-padding fixed-width"><!-- 操作 -->
<template slot-scope="scope">
<el-button

18
ruoyi-ui/src/views/bas/cargoSpace/index.vue
View File

@@ -206,9 +206,9 @@
<el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 货位ID -->
<el-table-column :label="$t('cargoSpace.cargoSpaceId')" align="center" prop="cargoSpaceId" />
<el-table-column :label="$t('cargoSpace.cargoSpaceId')" align="left" prop="cargoSpaceId" />
<!-- 仓库ID -->
<el-table-column :label="$t('cargoSpace.warehouseId')" align="center" prop="warehouseId" />
<el-table-column :label="$t('cargoSpace.warehouseId')" align="left" prop="warehouseId" />
<!-- 巷道号 -->
<!-- <el-table-column :label="$t('cargoSpace.roadwayId')" align="center" prop="roadwayId" />-->
<!-- 货区编号 -->
@@ -220,27 +220,27 @@
<!-- 货位名称 -->
<el-table-column :label="$t('cargoSpace.cargoSpaceName')" align="center" prop="cargoSpaceName" />
<!-- 排 -->
<el-table-column :label="$t('cargoSpace.platoon')" align="center" prop="thePlatoon" />
<el-table-column :label="$t('cargoSpace.platoon')" align="left" prop="thePlatoon" />
<!-- 列 -->
<el-table-column :label="$t('cargoSpace.column')" align="center" prop="theColumn" />
<el-table-column :label="$t('cargoSpace.column')" align="left" prop="theColumn" />
<!-- 层 -->
<el-table-column :label="$t('cargoSpace.floor')" align="center" prop="theFloor" />
<el-table-column :label="$t('cargoSpace.floor')" align="left" prop="theFloor" />
<!-- 货位编码 -->
<el-table-column :label="$t('cargoSpace.status')" align="center" prop="status" >
<el-table-column :label="$t('cargoSpace.status')" align="left" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.status"/>
</template>
</el-table-column>
<!-- 是否锁定 -->
<el-table-column :label="$t('cargoSpace.locked')" align="center" prop="locked" >
<el-table-column :label="$t('cargoSpace.locked')" align="left" 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('cargoSpace.trayCode')" align="center" prop="trayCode" />
<el-table-column :label="$t('cargoSpace.trayCode')" align="left" prop="trayCode" />
<!-- 货物高度 -->
<el-table-column :label="$t('cargoSpace.cargoHeight')" align="center" prop="cargoHight" />
<el-table-column :label="$t('cargoSpace.cargoHeight')" align="right" prop="cargoHight" />
<!-- 是否双伸 -->
<!-- <el-table-column :label="$t('cargoSpace.isDouble')" align="center" prop="issDouble" />-->
<!-- 双货位分组编码 -->

16
ruoyi-ui/src/views/bas/container/index.vue
View File

@@ -100,21 +100,21 @@
<el-table v-loading="loading" :data="containerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 容器编号 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" prop="containerId" />
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="left" prop="containerId" />
<!-- 点位名称 -->
<el-table-column :label="$t('bas_ContainerManagement.portName')" align="center" prop="portName" />
<el-table-column :label="$t('bas_ContainerManagement.portName')" align="left" prop="portName" />
<!-- 容器状态 -->
<el-table-column :label="$t('bas_ContainerManagement.status')" align="center" prop="status" />
<el-table-column :label="$t('bas_ContainerManagement.status')" align="left" prop="status" />
<!-- 物料种类 -->
<el-table-column :label="$t('bas_ContainerManagement.productTypeQuantity')" align="center" prop="productTypeQuantity" />
<el-table-column :label="$t('bas_ContainerManagement.productTypeQuantity')" align="right" prop="productTypeQuantity" />
<!-- 容量 -->
<el-table-column :label="$t('bas_ContainerManagement.capacity')" align="center" prop="capacity" />
<el-table-column :label="$t('bas_ContainerManagement.capacity')" align="right" prop="capacity" />
<!-- 创建时间 -->
<el-table-column :label="$t('bas_ContainerManagement.createTime')" align="center" prop="createTime" />
<el-table-column :label="$t('bas_ContainerManagement.createTime')" align="left" prop="createTime" />
<!-- 状态更新时间 -->
<el-table-column :label="$t('bas_ContainerManagement.updateTime')" align="center" prop="updateTime" />
<el-table-column :label="$t('bas_ContainerManagement.updateTime')" align="left" prop="updateTime" />
<!-- 删除时间 -->
<el-table-column :label="$t('bas_ContainerManagement.operationMan')" align="center" prop="operationMan" />
<el-table-column :label="$t('bas_ContainerManagement.operationMan')" align="left" prop="operationMan" />
<!-- 操作 -->
<el-table-column :label="$t('bas_ContainerManagement.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">

16
ruoyi-ui/src/views/bas/containerDetails/index.vue
View File

@@ -139,21 +139,17 @@
<el-table v-loading="loading" :data="containerDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 序号 -->
<el-table-column :label="$t('bas_ContainerManagement.id')" align="center" prop="id" />
<el-table-column :label="$t('bas_ContainerManagement.id')" align="left" prop="id" />
<!-- 容器编号 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" prop="containerId" />
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="left" prop="containerId" />
<!-- 物料编码 -->
<el-table-column :label="$t('bas_ContainerManagement.productId')" align="center" prop="productId" />
<el-table-column :label="$t('bas_ContainerManagement.productId')" align="left" prop="productId" />
<!-- 物料名称 -->
<el-table-column :label="$t('bas_ContainerManagement.productName')" align="center" prop="productName" />
<el-table-column :label="$t('bas_ContainerManagement.productName')" align="left" prop="productName" />
<!-- 数量 -->
<el-table-column :label="$t('bas_ContainerManagement.quantity')" align="center" prop="quantity" />
<el-table-column :label="$t('bas_ContainerManagement.quantity')" align="right" prop="quantity" />
<!-- 单位 -->
<el-table-column :label="$t('bas_ContainerManagement.unit')" align="center" prop="unit" />
<!-- 备用 -->
<!-- <el-table-column label="备用" align="center" prop="spare1" />
<el-table-column :label="备用" align="center" prop="spare2" />
<el-table-column :label="备用" align="center" prop="spare3" /> -->
<el-table-column :label="$t('bas_ContainerManagement.unit')" align="left" prop="unit" />
<!-- 人工操作 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">

40
ruoyi-ui/src/views/bas/port/index.vue
View File

@@ -80,12 +80,12 @@
<el-table v-loading="loading" :data="portList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('BasPort.id')" align="center" prop="id" /> <!-- id -->
<el-table-column :label="$t('BasPort.portName')" align="center" prop="portName" /> <!-- 点位名称 -->
<el-table-column :label="$t('BasPort.portType')" align="center" prop="portType" /> <!-- 点位分类 -->
<el-table-column :label="$t('BasPort.portDesc')" align="center" prop="portDesc" /> <!-- 点位描述 -->
<el-table-column :label="$t('BasPort.createMan')" align="center" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('BasPort.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('BasPort.id')" align="left" prop="id" /> <!-- id -->
<el-table-column :label="$t('BasPort.portName')" align="left" prop="portName" /> <!-- 点位名称 -->
<el-table-column :label="$t('BasPort.portType')" align="left" prop="portType" /> <!-- 点位分类 -->
<el-table-column :label="$t('BasPort.portDesc')" align="left" prop="portDesc" /> <!-- 点位描述 -->
<el-table-column :label="$t('BasPort.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('BasPort.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('BasPort.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -203,20 +203,20 @@
</el-row>
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<el-table-column :label="$t('BasPort.productCode')" align="center" prop="productId" />
<el-table-column :label="$t('BasPort.productName')" align="center" prop="productName" />
<el-table-column :label="$t('BasPort.productEnDesc')" align="center" prop="spare1"/>
<el-table-column :label="$t('BasPort.unit')" align="center" prop="unit" />
<el-table-column :label="$t('BasPort.netWeight')" align="center" prop="spare2" />
<el-table-column :label="$t('BasPort.boxNo')" align="center" prop="spare3" />
<el-table-column :label="$t('BasPort.packWay')" align="center" prop="spare4" />
<el-table-column :label="$t('BasPort.length')" align="center" prop="spare5" />
<el-table-column :label="$t('BasPort.width')" align="center" prop="spare6" />
<el-table-column :label="$t('BasPort.height')" align="center" prop="spare7" />
<el-table-column :label="$t('BasPort.volume')" align="center" prop="spare8" />
<el-table-column :label="$t('BasPort.price')" align="center" prop="price" />
<el-table-column :label="$t('BasPort.description')" align="center" prop="remark" />
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="$t('BasPort.productCode')" align="left" prop="productId" />
<el-table-column :label="$t('BasPort.productName')" align="left" prop="productName" />
<el-table-column :label="$t('BasPort.productEnDesc')" align="left" prop="spare1"/>
<el-table-column :label="$t('BasPort.unit')" align="left" prop="unit" />
<el-table-column :label="$t('BasPort.netWeight')" align="right" prop="spare2" />
<el-table-column :label="$t('BasPort.boxNo')" align="left" prop="spare3" />
<el-table-column :label="$t('BasPort.packWay')" align="left" prop="spare4" />
<el-table-column :label="$t('BasPort.length')" align="right" prop="spare5" />
<el-table-column :label="$t('BasPort.width')" align="right" prop="spare6" />
<el-table-column :label="$t('BasPort.height')" align="right" prop="spare7" />
<el-table-column :label="$t('BasPort.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('BasPort.price')" align="right" prop="price" />
<el-table-column :label="$t('BasPort.description')" align="left" prop="remark" />
<el-table-column :label="$t('BasPort.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button

20
ruoyi-ui/src/views/bas/warehouse/index.vue
View File

@@ -86,7 +86,7 @@
:value="dict.value"
/>
</el-select>
</el-form-item
</el-form-item>
<el-form-item>
<!-- 【查询】按钮 -->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('warehouse.search') }}</el-button>
@@ -149,27 +149,27 @@
<el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- 仓库ID（序号） -->
<el-table-column :label="$t('warehouse.Id')" align="center" prop="warehouseId" width="50"/>
<el-table-column :label="$t('warehouse.Id')" align="left" prop="warehouseId" width="50"/>
<!-- 仓库编号 -->
<el-table-column :label="$t('warehouse.warehouseId')" align="center" prop="warehouseNo" />
<el-table-column :label="$t('warehouse.warehouseId')" align="left" prop="warehouseNo" />
<!-- 项目编号 -->
<el-table-column :label="$t('warehouse.projectNo')" align="center" prop="projectNo" />
<el-table-column :label="$t('warehouse.projectNo')" align="left" prop="projectNo" />
<!-- 仓库名称 -->
<el-table-column :label="$t('warehouse.warehouseName')" align="center" prop="warehouseName" />
<el-table-column :label="$t('warehouse.warehouseName')" align="left" prop="warehouseName" />
<!-- 仓库地址 -->
<el-table-column :label="$t('warehouse.address')" align="center" prop="address" />
<el-table-column :label="$t('warehouse.address')" align="left" prop="address" />
<!-- 备注 -->
<el-table-column :label="$t('warehouse.cDesc')" align="center" prop="cdesc" />
<el-table-column :label="$t('warehouse.cDesc')" align="left" prop="cdesc" />
<!-- 仓库级别 -->
<el-table-column :label="$t('warehouse.warehouseKind')" align="center" prop="warehouseKind" />
<el-table-column :label="$t('warehouse.warehouseKind')" align="left" prop="warehouseKind" />
<!-- 仓库类型 -->
<el-table-column :label="$t('warehouse.warehouseType')" align="center" prop="warehouseType" >
<el-table-column :label="$t('warehouse.warehouseType')" align="left" prop="warehouseType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
</template>
</el-table-column>
<!-- 仓库是否可用 -->
<el-table-column :label="$t('warehouse.isCurrent')" align="center" prop="isCurrent">
<el-table-column :label="$t('warehouse.isCurrent')" align="left" prop="isCurrent">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCurrent"/>
</template>

10
ruoyi-ui/src/views/bas/warehousePort/index.vue
View File

@@ -88,11 +88,11 @@
<el-table v-loading="loading" :data="warehousePortList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="仓库id" align="center" prop="warehouseId" />
<el-table-column label="端点编码" align="center" prop="portCode" />
<el-table-column label="端点名称" align="center" prop="portName" />
<el-table-column label="端点类型" align="center" prop="portType">
<el-table-column label="id" align="left" prop="id" />
<el-table-column label="仓库id" align="left" prop="warehouseId" />
<el-table-column label="端点编码" align="left" prop="portCode" />
<el-table-column label="端点名称" align="left" prop="portName" />
<el-table-column label="端点类型" align="left" prop="portType">
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse_port_type" :value="scope.row.portType"/>
</template>

39
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -42,12 +42,12 @@
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="productId" /> <!-- 物资编号 -->
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.batchNo')" align="center" prop="lotNo"/> <!-- 批号 -->
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('checkCreate.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('checkCreate.materialCode')" align="left" prop="productId" /> <!-- 物资编号 -->
<el-table-column :label="$t('checkCreate.materialName')" align="left" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.batchNo')" align="left" prop="lotNo"/> <!-- 批号 -->
<el-table-column :label="$t('checkCreate.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('checkCreate.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('checkCreate.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{ $t('checkCreate.delete') }}</el-button> <!-- 删除 -->
@@ -89,13 +89,12 @@
</el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkCreate.materialCode')" align="left" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('checkCreate.materialName')" align="left" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.lotNo')" align="left" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="left" prop="warehouseName" /> <!-- 仓库 -->
</el-table>
<div slot="footer" class="dialog-footer">
@@ -140,10 +139,10 @@
</el-form>
<el-table v-loading="trayLoading" :data="trayOptions" @selection-change="handleTraySelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" />
<el-table-column :label="$t('checkCreate.trayCode')" align="center" prop="trayCode" />
<el-table-column :label="$t('checkCreate.cargoSpaceName')" align="center" prop="cargoSpaceName" />
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" />
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkCreate.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('checkCreate.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('checkCreate.warehouse')" align="left" prop="warehouseName" />
</el-table>
<!-- 托盘详情弹窗 -->
@@ -154,9 +153,9 @@
append-to-body
>
<el-table :data="trayDetailList">
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="extraField.productId" />
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="extraField.materialDesc" />
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" />
<el-table-column :label="$t('checkCreate.materialCode')" align="left" prop="extraField.productId" />
<el-table-column :label="$t('checkCreate.materialName')" align="left" prop="extraField.materialDesc" />
<el-table-column :label="$t('checkCreate.quantity')" align="right" prop="quantity" />
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="trayDetailVisible = false">{{ $t('checkCreate.close') }}</el-button>

49
ruoyi-ui/src/views/check/difference/index.vue
View File

@@ -158,50 +158,27 @@
<el-table v-loading="loading" :data="differenceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column :label="$t('checkDifference.checkGuid')" align="center" prop="checkGuid" /> &lt;!&ndash; 盘点id &ndash;&gt;-->
<el-table-column :label="$t('checkDifference.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('checkDifference.checkStockDetailId')" align="center" prop="checkStockDetailId" /> <!-- 盘点单据id -->
<el-table-column :label="$t('checkDifference.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('checkDifference.trayCode')" align="center" prop="trayCode" /> <!-- 托盘 -->
<el-table-column :label="$t('checkDifference.cargoSpaceId')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('checkDifference.productId')" align="center" prop="productId" /> <!-- 物料id -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkDifference.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 原值 -->
<el-table-column :label="$t('checkDifference.newQuantity')" align="center" prop="newQuantity" /> <!-- 新值 -->
<el-table-column :label="$t('checkDifference.recordType')" align="center" prop="recordType" >
<el-table-column :label="$t('checkDifference.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('checkDifference.checkStockDetailId')" align="left" prop="checkStockDetailId" /> <!-- 盘点单据id -->
<el-table-column :label="$t('checkDifference.stockId')" align="left" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('checkDifference.trayCode')" align="left" prop="trayCode" /> <!-- 托盘 -->
<el-table-column :label="$t('checkDifference.cargoSpaceId')" align="left" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('checkDifference.productId')" align="left" prop="productId" /> <!-- 物料id -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="left" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="left" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkDifference.oldQuantity')" align="right" prop="oldQuantity" /> <!-- 原值 -->
<el-table-column :label="$t('checkDifference.newQuantity')" align="right" prop="newQuantity" /> <!-- 新值 -->
<el-table-column :label="$t('checkDifference.recordType')" align="left" prop="recordType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.record_type" :value="scope.row.recordType"/>
</template>
</el-table-column><!-- 操作方式 -->
<el-table-column :label="$t('checkDifference.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('checkDifference.status')" align="center" prop="status"> <!-- 审核状态 -->
<el-table-column :label="$t('checkDifference.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<el-table-column :label="$t('checkDifference.status')" align="left" prop="status"> <!-- 审核状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.audit_diff_status" :value="scope.row.status"/>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('checkDifference.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<!-- <el-table-column :label="$t('checkDifference.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['check:difference:edit']"
>{{$t('checkDifference.edit')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['check:difference:remove']"
>{{$t('checkDifference.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;
</template>
</el-table-column>-->
</el-table>
<pagination

53
ruoyi-ui/src/views/check/flat/index.vue
View File

@@ -250,49 +250,40 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus" ><!-- 库存状态 -->
<el-table-column :label="$t('stockManagement.stockId')" align="left" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.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('stockManagement.cargoSpaceStockStatus')" align="center" prop="cargoSpaceStockStatus"> &lt;!&ndash; 货位状态 &ndash;&gt;
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
</template>
</el-table-column>-->
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" ><!--货位状态-->
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" ><!--货位状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="left" 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('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="left" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="right" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="right" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="right" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="right" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="right" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="right" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="left" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button

69
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -243,53 +243,45 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="300">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobIn.jobId')" align="center" prop="jobId" /> <!--任务ID-->
<el-table-column :label="$t('checkJobIn.status')" align="center" prop="status"> <!--任务状态-->
<el-table-column :label="$t('checkJobIn.jobId')" align="left" prop="jobId" /> <!--任务ID-->
<el-table-column :label="$t('checkJobIn.status')" align="left" prop="status"> <!--任务状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.onLineType')" align="center" prop="onLineType"> <!--上线类型-->
<el-table-column :label="$t('checkJobIn.onLineType')" align="left" prop="onLineType"> <!--上线类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.jobType')" align="center" prop="inOrOut"> <!--任务类型-->
<el-table-column :label="$t('checkJobIn.jobType')" align="left" prop="inOrOut"> <!--任务类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.check_in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.taskNo')" align="center" prop="taskNo" /> <!--任务号-->
<el-table-column :label="$t('checkJobIn.supplier')" align="center" prop="supplierName" key="supplierId" value="supplierName" /> <!--供应商-->
<el-table-column :label="$t('checkJobIn.department')" align="center" prop="departmentName" /> <!--部门-->
<el-table-column :label="$t('checkJobIn.trayCode')" align="center" prop="trayCode" /> <!--托盘码-->
<!-- <el-table-column :label="$t('checkJobIn.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash;巷道ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.cargoSpace')" align="center" prop="cargoSpaceName" /> <!--货位-->
<!-- <el-table-column :label="$t('checkJobIn.targetRoadway')" align="center" prop="targetRoadwayId" /> &lt;!&ndash;目标巷道&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.targetCargoSpace')" align="center" prop="targetCargoSpaceName" /> &lt;!&ndash;目标货位&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.lineId')" align="center" prop="lineId" /> &lt;!&ndash;产线ID&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.workshopId')" align="center" prop="workshopId" /> &lt;!&ndash;车间ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.priority')" align="center" prop="priority" /> <!--优先级-->
<el-table-column :label="$t('checkJobIn.executionPhase')" align="center" prop="executionPhase"> <!--执行阶段-->
<el-table-column :label="$t('checkJobIn.taskNo')" align="left" prop="taskNo" /> <!--任务号-->
<el-table-column :label="$t('checkJobIn.supplier')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> <!--供应商-->
<el-table-column :label="$t('checkJobIn.department')" align="left" prop="departmentName" /> <!--部门-->
<el-table-column :label="$t('checkJobIn.trayCode')" align="left" prop="trayCode" /> <!--托盘码-->
<el-table-column :label="$t('checkJobIn.cargoSpace')" align="left" prop="cargoSpaceName" /> <!--货位-->
<el-table-column :label="$t('checkJobIn.priority')" align="right" prop="priority" /> <!--优先级-->
<el-table-column :label="$t('checkJobIn.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('checkJobIn.startTime')" align="center" prop="startTime" width="180"> <!--开始时间-->
<el-table-column :label="$t('checkJobIn.startTime')" align="left" prop="startTime" width="180"> <!--开始时间-->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.finishTime')" align="center" prop="finishTime" width="180"> <!--结束时间-->
<el-table-column :label="$t('checkJobIn.finishTime')" align="left" prop="finishTime" width="180"> <!--结束时间-->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.entrance')" align="center" prop="entranceId" /> <!--入口ID-->
<!-- <el-table-column :label="$t('checkJobIn.classId')" align="center" prop="classId" /> &lt;!&ndash;班组ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.warehouse')" align="center" prop="warehouseName" /> <!--仓库ID-->
<!-- <el-table-column :label="$t('checkJobIn.faultFlag')" align="center" prop="faultFlag" /> &lt;!&ndash;重分标记&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.entrance')" align="left" prop="entranceId" /> <!--入口ID-->
<el-table-column :label="$t('checkJobIn.warehouse')" align="left" prop="warehouseName" /> <!--仓库ID-->
</el-table>
<pagination
@@ -304,30 +296,21 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobIn.jobDetailId')" align="center" prop="jobDetailId" /> <!--子任务ID-->
<el-table-column :label="$t('checkJobIn.jobId')" align="center" prop="jobId" /> <!--任务ID-->
<!-- <el-table-column :label="$t('checkJobIn.stockId')" align="center" prop="stockId" /> &lt;!&ndash;库存ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.lotNo')" align="center" prop="lotNo" /> <!--批次号-->
<el-table-column :label="$t('checkJobIn.inDate')" align="center" prop="inDate" width="180"> <!--入库时间-->
<el-table-column :label="$t('checkJobIn.jobDetailId')" align="left" prop="jobDetailId" /> <!--子任务ID-->
<el-table-column :label="$t('checkJobIn.jobId')" align="left" prop="jobId" /> <!--任务ID-->
<el-table-column :label="$t('checkJobIn.lotNo')" align="left" prop="lotNo" /> <!--批次号-->
<el-table-column :label="$t('checkJobIn.inDate')" align="left" prop="inDate" width="180"> <!--入库时间-->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.inOrOutId')" align="center" prop="inOrOutId" /> <!--单据ID-->
<el-table-column :label="$t('checkJobIn.inOrOutDId')" align="center" prop="inOrOutDId" /> <!--子单据ID-->
<!-- <el-table-column :label="$t('checkJobIn.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash;物料GUID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.productId')" align="center" prop="productId" /> <!--物料编码-->
<el-table-column :label="$t('checkJobIn.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('checkJobIn.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<!-- <el-table-column :label="$t('checkJobIn.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号-->
<!-- <el-table-column :label="$t('checkJobIn.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式-->
<el-table-column :label="$t('checkJobIn.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<!-- <el-table-column :label="$t('checkJobIn.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('checkJobIn.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<!-- <el-table-column :label="$t('checkJobIn.stockStatus')" align="center" prop="stockStatus" /> &lt;!&ndash;库存状态&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.inQuantity')" align="center" prop="inQuantity" /> <!--入库数量-->
<!-- <el-table-column :label="$t('checkJobIn.printDate')" align="center" prop="printDate" /> &lt;!&ndash;生产日期&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.supplierId')" align="center" prop="supplierId" /> &lt;!&ndash;供应商ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.inOrOutId')" align="left" prop="inOrOutId" /> <!--单据ID-->
<el-table-column :label="$t('checkJobIn.inOrOutDId')" align="left" prop="inOrOutDId" /> <!--子单据ID-->
<el-table-column :label="$t('checkJobIn.productId')" align="left" prop="productId" /> <!--物料编码-->
<el-table-column :label="$t('checkJobIn.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('checkJobIn.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 英文描述 -->
<el-table-column :label="$t('checkJobIn.netWeight')" align="right" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('checkJobIn.inQuantity')" align="right" prop="inQuantity" /> <!--入库数量-->
</el-table>
<pagination

61
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -251,44 +251,44 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobOut.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.status')" align="center" prop="status"> <!-- 任务状态 -->
<el-table-column :label="$t('checkJobOut.jobId')" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.status')" align="left" prop="status"> <!-- 任务状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.onLineType')" align="center" prop="onLineType"> <!-- 上线类型 -->
<el-table-column :label="$t('checkJobOut.onLineType')" align="left" prop="onLineType"> <!-- 上线类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.jobType')" align="center" prop="inOrOut"> <!-- 任务类型 -->
<el-table-column :label="$t('checkJobOut.jobType')" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.check_out_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('checkJobOut.departmentId')" align="center" prop="departmentId" /> <!-- 部门ID -->
<el-table-column :label="$t('checkJobOut.trayCode')" align="center" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.priority')" align="center" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('checkJobOut.executionPhase')" align="center" prop="executionPhase"> <!-- 执行阶段 -->
<el-table-column :label="$t('checkJobOut.taskNo')" align="left" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('checkJobOut.departmentId')" align="left" prop="departmentId" /> <!-- 部门ID -->
<el-table-column :label="$t('checkJobOut.trayCode')" align="left" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.priority')" align="right" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('checkJobOut.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('checkJobOut.startTime')" align="center" prop="startTime" width="180"> <!-- 开始时间 -->
<el-table-column :label="$t('checkJobOut.startTime')" align="left" prop="startTime" width="180"> <!-- 开始时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.finishTime')" align="center" prop="finishTime" width="180"> <!-- 结束时间 -->
<el-table-column :label="$t('checkJobOut.finishTime')" align="left" prop="finishTime" width="180"> <!-- 结束时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('checkJobOut.warehouse')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('checkJobOut.exitId')" align="left" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('checkJobOut.warehouse')" align="left" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('checkJobOut.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -317,27 +317,18 @@
<el-table v-loading="loading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('checkJobOut.subJobId')" align="center" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('checkJobOut.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('checkJobOut.batchNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<!-- <el-table-column :label="$t('checkJobOut.inTime')" align="center" prop="inTime" width="180"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('checkJobOut.billId')" align="center" prop="inOrOutId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="inOrOutDId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.productId')" align="center" prop="productId" /> <!-- 物料id -->
<el-table-column :label="$t('checkJobOut.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料编码 -->
<el-table-column :label="$t('checkJobOut.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<!-- <el-table-column :label="$t('checkJobOut.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号-->
<!-- <el-table-column :label="$t('checkJobOut.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式-->
<el-table-column :label="$t('checkJobOut.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<!-- <el-table-column :label="$t('checkJobOut.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('checkJobOut.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('checkJobOut.outQuantity')" align="center" prop="outQuantity" /> // 出库数量
<el-table-column :label="$t('checkJobOut.pickQuantity')" align="center" prop="pickQuantity" /> // 拣选数量
<el-table-column :label="$t('checkJobOut.subJobId')" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('checkJobOut.jobId')" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.stockId')" align="left" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('checkJobOut.batchNo')" align="left" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('checkJobOut.billId')" align="left" prop="inOrOutId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="left" prop="inOrOutDId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.productId')" align="left" prop="productId" /> <!-- 物料id -->
<el-table-column :label="$t('checkJobOut.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料编码 -->
<el-table-column :label="$t('checkJobOut.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 英文描述 -->
<el-table-column :label="$t('checkJobOut.netWeight')" align="right" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('checkJobOut.outQuantity')" align="right" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('checkJobOut.pickQuantity')" align="right" prop="pickQuantity" /> <!-- 拣选数量 -->
</el-table>
<pagination

44
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -202,25 +202,24 @@
<el-table v-loading="loading" :data="stockCheckList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="GUID" align="center" prop="stockGuid" /> -->
<el-table-column :label="$t('checkStockCheck.stockCheckId')" align="center" prop="stockCheckId" /> <!-- 盘点单据ID -->
<el-table-column :label="$t('checkStockCheck.checkType')" align="center" prop="checkType"> <!-- 盘库类型 -->
<el-table-column :label="$t('checkStockCheck.stockCheckId')" align="left" prop="stockCheckId" /> <!-- 盘点单据ID -->
<el-table-column :label="$t('checkStockCheck.checkType')" align="left" prop="checkType"> <!-- 盘库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.check_stock_type" :value="scope.row.checkType"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkStockCheck.status')" align="center" prop="status" > <!-- 单据状态 -->
<el-table-column :label="$t('checkStockCheck.status')" align="left" prop="status" > <!-- 单据状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.stockSource')" align="center" prop="stockSource" /> <!-- 单据来源 -->
<el-table-column :label="$t('checkStockCheck.departmentNo')" align="center" prop="departmentNo" /> <!-- 部门编码 -->
<el-table-column :label="$t('checkStockCheck.createManId')" align="center" prop="createManId" /> <!-- 创建人 -->
<el-table-column :label="$t('checkStockCheck.createDate')" align="center" prop="createDate" /> <!-- 建立时间 -->
<el-table-column :label="$t('checkStockCheck.finishDate')" align="center" prop="finishDate" /> <!-- 完成日期 -->
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.stockSource')" align="left" prop="stockSource" /> <!-- 单据来源 -->
<el-table-column :label="$t('checkStockCheck.departmentNo')" align="left" prop="departmentNo" /> <!-- 部门编码 -->
<el-table-column :label="$t('checkStockCheck.createManId')" align="left" prop="createManId" /> <!-- 创建人 -->
<el-table-column :label="$t('checkStockCheck.createDate')" align="left" prop="createDate" /> <!-- 建立时间 -->
<el-table-column :label="$t('checkStockCheck.finishDate')" align="left" prop="finishDate" /> <!-- 完成日期 -->
</el-table>
<pagination
@@ -232,21 +231,16 @@
/>
<el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column :label="$t('checkStockCheck.detailId')" align="center" prop="stockCheckDetailId" /> <!-- 子单ID -->
<!-- <el-table-column label="主单GUID" align="center" prop="stockCheckGuid" /> -->
<el-table-column :label="$t('checkStockCheck.mainId')" align="center" prop="stockCheckId" /> <!-- 主单ID -->
<el-table-column :label="$t('checkStockCheck.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('checkStockCheck.lotNo')" align="center" prop="lotNo"/> <!-- 批次号 -->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column :label="$t('checkStockCheck.productId')" align="center" prop="productId"/> <!-- 物料编码 -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<!-- <el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> &lt;!&ndash; 箱号 &ndash;&gt;-->
<!-- <el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> &lt;!&ndash; 包装方式 &ndash;&gt;-->
<el-table-column :label="$t('checkStockCheck.quantity')" align="center" prop="quantity"/> <!-- 计划数量 -->
<el-table-column :label="$t('checkStockCheck.scanNum')" align="center" prop="scanNum"/> <!-- 扫码数量 -->
<el-table-column :label="$t('checkStockCheck.assignNum')" align="center" prop="assignNum"/> <!-- 实际数量 -->
<el-table-column :label="$t('checkStockCheck.detailId')" align="left" prop="stockCheckDetailId" /> <!-- 子单ID -->
<el-table-column :label="$t('checkStockCheck.mainId')" align="left" prop="stockCheckId" /> <!-- 主单ID -->
<el-table-column :label="$t('checkStockCheck.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('checkStockCheck.lotNo')" align="left" prop="lotNo"/> <!-- 批次号 -->
<el-table-column :label="$t('checkStockCheck.productId')" align="left" prop="productId"/> <!-- 物料编码 -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="left" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="left" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkStockCheck.quantity')" align="right" prop="quantity"/> <!-- 计划数量 -->
<el-table-column :label="$t('checkStockCheck.scanNum')" align="right" prop="scanNum"/> <!-- 扫码数量 -->
<el-table-column :label="$t('checkStockCheck.assignNum')" align="right" prop="assignNum"/> <!-- 实际数量 -->
</el-table>
<pagination

8
ruoyi-ui/src/views/dashboard/LineChart.vue
View File

@@ -95,9 +95,9 @@ export default {
series: [{
name: '入库',
itemStyle: {
color: '#ff4d00',
color: '#9dcef6',
lineStyle: {
color: '#ff4d00',
color: '#9dcef6',
width: 2
}
},
@@ -112,9 +112,9 @@ export default {
smooth: true,
type: 'line',
itemStyle: {
color: '#3f9dfd',
color: '#e1d84d',
lineStyle: {
color: '#3f9dfd',
color: '#e1d84d',
width: 2
}
},

74
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -251,52 +251,52 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="300">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" fixed /> // 任务ID
<el-table-column :label="$t('inJob.status')" align="center" prop="status"> // 任务状态
<el-table-column :label="$t('inJob.jobId')" align="left" prop="jobId" fixed /> // 任务ID
<el-table-column :label="$t('inJob.status')" align="left" prop="status"> // 任务状态
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.onLineType')" align="center" prop="onLineType"> // 上线类型
<el-table-column :label="$t('inJob.onLineType')" align="left" prop="onLineType"> // 上线类型
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.inOrOut')" align="center" prop="inOrOut"> // 任务类型
<el-table-column :label="$t('inJob.inOrOut')" align="left" prop="inOrOut"> // 任务类型
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.taskNo')" align="center" prop="taskNo" /> // 任务号
<el-table-column :label="$t('inJob.supplierName')" align="center" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
<el-table-column :label="$t('inJob.departmentName')" align="center" prop="departmentName" /> // 部门
<el-table-column :label="$t('inJob.trayCode')" align="center" prop="trayCode" /> // 托盘码
<el-table-column :label="$t('inJob.roadwayId')" align="center" prop="roadwayId" /> // 巷道ID
<el-table-column :label="$t('inJob.cargoSpaceName')" align="center" prop="cargoSpaceName" /> // 货位
<el-table-column :label="$t('inJob.targetRoadwayId')" align="center" prop="targetRoadwayId" /> // 目标巷道
<el-table-column :label="$t('inJob.targetCargoSpaceName')" align="center" prop="targetCargoSpaceName" /> // 目标货位
<el-table-column :label="$t('inJob.lineId')" align="center" prop="lineId" /> // 产线ID
<el-table-column :label="$t('inJob.workshopId')" align="center" prop="workshopId" /> // 车间ID
<el-table-column :label="$t('inJob.priority')" align="center" prop="priority" /> // 优先级
<el-table-column :label="$t('inJob.executionPhase')" align="center" prop="executionPhase"> // 执行阶段
<el-table-column :label="$t('inJob.taskNo')" align="left" prop="taskNo" /> // 任务号
<el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商
<el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门
<el-table-column :label="$t('inJob.trayCode')" align="left" prop="trayCode" /> // 托盘码
<el-table-column :label="$t('inJob.roadwayId')" align="left" prop="roadwayId" /> // 巷道ID
<el-table-column :label="$t('inJob.cargoSpaceName')" align="left" prop="cargoSpaceName" /> // 货位
<el-table-column :label="$t('inJob.targetRoadwayId')" align="left" prop="targetRoadwayId" /> // 目标巷道
<el-table-column :label="$t('inJob.targetCargoSpaceName')" align="left" prop="targetCargoSpaceName" /> // 目标货位
<el-table-column :label="$t('inJob.lineId')" align="left" prop="lineId" /> // 产线ID
<el-table-column :label="$t('inJob.workshopId')" align="left" prop="workshopId" /> // 车间ID
<el-table-column :label="$t('inJob.priority')" align="left" prop="priority" /> // 优先级
<el-table-column :label="$t('inJob.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('inJob.startTime')" align="center" prop="startTime" width="180"> // 开始时间
<el-table-column :label="$t('inJob.startTime')" align="left" prop="startTime" width="180"> // 开始时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.finishTime')" align="center" prop="finishTime" width="180"> // 结束时间
<el-table-column :label="$t('inJob.finishTime')" align="left" prop="finishTime" width="180"> // 结束时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.entranceId')" align="center" prop="entranceId" /> // 入口ID
<el-table-column :label="$t('inJob.classId')" align="center" prop="classId" /> // 班组ID
<el-table-column :label="$t('inJob.warehouseId')" align="center" prop="warehouseId" /> // 仓库ID
<el-table-column :label="$t('inJob.faultFlag')" align="center" prop="faultFlag" /> // 重分标记
<el-table-column :label="$t('inJob.entranceId')" align="left" prop="entranceId" /> // 入口ID
<el-table-column :label="$t('inJob.classId')" align="left" prop="classId" /> // 班组ID
<el-table-column :label="$t('inJob.warehouseId')" align="left" prop="warehouseId" /> // 仓库ID
<el-table-column :label="$t('inJob.faultFlag')" align="left" prop="faultFlag" /> // 重分标记
</el-table>
<pagination
@@ -311,29 +311,29 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.jobDetailId')" align="left" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="left" prop="jobId" /> // 任务ID
<!-- <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<el-table-column :label="$t('inJob.lotNo')" align="left" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.inOrOutId')" align="left" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="left" prop="inOrOutDId" /> // 子单据ID
<!-- <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('inJob.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('inJob.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('inJob.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('inJob.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inJob.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inJob.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<el-table-column :label="$t('inJob.productId')" align="left" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.materialDesc')" align="left" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('inJob.englishDesc')" align="left" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('inJob.cartonNo')" align="left" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('inJob.packingMethod')" align="left" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('inJob.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inJob.totalNetWeight')" align="right" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inJob.grossWeight')" align="right" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.inQuantity')" align="right" prop="inQuantity" /> // 入库数量
<!-- <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
<!-- <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />

58
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -62,35 +62,35 @@
<el-table :data="productList" border style="width: 100%">
<el-table-column type="index" :label="$t('receiveStockinAdd.serialNumber')" width="50" align="center"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column fixed :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column fixed :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column fixed :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.totalNetWeight')" width="120" align="center">
<el-table-column fixed :label="$t('receiveStockinAdd.productId')" align="left" prop="productId" /><!--物料编码-->
<el-table-column fixed :label="$t('receiveStockinAdd.productName')" align="left" prop="productName" /><!--物料名称-->
<el-table-column fixed :label="$t('receiveStockinAdd.spare1')" align="left" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="left" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="right" prop="spare2" width="120px"/><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.totalNetWeight')" width="120" align="right">
<template slot-scope="scope">
<span>{{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="left" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="left" prop="spare4" /><!--包装方式-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="right" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="right" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="right" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="right" prop="spare8" /><!--体积m³-->
<!-- <el-table-column :label="$t('receiveStockinAdd.netWeight')" align="center" prop="netWeight" />净重KG -->
<el-table-column :label="$t('receiveStockinAdd.netWeight')" width="120" align="center">
<el-table-column :label="$t('receiveStockinAdd.netWeight')" width="120" align="right">
<template slot-scope="scope">
<span>{{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('receiveStockinAdd.grossWeight')" align="center" prop="grossWeight" />毛重KG -->
<el-table-column :label="$t('receiveStockinAdd.grossWeight')" width="120" align="center">
<el-table-column :label="$t('receiveStockinAdd.grossWeight')" width="120" align="right">
<template slot-scope="scope">
<span>{{ (scope.row.quantity * scope.row.spare2).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.price')" align="right" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
<el-table-column :label="$t('receiveStockinAdd.batchNumber')" width="120" align="center">
<template slot-scope="scope">
@@ -101,7 +101,7 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="center">
<el-table-column :label="$t('receiveStockinAdd.quantity')" width="120" align="right">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
@@ -112,7 +112,7 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.unitPrice')" width="120" align="center">
<el-table-column :label="$t('receiveStockinAdd.unitPrice')" width="120" align="left">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.price"
@@ -123,7 +123,7 @@
/>
</template>
</el-table-column>
<el-table-column :label="$t('receiveStockinAdd.amount')" width="120" align="center">
<el-table-column :label="$t('receiveStockinAdd.amount')" width="120" align="right">
<template slot-scope="scope">
<span>{{ (scope.row.quantity * scope.row.price).toFixed(2) }}</span>
</template>
@@ -157,21 +157,21 @@
<el-table :data="productOptions" border @selection-change="handleProductSelectionChange">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column label="主键" align="center" prop="productGuid" />-->
<el-table-column :label="$t('receiveStockinAdd.productId')" align="center" prop="productId" /><!--物料编码-->
<el-table-column :label="$t('receiveStockinAdd.productName')" align="center" prop="productName" /><!--物料名称-->
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.productId')" align="left" width="120px" prop="productId" /><!--物料编码-->
<el-table-column :label="$t('receiveStockinAdd.productName')" align="left" prop="productName" /><!--物料名称-->
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="left" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="left" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="right" prop="spare2" /><!--单件净重KG-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" />&lt;!&ndash;箱号&ndash;&gt;-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" />&lt;!&ndash;包装方式&ndash;&gt;-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="center" prop="spare8" /><!--体积m³-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="right" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="right" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="right" prop="spare7" /><!--高MM-->
<el-table-column :label="$t('receiveStockinAdd.spare8')" align="right" prop="spare8" /><!--体积m³-->
<!-- <el-table-column label="净重KG" align="center" prop="spare8" />
<el-table-column label="毛重KG" align="center" prop="spare9" />-->
<el-table-column :label="$t('receiveStockinAdd.price')" align="center" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="center" prop="remark" /><!--描述-->
<el-table-column :label="$t('receiveStockinAdd.price')" align="right" prop="price" /><!--价格-->
<el-table-column :label="$t('receiveStockinAdd.remark')" align="left" prop="remark" /><!--描述-->
</el-table>
<pagination
v-show="productTotal>0"

40
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -229,15 +229,15 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<el-table-column :label="$t('inReceiveStockin.status')" align="left" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="left" prop="warehouseName"/><!--仓库-->
<!-- <el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段3" align="center" prop="spare3" />-->
@@ -245,11 +245,11 @@
<!-- <el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段1" align="center" prop="spare1" />-->
<!-- <el-table-column label="erp单号" align="center" prop="erpBill"/>-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"/><!--单据来源-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="left" prop="stockSource"/><!--单据来源-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="left" prop="departmentName"/><!--部门-->
<!-- <el-table-column label="客户编码" align="center" prop="customerNo"/>-->
<!-- <el-table-column label="班组编码" align="center" prop="classNo"/>-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="left" prop="supplierName"/><!--供应商-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -268,8 +268,8 @@
>删除</el-button>
</template>
</el-table-column> -->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="left" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="left" prop="createDate"/><!--建立时间-->
</el-table>
<pagination
@@ -307,21 +307,21 @@
</el-row>
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
<!-- <el-table-column label="主单GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/><!--批次号-->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="left" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="left" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120" prop="extraField.netWeight"/><!--净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="right"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
v-model="scope.row.quantity"
@@ -340,7 +340,7 @@
<el-table-column label="实际数量(箱)" align="center" prop="assignNumX" />
<el-table-column label="实际数量(件)" align="center" prop="assignNumJ" />-->
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="left" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.stockStatus"/>
</template>

44
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -267,28 +267,28 @@
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="left" prop="inType"><!--入库类型-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<el-table-column :label="$t('inReceiveStockin.status')" align="left" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="left" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="left" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="left" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="left" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="left" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="left" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="left" prop="finishDate"/><!--完成日期-->
</el-table>
<pagination
@@ -301,20 +301,20 @@
<el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="center" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="center" prop="lotNo"/><!--批次号-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="center" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="center" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inReceiveStockin.stockinDetailId')" align="left" prop="stockinDetailId"/><!--子单ID-->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="left" prop="stockinId"/><!--主单ID-->
<el-table-column :label="$t('inReceiveStockin.lotNo')" align="left" prop="lotNo"/><!--批次号-->
<el-table-column :label="$t('inReceiveStockin.productId')" align="left" prop="productId"/><!--物料编码-->
<el-table-column :label="$t('inReceiveStockin.materialDesc')" align="left" prop="extraField.materialDesc"/><!--物料描述-->
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="left" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="left" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="left" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> <!--净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="right" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="right" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="right" prop="assignNum"/><!--实际数量-->
</el-table>
<pagination
v-show="detailTotal>0"

18
ruoyi-ui/src/views/index.vue
View File

@@ -150,7 +150,7 @@ export default {
],
datasets: [{
data: [],
backgroundColor: ['#36f7c4', '#ffc240', '#34bfa3', '#ff5f5f', '#ffd700', '#c669cd']
backgroundColor: ['#00d083', '#fdd100', '#fd7546', '#3f5cfc', '#1d99fd', '#2bf6ff']
}]
},
documentList: [],
@@ -256,36 +256,36 @@ export default {
}
.icon-people {
background: #40c9c6;
background: #27c3cc;
}
.icon-message {
background: #36a3f7;
background: #ffd202;
}
.icon-money {
background: #f4516c;
background: #00cf7f;
}
.icon-shopping {
background: #34bfa3;
background: #2298f8;
}
}
.icon-people {
color: #40c9c6;
color: #27c3cc;
}
.icon-message {
color: #36a3f7;
color: #ffd202;
}
.icon-money {
color: #f4516c;
color: #00cf7f;
}
.icon-shopping {
color: #34bfa3;
color: #2298f8;
}
.card-panel-icon-wrapper {

47
ruoyi-ui/src/views/job/outJobManagement.vue
View File

@@ -106,41 +106,38 @@
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('outJobManagement.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('outJobManagement.status')" align="center" prop="status"> <!-- 任务状态 -->
<el-table-column :label="$t('outJobManagement.jobId')" align="left" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('outJobManagement.status')" align="left" prop="status"> <!-- 任务状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.onLineType')" align="center" prop="onLineType"> <!-- 上线类型 -->
<el-table-column :label="$t('outJobManagement.onLineType')" align="left" prop="onLineType"> <!-- 上线类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.jobType')" align="center" prop="inOrOut"> <!-- 任务类型 -->
<el-table-column :label="$t('outJobManagement.jobType')" align="left" prop="inOrOut"> <!-- 任务类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
</template>
</el-table-column>
<el-table-column :label="$t('outJobManagement.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('outJobManagement.customerId')" align="center" prop="customerId" /> <!-- 客户ID -->
<el-table-column :label="$t('outJobManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('outJobManagement.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('outJobManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('outJobManagement.priority')" align="center" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('outJobManagement.executionPhase')" align="center" prop="executionPhase"> <!-- 执行阶段 -->
<el-table-column :label="$t('outJobManagement.taskNo')" align="left" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('outJobManagement.customerId')" align="left" prop="customerId" /> <!-- 客户ID -->
<el-table-column :label="$t('outJobManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘码 -->
<el-table-column :label="$t('outJobManagement.roadwayId')" align="left" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('outJobManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('outJobManagement.priority')" align="right" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('outJobManagement.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('outJobManagement.createTime')" align="center" prop="createTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.startTime')" align="center" prop="startTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.finishTime')" align="center" prop="finishTime" width="180"/> <!-- 结束时间 -->
<el-table-column :label="$t('outJobManagement.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('outJobManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('outJobManagement.createTime')" align="left" prop="createTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.startTime')" align="left" prop="startTime" width="180"/> <!-- 开始时间 -->
<el-table-column :label="$t('outJobManagement.finishTime')" align="left" prop="finishTime" width="180"/> <!-- 结束时间 -->
<el-table-column :label="$t('outJobManagement.exitId')" align="left" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('outJobManagement.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库ID -->
</el-table>
<pagination
@@ -153,12 +150,12 @@
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('outJobManagement.subTaskId')" align="center" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('outJobManagement.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('outJobManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="center" prop="inOrOutDId" /> <!-- 子单据ID -->
<el-table-column :label="$t('outJobManagement.materialCode')" align="center" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('outJobManagement.subTaskId')" align="left" prop="jobDetailId" /> <!-- 子任务ID -->
<el-table-column :label="$t('outJobManagement.stockId')" align="left" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('outJobManagement.lotNo')" align="left" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('outJobManagement.subDocumentId')" align="left" prop="inOrOutDId" /> <!-- 子单据ID -->
<el-table-column :label="$t('outJobManagement.materialCode')" align="left" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('outJobManagement.outQuantity')" align="right" prop="outQuantity" /> <!-- 出库数量 -->
</el-table>
<pagination

20
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -42,10 +42,10 @@
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column :label="$t('addOutStockout.materialCode')" align="center" prop="productId" /><!--物资编号-->
<el-table-column :label="$t('addOutStockout.materialName')" align="center" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="center" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="center" prop="quantity"><!--数量-->
<el-table-column :label="$t('addOutStockout.materialCode')" align="left" prop="productId" /><!--物资编号-->
<el-table-column :label="$t('addOutStockout.materialName')" align="left" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="left" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="right" prop="quantity"><!--数量-->
<template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
@@ -99,12 +99,12 @@
</el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column :label="$t('addOutStockout.materialCode')" align="center" prop="productId" /><!--物资编码-->
<el-table-column :label="$t('addOutStockout.materialName')" align="center" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="center" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="center" prop="quantity" /><!--数量-->
<el-table-column :label="$t('addOutStockout.warehouse')" align="center" prop="warehouseId" /><!--仓库-->
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('addOutStockout.materialCode')" align="left" prop="productId" /><!--物资编码-->
<el-table-column :label="$t('addOutStockout.materialName')" align="left" prop="productName" /><!--物资名称-->
<el-table-column :label="$t('addOutStockout.batchNo')" align="left" prop="lotNo" /><!--批号-->
<el-table-column :label="$t('addOutStockout.quantity')" align="right" prop="quantity" /><!--数量-->
<el-table-column :label="$t('addOutStockout.warehouse')" align="left" prop="warehouseId" /><!--仓库-->
</el-table>
<div slot="footer" class="dialog-footer">

16
ruoyi-ui/src/views/out/exception/index.vue
View File

@@ -111,14 +111,14 @@
<el-table v-loading="loading" :data="exceptionList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="出库异常id" align="center" prop="outGuid" />
<el-table-column label="仓库id" align="center" prop="warehouseId" />
<el-table-column label="库存id" align="center" prop="stockId" />
<el-table-column label="托盘" align="center" prop="trayCode" />
<el-table-column label="物料id" align="center" prop="productId" />
<el-table-column label="备用1" align="center" prop="spare1" />
<el-table-column label="备用2" align="center" prop="spare2" />
<el-table-column label="备用3" align="center" prop="spare3" />
<el-table-column label="出库异常id" align="left" prop="outGuid" />
<el-table-column label="仓库id" align="left" prop="warehouseId" />
<el-table-column label="库存id" align="left" prop="stockId" />
<el-table-column label="托盘" align="left" prop="trayCode" />
<el-table-column label="物料id" align="left" prop="productId" />
<el-table-column label="备用1" align="left" prop="spare1" />
<el-table-column label="备用2" align="left" prop="spare2" />
<el-table-column label="备用3" align="left" prop="spare3" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button

41
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -148,25 +148,24 @@
<!-- 主表数据 -->
<el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('outStockoutManage.stockoutId')" align="center" prop="stockoutId" /> <!-- 出库单编号 -->
<el-table-column :label="$t('outStockoutManage.outType')" align="center" prop="outType"> <!-- 出库类型 -->
<el-table-column :label="$t('outStockoutManage.stockoutId')" align="left" prop="stockoutId" /> <!-- 出库单编号 -->
<el-table-column :label="$t('outStockoutManage.outType')" align="left" prop="outType"> <!-- 出库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column :label="$t('outStockoutManage.status')" align="center" prop="status"> <!-- 单据状态 -->
<el-table-column :label="$t('outStockoutManage.status')" align="left" prop="status"> <!-- 单据状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" /><!-- 客户编码 -->
<el-table-column :label="$t('outStockoutManage.customerName')" align="center" prop="customerName" />
<el-table-column :label="$t('outStockoutManage.createManId')" align="center" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="$t('outStockoutManage.createDate')" align="center" prop="createDate" /><!-- 创建时间 -->
<el-table-column :label="$t('outStockoutManage.startDate')" align="center" prop="startDate" /><!-- 开始时间 -->
<el-table-column :label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" /> <!-- 确认时间 -->
<!-- <el-table-column label="仓库编号" align="center" prop="warehouseId" />-->
<el-table-column :label="$t('outStockoutManage.warehouseName')" align="center" prop="warehouseName" /><!-- 仓库名称 -->
<el-table-column :label="$t('outStockoutManage.customerNo')" align="left" prop="customerNo" /><!-- 客户编码 -->
<el-table-column :label="$t('outStockoutManage.customerName')" align="left" prop="customerName" />
<el-table-column :label="$t('outStockoutManage.createManId')" align="left" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="$t('outStockoutManage.createDate')" align="left" prop="createDate" /><!-- 创建时间 -->
<el-table-column :label="$t('outStockoutManage.startDate')" align="left" prop="startDate" /><!-- 开始时间 -->
<el-table-column :label="$t('outStockoutManage.finishDate')" align="left" prop="finishDate" /> <!-- 确认时间 -->
<el-table-column :label="$t('outStockoutManage.warehouseName')" align="left" prop="warehouseName" /><!-- 仓库名称 -->
</el-table>
<pagination
@@ -179,18 +178,14 @@
<!-- 子表数据 -->
<el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('outStockoutManage.productName')" align="center" prop="productName" />
<el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="$t('outStockoutManage.assignNum')" align="center" prop="assignNum" /> <!-- 实际数量 -->
<el-table-column :label="$t('outStockoutManage.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<!-- <el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> &lt;!&ndash; 单位 &ndash;&gt;-->
<!-- <el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<!-- <el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> &lt;!&ndash; 价格 &ndash;&gt;-->
<el-table-column :label="$t('outStockoutManage.remark')" align="center" prop="remark" /> <!-- 备注 -->
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="left" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="left" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('outStockoutManage.productName')" align="left" prop="productName" />
<el-table-column :label="$t('outStockoutManage.lotNo')" align="left" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="right" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="$t('outStockoutManage.assignNum')" align="right" prop="assignNum" /> <!-- 实际数量 -->
<el-table-column :label="$t('outStockoutManage.allotQuantity')" align="right" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="$t('outStockoutManage.remark')" align="left" prop="remark" /> <!-- 备注 -->
</el-table>
<pagination

12
ruoyi-ui/src/views/out/productAndStock.vue
View File

@@ -62,12 +62,12 @@
</el-row>
<el-table v-loading="loading" :data="productAndStockList">
<el-table-column :label="$t('productAndStock.serialNumber')" align="center" prop="onlyIdentity" /> <!-- 序号 -->
<el-table-column :label="$t('productAndStock.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('productAndStock.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('productAndStock.productName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('productAndStock.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('productAndStock.warehouse')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('productAndStock.serialNumber')" align="left" prop="onlyIdentity" /> <!-- 序号 -->
<el-table-column :label="$t('productAndStock.productId')" align="left" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('productAndStock.lotNo')" align="left" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('productAndStock.productName')" align="left" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('productAndStock.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('productAndStock.warehouse')" align="left" prop="warehouseId" /> <!-- 仓库 -->
</el-table>
<pagination

30
ruoyi-ui/src/views/search/StockSummary/index.vue
View File

@@ -97,22 +97,20 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
<el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
<!-- <el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" v-if="queryParams.groupFields.includes('spec')" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
<!-- <el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" v-if="queryParams.groupFields.includes('lotNo')" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseName" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.cargoSpace')" align="center" prop="cargoSpaceName" v-if="queryParams.groupFields.includes('cargoSpaceId')" /> <!-- 货位 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchStockSummary.productId')" align="left" prop="productId" v-if="queryParams.groupFields.includes('productId')" /> <!-- 物料编码 -->
<el-table-column :label="$t('searchStockSummary.productName')" align="left" prop="productName" v-if="queryParams.groupFields.includes('productName')" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchStockSummary.unit')" align="left" prop="unit" v-if="queryParams.groupFields.includes('unit')" /> <!-- 单位 -->
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="left" prop="warehouseName" v-if="queryParams.groupFields.includes('warehouseId')" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.cargoSpace')" align="left" prop="cargoSpaceName" v-if="queryParams.groupFields.includes('cargoSpaceId')" /> <!-- 货位 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="right" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" v-if="queryParams.groupFields.includes('spare1')" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" prop="spare2" width="120" v-if="queryParams.groupFields.includes('spare2')" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" v-if="queryParams.groupFields.includes('spare5')" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" v-if="queryParams.groupFields.includes('spare6')" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" v-if="queryParams.groupFields.includes('spare7')" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" v-if="queryParams.groupFields.includes('spare8')" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" v-if="queryParams.groupFields.includes('price')" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
</el-table>
<pagination

44
ruoyi-ui/src/views/search/ViewFlatWarehouseInFlow/index.vue
View File

@@ -161,28 +161,28 @@
<el-table v-loading="loading" :data="ViewFlatWarehouseInFlowList" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="入出库类型" align="center" prop="inOrOut" />
<el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />
<el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.createMan')" align="center" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库id -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.address')" align="center" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseLevel')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.available')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column label="入出库类型" align="left" prop="inOrOut" />
<el-table-column label="入出库主单据ID" align="left" prop="inOrOutSotckId" />
<el-table-column label="入出库主子单据ID" align="left" prop="inOrOutSotckDetailId" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" width="120" align="right" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.createMan')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库id -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->

44
ruoyi-ui/src/views/search/ViewFlatWarehouseOutFlow/index.vue
View File

@@ -189,28 +189,28 @@
<!-- <el-table-column label="入出库主单据ID" align="center" prop="inOrOutSotckId" />-->
<!-- <el-table-column label="入出库主子单据ID" align="center" prop="inOrOutSotckDetailId" />-->
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.creator')" align="center" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialId')" align="center" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.description')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="center" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.address')" align="center" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseDesc')" align="center" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" align="center" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.available')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.creator')" align="left" prop="createMan" /> <!-- 创建人 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialId')" align="left" prop="productId" /> <!-- 物料ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.materialName')" align="left" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.quantity')" align="right" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.spec')" align="left" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.brand')" align="left" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.unit')" align="left" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.description')" align="left" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" align="left" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" align="left" prop="warehouseName" /> <!-- 仓库名称 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.address')" align="left" prop="address" /> <!-- 仓库地址 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseDesc')" align="left" prop="cDesc" /> <!-- 仓库描述 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" align="left" prop="warehouseKind" /> <!-- 仓库级别 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.warehouseType')" align="left" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewFlatWarehouseOutFlow.available')" align="left" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->

83
ruoyi-ui/src/views/search/ViewInJobFlow/index.vue
View File

@@ -314,68 +314,51 @@
<el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('searchViewInJobFlow.jobId')" align="center" prop="jobId" />
<el-table-column :label="$t('searchViewInJobFlow.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('searchViewInJobFlow.status')" align="center" prop="status">
<el-table-column :label="$t('searchViewInJobFlow.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewInJobFlow.jobDetailId')" align="left" prop="jobDetailId" />
<el-table-column :label="$t('searchViewInJobFlow.status')" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.taskNo')" align="center" prop="taskNo" />
<el-table-column :label="$t('searchViewInJobFlow.trayCode')" align="center" prop="trayCode" />
<el-table-column :label="$t('searchViewInJobFlow.roadwayId')" align="center" prop="roadwayId" />
<!-- <el-table-column label="货位ID" align="center" prop="cargoSpaceId" />-->
<el-table-column :label="$t('searchViewInJobFlow.cargoSpaceName')" align="center" prop="cargoSpaceName" />
<!-- <el-table-column label="排" align="center" prop="thePlatoon" />-->
<!-- <el-table-column label="列" align="center" prop="theColumn" />-->
<!-- <el-table-column label="层" align="center" prop="theFloor" />-->
<el-table-column :label="$t('searchViewInJobFlow.priority')" align="center" prop="priority" />
<el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="center" prop="executionPhase">
<el-table-column :label="$t('searchViewInJobFlow.taskNo')" align="left" prop="taskNo" />
<el-table-column :label="$t('searchViewInJobFlow.trayCode')" align="left" prop="trayCode" />
<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">
<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="center" prop="inOrOut" />
<el-table-column :label="$t('searchViewInJobFlow.entranceId')" align="center" prop="entranceId" />
<el-table-column :label="$t('searchViewInJobFlow.productId')" align="center" prop="productId" />
<el-table-column :label="$t('searchViewInJobFlow.lotNo')" align="center" prop="lotNo" />
<el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="center" prop="stackingId" />
<el-table-column :label="$t('searchViewInJobFlow.stockStatus')" align="center" prop="stockStatus">
<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" />
<el-table-column :label="$t('searchViewInJobFlow.stackingId')" align="left" prop="stackingId" />
<el-table-column :label="$t('searchViewInJobFlow.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('searchViewInJobFlow.inQuantity')" align="center" prop="inQuantity" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutId')" align="center" prop="inOrOutId" />
<el-table-column :label="$t('searchViewInJobFlow.inOrOutDId')" align="center" prop="inOrOutDId" />
<el-table-column :label="$t('searchViewInJobFlow.createTime')" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.startTime')" align="center" prop="startTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.finishTime')" align="center" prop="finishTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewInJobFlow.warehouseId')" align="center" prop="warehouseId" />
<el-table-column :label="$t('searchViewInJobFlow.productName')" align="center" prop="productName" />
<el-table-column :label="$t('searchViewInJobFlow.spec')" align="center" prop="spec" />
<!-- <el-table-column :label="$t('searchViewInJobFlow.cargoNo')" align="center" prop="cargoNo" />-->
<el-table-column :label="$t('searchViewInJobFlow.unit')" align="center" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewInJobFlow.inQuantity')" align="right" prop="inQuantity" />
<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.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" />
<el-table-column :label="$t('searchViewInJobFlow.spec')" align="left" prop="spec" />
<el-table-column :label="$t('searchViewInJobFlow.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->

92
ruoyi-ui/src/views/search/ViewOutJobFlow/index.vue
View File

@@ -314,70 +314,58 @@
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobId')" align="center" prop="jobId"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobDetailId')" align="center" prop="jobDetailId"/>
<el-table-column :label="$t('searchViewOutJobFlow.status')" align="center" prop="status">
<el-table-column :label="$t('searchViewOutJobFlow.jobId')" align="left" prop="jobId"/>
<el-table-column :label="$t('searchViewOutJobFlow.jobDetailId')" align="left" prop="jobDetailId"/>
<el-table-column :label="$t('searchViewOutJobFlow.status')" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.taskNo')" align="center" prop="taskNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.trayCode')" align="center" prop="trayCode"/>
<el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="center" prop="roadwayId"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceId')" align="center" prop="cargoSpaceId"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceName')" align="center" prop="cargoSpaceName"/>
<el-table-column :label="$t('searchViewOutJobFlow.thePlatoon')" align="center" prop="thePlatoon"/>
<el-table-column :label="$t('searchViewOutJobFlow.theColumn')" align="center" prop="theColumn"/>
<el-table-column :label="$t('searchViewOutJobFlow.theFloor')" align="center" prop="theFloor"/>
<el-table-column :label="$t('searchViewOutJobFlow.priority')" align="center" prop="priority"/>
<el-table-column :label="$t('searchViewOutJobFlow.executionPhase')" align="center" prop="executionPhase">
<el-table-column :label="$t('searchViewOutJobFlow.taskNo')" align="left" prop="taskNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.trayCode')" align="left" prop="trayCode"/>
<el-table-column :label="$t('searchViewOutJobFlow.roadwayId')" align="left" prop="roadwayId"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceId')" align="left" prop="cargoSpaceId"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoSpaceName')" align="left" prop="cargoSpaceName"/>
<el-table-column :label="$t('searchViewOutJobFlow.thePlatoon')" align="left" prop="thePlatoon"/>
<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">
<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="center" prop="inOrOut"/>
<el-table-column :label="$t('searchViewOutJobFlow.exitId')" align="center" prop="exitId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productId')" align="center" prop="productId"/>
<el-table-column :label="$t('searchViewOutJobFlow.lotNo')" align="center" prop="lotNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="center" prop="stackingId"/>
<el-table-column :label="$t('searchViewOutJobFlow.stockStatus')" align="center" prop="stockStatus">
<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"/>
<el-table-column :label="$t('searchViewOutJobFlow.stackingId')" align="left" prop="stackingId"/>
<el-table-column :label="$t('searchViewOutJobFlow.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('searchViewOutJobFlow.outQuantity')" align="center" prop="outQuantity"/>
<el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="center" prop="giveNum"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutId')" align="center" prop="inOrOutId"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutDId')" align="center" prop="inOrOutDId"/>
<el-table-column :label="$t('searchViewOutJobFlow.createTime')" align="center" prop="createTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.startTime')" align="center" prop="startTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.finishTime')" align="center" prop="finishTime" width="180">
<!-- <template slot-scope="scope">-->
<!-- <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>-->
</el-table-column>
<el-table-column :label="$t('searchViewOutJobFlow.warehouseId')" align="center" prop="warehouseId"/>
<el-table-column :label="$t('searchViewOutJobFlow.productName')" align="center" prop="productName"/>
<el-table-column :label="$t('searchViewOutJobFlow.spec')" align="center" prop="spec"/>
<el-table-column :label="$t('searchViewOutJobFlow.cargoNo')" align="center" prop="cargoNo"/>
<el-table-column :label="$t('searchViewOutJobFlow.unit')" align="center" prop="unit"/>
<el-table-column :label="$t('searchViewOutJobFlow.customerName')" align="center" prop="customerName"/>
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewOutJobFlow.outQuantity')" align="right" prop="outQuantity"/>
<el-table-column :label="$t('searchViewOutJobFlow.giveNum')" align="right" prop="giveNum"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutId')" align="left" prop="inOrOutId"/>
<el-table-column :label="$t('searchViewOutJobFlow.inOrOutDId')" align="left" prop="inOrOutDId"/>
<el-table-column :label="$t('searchViewOutJobFlow.createTime')" align="left" prop="createTime" width="180"/>
<el-table-column :label="$t('searchViewOutJobFlow.startTime')" align="left" prop="startTime" width="180"/>
<el-table-column :label="$t('searchViewOutJobFlow.finishTime')" align="left" prop="finishTime" width="180"/>
<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.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" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" /> <!-- 描述 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

53
ruoyi-ui/src/views/search/ViewStockDetail/index.vue
View File

@@ -241,50 +241,47 @@
<el-table v-loading="loading" :data="ViewStockDetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="id" align="center" prop="onlyIdentity" />-->
<el-table-column :label="$t('searchViewStockDetail.stockId')" align="center" prop="stockId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceId')" align="center" prop="cargoSpaceId" />
<el-table-column :label="$t('searchViewStockDetail.trayCode')" align="center" prop="trayCode" />
<el-table-column :label="$t('searchViewStockDetail.quantity')" align="center" prop="quantity" />
<el-table-column :label="$t('searchViewStockDetail.jobId')" align="center" prop="jobId" />
<!-- <el-table-column :label="$t('searchViewStockDetail.lotNo')" align="center" prop="lotNo" />-->
<el-table-column :label="$t('searchViewStockDetail.stockinDetailId')" align="center" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockDetail.inDate')" align="center" prop="inDate" />
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="center" prop="warehouseName" />
<!-- <el-table-column :label="$t('searchViewStockDetail.stackingId')" align="center" prop="stackingId" />-->
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceName')" align="center" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewStockDetail.roadwayId')" align="center" prop="roadwayId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
<el-table-column :label="$t('searchViewStockDetail.stockId')" align="left" prop="stockId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceId')" align="left" prop="cargoSpaceId" />
<el-table-column :label="$t('searchViewStockDetail.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('searchViewStockDetail.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockDetail.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewStockDetail.stockinDetailId')" align="left" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockDetail.inDate')" align="left" prop="inDate" />
<el-table-column :label="$t('searchViewStockDetail.warehouseId')" align="left" prop="warehouseName" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewStockDetail.roadwayId')" align="left" prop="roadwayId" />
<el-table-column :label="$t('searchViewStockDetail.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockDetail.stockStatus')" align="center" prop="stockStatus" >
<el-table-column :label="$t('searchViewStockDetail.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('searchViewStockDetail.productStatus')" align="center" prop="productStatus" >
<el-table-column :label="$t('searchViewStockDetail.productStatus')" align="left" 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('searchViewStockDetail.locked')" align="center" prop="locked" >
<el-table-column :label="$t('searchViewStockDetail.locked')" align="left" 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('searchViewStockDetail.productId')" align="center" prop="productId" />
<el-table-column :label="$t('searchViewStockDetail.productName')" align="center" prop="productName" />
<!-- <el-table-column :label="$t('searchViewStockDetail.spec')" align="center" prop="spec" />-->
<el-table-column :label="$t('searchViewStockDetail.unit')" align="center" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewStockDetail.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockDetail.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockDetail.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

46
ruoyi-ui/src/views/search/ViewStockSecure/index.vue
View File

@@ -159,42 +159,42 @@
<el-table v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<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.stockId')" align="left" prop="stockId" />
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="left" prop="cargoSpaceId" />
<el-table-column :label="$t('searchViewStockSecure.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('searchViewStockSecure.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="left" 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" /> <!-- 批次号 -->
<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.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.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.lotNo')" align="left" prop="lotNo" />
<el-table-column :label="$t('searchViewStockSecure.inDate')" align="left" prop="inDate" />
<el-table-column :label="$t('searchViewStockSecure.backDate')" align="left" prop="backDate" />
<el-table-column :label="$t('searchViewStockSecure.productGuid')" align="left" prop="productGuid" />
<el-table-column :label="$t('searchViewStockSecure.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockSecure.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewStockSecure.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('searchViewStockSecure.outQuantity')" align="right" prop="outQuantity" />
<el-table-column :label="$t('searchViewStockSecure.stockinDetailId')" align="left" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockSecure.stockinId')" align="left" prop="stockinId" />
<el-table-column :label="$t('searchViewStockSecure.inType')" align="left" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
<!-- <el-table-column :label="$t('searchViewStockSecure.operation')" align="center" class-name="small-padding fixed-width"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

75
ruoyi-ui/src/views/search/ViewStockWarning/index.vue
View File

@@ -163,65 +163,58 @@
<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.stockId')" align="left" prop="stockId" />
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceId')" align="left" prop="cargoSpaceId" />
<el-table-column :label="$t('searchViewStockWarning.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('searchViewStockWarning.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<el-table-column :label="$t('searchViewStockWarning.productStatus')" align="left" 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('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批次号 &ndash;&gt;-->
<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.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.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('searchViewStockWarning.inType')" align="center" prop="inType"> <!-- 入库类型 -->
<el-table-column :label="$t('searchViewStockWarning.inDate')" align="left" prop="inDate" />
<el-table-column :label="$t('searchViewStockWarning.backDate')" align="left" prop="backDate" />
<el-table-column :label="$t('searchViewStockWarning.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockWarning.jobId')" align="left" prop="jobId" />
<el-table-column :label="$t('searchViewStockWarning.trayCode')" align="left" prop="trayCode" />
<el-table-column :label="$t('searchViewStockWarning.outQuantity')" align="right" prop="outQuantity" />
<el-table-column :label="$t('searchViewStockWarning.stockinId')" align="left" prop="stockinId" />
<el-table-column :label="$t('searchViewStockWarning.inType')" align="left" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<!-- <el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<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.warehouseType')" align="center" prop="warehouseType" /> <!-- 仓库类型 -->
<el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="center" prop="isCurrent" /> <!-- 是否可用 -->
<el-table-column :label="$t('searchViewStockWarning.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<!-- <el-table-column :label="$t('searchViewStockWarning.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<!-- <el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> &lt;!&ndash; 货区ID &ndash;&gt;-->
<!-- <el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> &lt;!&ndash; 货位类型 &ndash;&gt;-->
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" >
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewStockWarning.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockWarning.warehouseName')" align="left" prop="warehouseName" />
<el-table-column :label="$t('searchViewStockWarning.warehouseType')" align="left" prop="warehouseType" />
<el-table-column :label="$t('searchViewStockWarning.isCurrent')" align="left" prop="isCurrent" />
<el-table-column :label="$t('searchViewStockWarning.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="left" prop="cargoSpaceName" />
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="left" 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('searchViewStockWarning.locked')" align="center" prop="locked" >
</el-table-column>
<el-table-column :label="$t('searchViewStockWarning.locked')" align="left" 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('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<!-- <el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> &lt;!&ndash; 是否双伸 &ndash;&gt;-->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockWarning.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
</el-table-column>
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="right" prop="cargoHight" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('searchViewStockWarning.cargoNo')" align="left" prop="cargoNo" />
<el-table-column :label="$t('searchViewStockWarning.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
</el-table>
<pagination

84
ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
View File

@@ -299,64 +299,64 @@
<el-table v-loading="loading" :data="ViewStockinHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="入库单guid" align="center" prop="stockinGuid" />-->
<el-table-column :label="$t('searchViewStockinHistory.stockinId')" align="center" prop="stockinId" />
<el-table-column :label="$t('searchViewStockinHistory.inType')" align="center" prop="inType">
<el-table-column :label="$t('searchViewStockinHistory.stockinId')" align="left" prop="stockinId" />
<el-table-column :label="$t('searchViewStockinHistory.inType')" align="left" 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('searchViewStockinHistory.createDate')" align="center" prop="createDate" />
<el-table-column :label="$t('searchViewStockinHistory.createManId')" align="center" prop="createManId" />
<el-table-column :label="$t('searchViewStockinHistory.status')" align="center" prop="status">
<el-table-column :label="$t('searchViewStockinHistory.createDate')" align="left" prop="createDate" />
<el-table-column :label="$t('searchViewStockinHistory.createManId')" align="left" prop="createManId" />
<el-table-column :label="$t('searchViewStockinHistory.status')" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockinHistory.warehouseId')" align="center" prop="warehouseId" />
<el-table-column :label="$t('searchViewStockinHistory.finishDate')" align="center" prop="finishDate" />
<el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="center" prop="erpBill" />
<el-table-column :label="$t('searchViewStockinHistory.stockSource')" align="center" prop="stockSource" />
<el-table-column :label="$t('searchViewStockinHistory.departmentNo')" align="center" prop="departmentNo" />
<el-table-column :label="$t('searchViewStockinHistory.classNo')" align="center" prop="classNo" />
<el-table-column :label="$t('searchViewStockinHistory.supplierNo')" align="center" prop="supplierNo" />
<el-table-column :label="$t('searchViewStockinHistory.supplierName')" align="center" prop="supplierName" />
<el-table-column :label="$t('searchViewStockinHistory.simpleName')" align="center" prop="simpleName" />
<el-table-column :label="$t('searchViewStockinHistory.contactName')" align="center" prop="contactName" />
<el-table-column :label="$t('searchViewStockinHistory.contactNumber')" align="center" prop="contactNumber" />
<el-table-column :label="$t('searchViewStockinHistory.address')" align="center" prop="address" />
<el-table-column :label="$t('searchViewStockinHistory.stockinDetailId')" align="center" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="center" prop="lotNo" />
<el-table-column :label="$t('searchViewStockinHistory.quantity')" align="center" prop="quantity" />
<el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="center" prop="quantityX" />
<el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="center" prop="quantityJ" />
<el-table-column :label="$t('searchViewStockinHistory.assignNum')" align="center" prop="assignNum" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="center" prop="assignNumX" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="center" prop="assignNumJ" />
<el-table-column :label="$t('searchViewStockinHistory.scanNum')" align="center" prop="scanNum" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="center" prop="scanNumX" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="center" prop="scanNumJ" />
<el-table-column :label="$t('searchViewStockinHistory.printDate')" align="center" prop="printDate" width="180">
<el-table-column :label="$t('searchViewStockinHistory.warehouseId')" align="left" prop="warehouseId" />
<el-table-column :label="$t('searchViewStockinHistory.finishDate')" align="left" prop="finishDate" />
<el-table-column :label="$t('searchViewStockinHistory.erpBill')" align="left" prop="erpBill" />
<el-table-column :label="$t('searchViewStockinHistory.stockSource')" align="left" prop="stockSource" />
<el-table-column :label="$t('searchViewStockinHistory.departmentNo')" align="left" prop="departmentNo" />
<el-table-column :label="$t('searchViewStockinHistory.classNo')" align="left" prop="classNo" />
<el-table-column :label="$t('searchViewStockinHistory.supplierNo')" align="left" prop="supplierNo" />
<el-table-column :label="$t('searchViewStockinHistory.supplierName')" align="left" prop="supplierName" />
<el-table-column :label="$t('searchViewStockinHistory.simpleName')" align="left" prop="simpleName" />
<el-table-column :label="$t('searchViewStockinHistory.contactName')" align="left" prop="contactName" />
<el-table-column :label="$t('searchViewStockinHistory.contactNumber')" align="left" prop="contactNumber" />
<el-table-column :label="$t('searchViewStockinHistory.address')" align="left" prop="address" />
<el-table-column :label="$t('searchViewStockinHistory.stockinDetailId')" align="left" prop="stockinDetailId" />
<el-table-column :label="$t('searchViewStockinHistory.lotNo')" align="left" prop="lotNo" />
<el-table-column :label="$t('searchViewStockinHistory.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockinHistory.quantityX')" align="right" prop="quantityX" />
<el-table-column :label="$t('searchViewStockinHistory.quantityJ')" align="right" prop="quantityJ" />
<el-table-column :label="$t('searchViewStockinHistory.assignNum')" align="right" prop="assignNum" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumX')" align="right" prop="assignNumX" />
<el-table-column :label="$t('searchViewStockinHistory.assignNumJ')" align="right" prop="assignNumJ" />
<el-table-column :label="$t('searchViewStockinHistory.scanNum')" align="right" prop="scanNum" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumX')" align="right" prop="scanNumX" />
<el-table-column :label="$t('searchViewStockinHistory.scanNumJ')" align="right" prop="scanNumJ" />
<el-table-column :label="$t('searchViewStockinHistory.printDate')" align="left" prop="printDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="center" prop="stockStatus">
<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="center" prop="productId" />
<el-table-column :label="$t('searchViewStockinHistory.productName')" align="center" prop="productName" />
<el-table-column :label="$t('searchViewStockinHistory.unit')" align="center" prop="unit" />
<el-table-column :label="$t('searchViewStockinHistory.spec')" align="center" prop="spec" />
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<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" />
<el-table-column :label="$t('searchViewStockinHistory.spec')" align="left" prop="spec" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

61
ruoyi-ui/src/views/search/ViewStockoutHistory/index.vue
View File

@@ -229,46 +229,27 @@
<el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" prop="stockoutId" :label="$t('searchViewStockoutHistory.stockoutId')" /> <!-- 出库单号 -->
<el-table-column label="warehouseId" align="center" prop="warehouseId" /> <!-- 出库单号 -->
<el-table-column :label="$t('searchViewStockoutHistory.outType')" align="center" prop="outType"> <!-- 出库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockoutHistory.createDate')" align="center" prop="createDate" width="180"> <!-- 创建日期 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockoutHistory.createManId')" align="center" prop="createManId" /> <!-- 创建人ID -->
<el-table-column :label="$t('searchViewStockoutHistory.status')" align="center" prop="status"> <!-- 出库状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('searchViewStockoutHistory.stockoutSource')" align="center" prop="stockoutSource" /> <!-- 出库来源 -->
<el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="center" prop="exitId" /> <!-- 出口类型 -->
<el-table-column :label="$t('searchViewStockoutHistory.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库明细ID -->
<el-table-column :label="$t('searchViewStockoutHistory.productId')" align="center" prop="productId" /> <!-- 产品ID -->
<el-table-column :label="$t('searchViewStockoutHistory.productName')" align="center" prop="productName" /> <!-- 产品名称 -->
<el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('searchViewStockoutHistory.quantity')" align="center" prop="quantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('searchViewStockoutHistory.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="$t('searchViewStockoutHistory.assignNum')" align="center" prop="assignNum" /> <!-- 分配编号 -->
<el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="center" prop="erpStockoutId" /> <!-- ERP出库单ID -->
<el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="center" prop="entryid" /> <!-- 客户编号 -->
<el-table-column :label="$t('searchViewStockoutHistory.customerName')" align="center" prop="customerName" /> <!-- 客户名称 -->
<el-table-column :label="$t('searchViewStockoutHistory.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewStockoutHistory.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('basproduct1.englishName')" align="center" prop="spare1" /><!-- 英文名称 -->
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="center" prop="spare2" /><!-- 单件净重 -->
<el-table-column :label="$t('basproduct1.long')" align="center" prop="spare5" /><!-- 长MM -->
<el-table-column :label="$t('basproduct1.wide')" align="center" prop="spare6" /><!-- 宽MM -->
<el-table-column :label="$t('basproduct1.tall')" align="center" prop="spare7" /><!-- 高MM -->
<el-table-column :label="$t('basproduct1.volume')" align="center" prop="spare8" /><!-- 体积m³ -->
<el-table-column :label="$t('basproduct1.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('basproduct1.notes')" align="center" prop="remark" /> <!-- 描述 -->
<el-table-column :label="$t('searchViewStockoutHistory.exitId')" align="left" prop="exitId" />
<el-table-column :label="$t('searchViewStockoutHistory.stockoutDetailId')" align="left" prop="stockoutDetailId" />
<el-table-column :label="$t('searchViewStockoutHistory.productId')" align="left" prop="productId" />
<el-table-column :label="$t('searchViewStockoutHistory.productName')" align="left" prop="productName" />
<el-table-column :label="$t('searchViewStockoutHistory.lotNo')" align="left" prop="lotNo" />
<el-table-column :label="$t('searchViewStockoutHistory.quantity')" align="right" prop="quantity" />
<el-table-column :label="$t('searchViewStockoutHistory.allotQuantity')" align="right" prop="allotQuantity" />
<el-table-column :label="$t('searchViewStockoutHistory.assignNum')" align="right" prop="assignNum" />
<el-table-column :label="$t('searchViewStockoutHistory.erpStockoutId')" align="left" prop="erpStockoutId" />
<el-table-column :label="$t('searchViewStockoutHistory.entryid')" align="left" prop="entryid" />
<el-table-column :label="$t('searchViewStockoutHistory.customerName')" align="left" prop="customerName" />
<el-table-column :label="$t('searchViewStockoutHistory.spec')" align="left" prop="spec" />
<el-table-column :label="$t('searchViewStockoutHistory.unit')" align="left" prop="unit" />
<el-table-column :label="$t('basproduct1.englishName')" align="left" prop="spare1" />
<el-table-column :label="$t('basproduct1.netWeightPerUnit')" align="right" width="120" prop="spare2" />
<el-table-column :label="$t('basproduct1.long')" align="right" prop="spare5" />
<el-table-column :label="$t('basproduct1.wide')" align="right" prop="spare6" />
<el-table-column :label="$t('basproduct1.tall')" align="right" prop="spare7" />
<el-table-column :label="$t('basproduct1.volume')" align="right" prop="spare8" />
<el-table-column :label="$t('basproduct1.price')" align="right" prop="price" />
<el-table-column :label="$t('basproduct1.notes')" align="left" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->

37
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -49,7 +49,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- :placeholder="$t('stockFreeze.inputLotNo')"-->
@@ -57,7 +57,7 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.method')" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.method')" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.method"-->
<!-- :placeholder="$t('stockFreeze.inputMethod')"-->
@@ -75,7 +75,7 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> &lt;!&ndash; 库存字表id &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.stockDetailId"-->
<!-- :placeholder="$t('stockFreeze.inputStockDetailId')"-->
@@ -83,7 +83,7 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> &lt;!&ndash; 操作目标 &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.operatingTarget"-->
<!-- :placeholder="$t('stockFreeze.inputOperatingTarget')"-->
@@ -91,7 +91,7 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.barCodeOldQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"-->
@@ -99,7 +99,7 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;
<!-- <el-input-->
<!-- v-model="queryParams.barCodeQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeQuantity')"-->
@@ -170,31 +170,22 @@
<el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('stockFreeze.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> &lt;!&ndash; 物品编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> &lt;!&ndash; 物品名称 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.oldStatus')" align="center" prop="oldStatus" >
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('stockFreeze.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockFreeze.oldStatus')" align="left" prop="oldStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.oldStatus"/>
</template>
</el-table-column><!-- 原库位状态 -->
<el-table-column :label="$t('stockFreeze.currStatus')" align="center" prop="currStatus" >
<el-table-column :label="$t('stockFreeze.currStatus')" align="left" prop="currStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.currStatus"/>
</template>
</el-table-column><!-- 现库位状态 -->
<el-table-column :label="$t('stockFreeze.method')" align="center" prop="method" /> <!-- 操作 -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.method')" align="left" prop="method" /> <!-- 操作 -->
<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"> <!-- 操作 -->
<template slot-scope="scope">
<el-button

56
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -249,49 +249,45 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus" ><!-- 库存状态 -->
<el-table-column :label="$t('stockManagement.stockId')" align="left" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.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('stockManagement.cargoSpaceStockStatus')" align="center" prop="cargoSpaceStockStatus"> <!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.cargoSpaceStockStatus')" align="left" prop="cargoSpaceStockStatus"> <!-- 货位状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" ><!--货位状态-->
<el-table-column :label="$t('stockManagement.cargoSpaceStatus')" align="left" prop="cargoSpaceStatus" ><!--货位状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<el-table-column :label="$t('stockManagement.productStatus')" align="left" width="120" 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('stockManagement.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<!-- <el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<!-- <el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="left" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="left" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="left" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="right" prop="extraField.netWeight" width="120" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="right" prop="extraField.length" width="100"/> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="right" prop="extraField.width" width="100"/> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="right" prop="extraField.height" width="100"/> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="right" prop="extraField.volume" width="100"/> <!-- 体积 -->
<el-table-column :label="$t('stockManagement.quantity')" align="right" prop="quantity" width="100"/> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.inType')" align="left" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -546,3 +542,9 @@ export default {
}
}
</script>
<style>
.no-wrap {
white-space: nowrap;
}
</style>

29
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -188,28 +188,21 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockRecord.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockRecord.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockRecord.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<!-- <el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column :label="$t('stockRecord.quantity')" align="center" prop="quantity" /> <!-- 操作后数量 -->
<el-table-column :label="$t('stockRecord.method')" align="center" prop="method"> <!-- 操作 -->
<el-table-column :label="$t('stockRecord.stockId')" align="left" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceId')" align="left" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceName')" align="left" prop="cargoSpaceName" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockRecord.productId')" align="left" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockRecord.productName')" align="left" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockRecord.oldQuantity')" align="right" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column :label="$t('stockRecord.quantity')" align="right" prop="quantity" /> <!-- 操作后数量 -->
<el-table-column :label="$t('stockRecord.method')" align="left" prop="method"> <!-- 操作 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
</template>
</el-table-column>
<el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column :label="$t('stockRecord.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.createTime')" align="left" prop="createTime" /> <!-- 创建时间 -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button