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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
猫猫guowen
2025-06-18 17:52:46 +08:00
parent a53e2ef0c0 17b1f210c7
commit e738779974
5 changed files with 424 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
ruoyi-ui/src/lang/en.js
View File

@@ -985,7 +985,7 @@ export default {
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
createTime: '创建时间',
createTime: 'CreateTime',
},
menu: {
//收货单据新增
@@ -995,19 +995,50 @@ export default {
ManagementOfInboundDocuments: "ManagementOfInboundDocuments",
InboundTaskManagement: "InboundTaskManagement",
//********************基础信息********************
//容器管理
ContainerManagement: 'ContainerManagement',
//********************仓库管理********************
//********************基础信息:仓库管理********************
WarehouseManagement: 'WarehouseManagement',
//仓库（库区）管理
WarehouseAreaManagement: 'WarehouseManagement',
//货位管理
CargoSpaceManagement: 'CargoSpaceManagement',
//********************出库管理********************
outboundManagement: 'outboundManagement',
createNewOutboundDocument: 'createNewOutboundDocument',
outboundDocumentManagement: 'outboundDocumentManagement',
outboundTaskManagement: 'outboundTaskManagement',
//********************KPI分析********************
KPIAnalysis: 'KPI Analysis',
// 入库分析
KPIAnalysis_StockIn: 'StockIn Analysis',
// 出库分析
KPIAnalysis_StockOut: 'StockOut Analysis',
// 巷道分布
KPIAnalysis_Roadway: 'Roadway Distribution',
// 货位分析
KPIAnalysis_CargoSpace: 'Cargo Analysis',
// 库存平面图
KPIAnalysis_CargoPlan: 'Cargo Plan',
//********************系统监控********************
SystemMonitor: 'SystemMonitor',
// 在线用户
SystemMonitor_Online: 'Online',
// 定时任务
SystemMonitor_ScheduledTask: 'ScheduledTask',
// 数据监控
SystemMonitor_DataMonitor: 'DataMonitor',
//服务监控
SystemMonitor_ServiceMonitor: 'ServiceMonitor',
//缓存监控
SystemMonitor_CacheMonitor: 'CacheMonitor',
//缓存列表
SystemMonitor_CacheList: 'CacheList',
//********************系统管理********************
SystemManagement: 'SystemManagement',
@@ -1034,33 +1065,6 @@ export default {
//登录日志
LogManagement_LoginLog: 'LoginLog',
//********************系统监控********************
SystemMonitor: 'SystemMonitor',
// 在线用户
SystemMonitor_Online: 'Online',
// 定时任务
SystemMonitor_ScheduledTask: 'ScheduledTask',
// 数据监控
SystemMonitor_DataMonitor: 'DataMonitor',
//服务监控
SystemMonitor_ServiceMonitor: 'ServiceMonitor',
//缓存监控
SystemMonitor_CacheMonitor: 'CacheMonitor',
//缓存列表
SystemMonitor_CacheList: 'CacheList',
//********************KPI分析********************
KPIAnalysis: 'KPI Analysis',
// 入库分析
KPIAnalysis_StockIn: 'StockIn Analysis',
// 出库分析
KPIAnalysis_StockOut: 'StockOut Analysis',
// 巷道分布
KPIAnalysis_Roadway: 'Roadway Distribution',
// 货位分析
KPIAnalysis_CargoSpace: 'Cargo Analysis',
// 库存平面图
KPIAnalysis_CargoPlan: 'Cargo Plan',
// ****************盘点管理******************
@@ -1236,6 +1240,89 @@ export default {
},
//=====================基础信息:容器管理=====================
bas_ContainerManagement: {
//--------------标题--------------
addContainerItem: 'Add Container Item',
editContainerItem: 'Edit Container Item',
//--------------子页面标题--------------
addContainerDetailsItem: 'Add ContainerDetails Item',
editContainerDetailsItem: 'Edit ContainerDetails Item',
//--------------字段名--------------
containerId: 'ContainerId',
portName: 'PortName',
status: 'Status',
productTypeQuantity: 'TypeQuantity',
capacity: 'Capacity',
createTime: 'CreateTime',
updateTime: 'UpdateTime',
operationMan: 'Operationer',
operation: 'Operation',
//--------------子页面字段--------------
id: 'Id',
productId: 'ProductId',
productName: 'ProductName',
quantity: 'Quantity',
unit: 'Unit',
//--------------文本框输入提示--------------
placeholderContainerId: 'Enter ContainerId',
placeholderPortName: 'Select PortName',
placeholderStatus: 'Select Status',
placeholderProductTypeQuantity: 'Enter TypeQuantity',
placeholderCapacity: 'Capacity',
placeholderOperationMan: 'Operationer',
//--------------子页面输入提示--------------
placeholderProductId: 'Enter ProductId',
placeholderProductName: 'Enter ProductName',
placeholderQuantity: 'Enter Quantity',
placeholderUnit: 'Enter Unit',
//--------------交互按钮--------------
btnSearch: 'Search',
btnReset: 'Reset',
btnAdd: 'Add',
btnEdit: 'Edit',
btnDelete: 'Delete',
btnSave: 'Save',
btnExport: 'Export',
btnImport: 'Import',
btnSubmit: 'Submit',
btnConfirm: 'Confirm',
btnCancel: 'Cancel',
btnClose: 'Close',
btnRemark: 'Remark',
btnAddOrBinding: 'Add/Binding',
btnDeleteOrUnbinding: 'Delete/Unbinding',
btnDetails:'Details',
//--------------交互文本--------------
//--------------提示信息--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
//---getList---
textErrorForGetPortName: 'Failed to get PortName!',
textErrorForRequestException: 'Request exception and check the network',
//---handleDelete---
textDeleteConfirm1: 'Are you sure to delete the data item with ContainerId "',
textDeleteConfirm2: '"?',
//---子页面---
textDeleteDetailsConfirm1: 'Are you sure to delete the data item with Id "',
textDeleteDetailsConfirm2: '"?',
//--------------其他--------------
lblWidthSearch: '100px',
lblWidthDialog: '110px',
},
//=====================系统管理：用户管理=====================
systemManagement_UserManagement: {
//--------------数据表标题--------------
@@ -1600,7 +1687,7 @@ export default {
MainTitle: 'MainTitle',
//---函数：handleDelete---
textDeleteConfirm1: 'Are you sure to delete the data item with menu name "',
textDeleteConfirm1: 'Are you sure to delete the data item with MenuName "',
textDeleteConfirm2: '"?',
//--------------操作提示--------------

146
ruoyi-ui/src/lang/zh.js
View File

@@ -1,6 +1,7 @@
// import "core-js/fn/symbol";
// import { assign } from 'core-js/core/object'
import 'core-js/features/symbol'
import { status } from 'nprogress'
// import { Dialog } from 'element-ui'
export default {
@@ -814,7 +815,7 @@ export default {
priceRequired: '价格不能为空'
},
// *************供应商管理***************
// *************基础信息：供应商管理***************
BasPort: {
portName: '点位名称',
inputPortName: '请输入点位名称',
@@ -1004,6 +1005,9 @@ export default {
ManagementOfInboundDocuments: "入库单据管理",
InboundTaskManagement: "入库作业管理",
//********************基础信息********************
//容器管理
ContainerManagement: '容器管理',
//********************仓库管理********************
WarehouseManagement: '仓库管理',
@@ -1011,12 +1015,41 @@ export default {
WarehouseAreaManagement: '库区管理',
//货位管理
CargoSpaceManagement: '货位管理',
//********************出库管理********************
outboundManagement: '出库管理',
createNewOutboundDocument: '新建出库单据',
outboundDocumentManagement: '出库单据管理',
outboundTaskManagement: '出库作业管理',
//********************KPI分析********************
KPIAnalysis: 'KPI分析',
// 入库分析
KPIAnalysis_StockIn: '入库分析',
// 出库分析
KPIAnalysis_StockOut: '出库分析',
// 巷道分布
KPIAnalysis_Roadway: '巷道分布',
// 货位分析
KPIAnalysis_CargoSpace: '货位分析',
// 库存平面图
KPIAnalysis_CargoPlan: '库存平面图',
//********************系统监控********************
SystemMonitor: '系统监控',
// 在线用户
SystemMonitor_Online: '在线用户',
// 定时任务
SystemMonitor_ScheduledTask: '定时任务',
// 数据监控
SystemMonitor_DataMonitor: '数据监控',
// 服务监控
SystemMonitor_ServiceMonitor: '服务监控',
// 缓存监控
SystemMonitor_CacheMonitor: '缓存监控',
// 缓存列表
SystemMonitor_CacheList: '缓存列表',
//********************系统管理********************
SystemManagement: '系统管理',
//用户管理
@@ -1042,34 +1075,6 @@ export default {
//登录日志
LogManagement_LoginLog: '操作日志',
//********************系统监控********************
SystemMonitor: '系统监控',
// 在线用户
SystemMonitor_Online: '在线用户',
// 定时任务
SystemMonitor_ScheduledTask: '定时任务',
// 数据监控
SystemMonitor_DataMonitor: '数据监控',
// 服务监控
SystemMonitor_ServiceMonitor: '服务监控',
// 缓存监控
SystemMonitor_CacheMonitor: '缓存监控',
// 缓存列表
SystemMonitor_CacheList: '缓存列表',
//********************KPI分析********************
KPIAnalysis: 'KPI分析',
// 入库分析
KPIAnalysis_StockIn: '入库分析',
// 出库分析
KPIAnalysis_StockOut: '出库分析',
// 巷道分布
KPIAnalysis_Roadway: '巷道分布',
// 货位分析
KPIAnalysis_CargoSpace: '货位分析',
// 库存平面图
KPIAnalysis_CargoPlan: '库存平面图',
// ****************盘点管理******************
inventoryManagement: '盘点管理',
@@ -1245,6 +1250,89 @@ export default {
lockedIsNull: '是否可用不能为空',
},
//=====================基础信息:容器管理=====================
bas_ContainerManagement: {
//--------------标题--------------
addContainerItem: '添加容器管理',
editContainerItem: '修改容器管理',
//--------------子页面标题--------------
addContainerDetailsItem: '添加容器明细',
editContainerDetailsItem: '修改容器明细',
//--------------字段名--------------
containerId: '容器编号',
portName: '点位名称',
status: '容器状态',
productTypeQuantity: '物料种类',
capacity: '容量',
createTime: '创建时间',
updateTime: '更新时间',
operationMan: '操作人',
operation: '人工操作',
//--------------子页面字段--------------
id: '序号',
productId: '物料编码',
productName: '物料名称',
quantity: '数量',
unit: '单位',
//--------------文本框输入提示--------------
placeholderContainerId: '请输入容器编号',
placeholderPortName: '请选择点位名称',
placeholderStatus: '请选择容器状态',
placeholderProductTypeQuantity: '请输入物料种类',
placeholderCapacity: '请选择料架容量',
placeholderOperationMan: '请输入操作人',
//--------------子页面输入提示--------------
placeholderProductId: '请输入物料编码',
placeholderProductName: '请输入物料名称',
placeholderQuantity: '请输入数量',
placeholderUnit: '请输入单位',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnExport: '导出',
btnImport: '导入',
btnSubmit: '提交',
btnConfirm: '确定',
btnCancel: '取消',
btnClose: '关闭',
btnRemark: '备注',
btnAddOrBinding: '新增/绑定',
btnDeleteOrUnbinding: '删除/解绑',
btnDetails:'详情',
//--------------交互文本--------------
//--------------提示信息--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
//---getList---
textErrorForGetPortName: '获取点位名称失败！',
textErrorForRequestException: '请求异常，请检查网络！',
//---handleDelete---
textDeleteConfirm1: '是否确认删除容器管理编号为"',
textDeleteConfirm2: '"的数据项？',
//---子页面---
textDeleteDetailsConfirm1: '是否确认删除容器物料明细编号为"',
textDeleteDetailsConfirm2: '"的数据项？',
//--------------其他--------------
lblWidthSearch: '68px',
lblWidthDialog: '80px',
},
//=====================系统管理:用户管理=====================
systemManagement_UserManagement: {
//--------------数据表标题--------------

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

@@ -1,16 +1,18 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="容器编号" prop="containerId">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="$t('bas_ContainerManagement.lblWidthSearch')">
<!-- 容器编号 -->
<el-form-item :label="$t('bas_ContainerManagement.containerId')" prop="containerId">
<el-input
v-model="queryParams.containerId"
placeholder="请输入容器编号"
:placeholder="$t('bas_ContainerManagement.placeholderContainerId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="点位名称" prop="portName">
<el-select v-model="queryParams.portName" placeholder="请选择点位名称" clearable>
<!-- 点位名称 -->
<el-form-item :label="$t('bas_ContainerManagement.portName')" prop="portName">
<el-select v-model="queryParams.portName" :placeholder="$t('bas_ContainerManagement.placeholderPortName')" clearable>
<el-option
v-for="(item, index) in portNameOptions"
:key="index"
@@ -19,30 +21,35 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料种类" prop="productTypeQuantity">
<!-- 物料种类 -->
<el-form-item :label="$t('bas_ContainerManagement.productTypeQuantity')" prop="productTypeQuantity">
<el-input
v-model="queryParams.productTypeQuantity"
placeholder="请输入物料种类"
:placeholder="$t('bas_ContainerManagement.placeholderProductTypeQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人" prop="operationMan">
<!-- 操作人 -->
<el-form-item :label="$t('bas_ContainerManagement.operationMan')" prop="operationMan">
<el-input
v-model="queryParams.operationMan"
placeholder="请输入操作人"
:placeholder="$t('bas_ContainerManagement.placeholderOperationMan')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<!-- 【搜索】按钮 -->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('bas_ContainerManagement.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('bas_ContainerManagement.btnReset') }}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- 【新增/绑定】按钮 -->
<el-button
type="primary"
plain
@@ -50,9 +57,10 @@
size="mini"
@click="handleAdd"
v-hasPermi="['bas:container:add']"
>新增/绑定</el-button>
>{{ $t('bas_ContainerManagement.btnAddOrBinding') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【修改】按钮 -->
<el-button
type="success"
plain
@@ -61,9 +69,10 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['bas:container:edit']"
>修改</el-button>
>{{ $t('bas_ContainerManagement.btnEdit') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【删除/解绑】按钮 -->
<el-button
type="danger"
plain
@@ -72,8 +81,9 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['bas:container:remove']"
>删除/解绑</el-button>
>{{ $t('bas_ContainerManagement.btnDeleteOrUnbinding') }}</el-button>
</el-col>
<!-- 【导出】按钮 -->
<!-- <el-col :span="1.5">
<el-button
type="warning"
@@ -82,44 +92,56 @@
size="mini"
@click="handleExport"
v-hasPermi="['bas:container:export']"
>导出</el-button>
>{{ $t('bas_ContainerManagement.btnExport') }}</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="containerList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="容器编号" align="center" prop="containerId" />
<el-table-column label="点位名称" align="center" prop="portName" />
<el-table-column label="容器状态" align="center" prop="status" />
<el-table-column label="物料种类" align="center" prop="productTypeQuantity" />
<el-table-column label="容量" align="center" prop="capacity" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="状态更新时间" align="center" prop="updateTime" />
<el-table-column label="操作人" align="center" prop="operationMan" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- 容器编号 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" prop="containerId" />
<!-- 点位名称 -->
<el-table-column :label="$t('bas_ContainerManagement.portName')" align="center" prop="portName" />
<!-- 容器状态 -->
<el-table-column :label="$t('bas_ContainerManagement.status')" align="center" prop="status" />
<!-- 物料种类 -->
<el-table-column :label="$t('bas_ContainerManagement.productTypeQuantity')" align="center" prop="productTypeQuantity" />
<!-- 容量 -->
<el-table-column :label="$t('bas_ContainerManagement.capacity')" align="center" prop="capacity" />
<!-- 创建时间 -->
<el-table-column :label="$t('bas_ContainerManagement.createTime')" align="center" prop="createTime" />
<!-- 状态更新时间 -->
<el-table-column :label="$t('bas_ContainerManagement.updateTime')" align="center" prop="updateTime" />
<!-- 删除时间 -->
<el-table-column :label="$t('bas_ContainerManagement.operationMan')" align="center" prop="operationMan" />
<!-- 操作 -->
<el-table-column :label="$t('bas_ContainerManagement.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- 【详情】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleDetails(scope.row)"
v-hasPermi="['bas:container:edit']"
>详情</el-button>
>{{ $t('bas_ContainerManagement.btnDetails') }}</el-button>
<!-- 【修改】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['bas:container:edit']"
>修改</el-button>
>{{ $t('bas_ContainerManagement.btnEdit') }}</el-button>
<!-- 【删除】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:container:remove']"
>删除</el-button>
>{{ $t('bas_ContainerManagement.btnDeleteOrUnbinding') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -134,12 +156,14 @@
<!-- 添加或修改容器管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="容器编号" prop="containerId">
<el-input v-model="form.containerId" placeholder="请输入容器编号" :disabled="!containerIdIsEnabled"/>
<el-form ref="form" :model="form" :rules="rules" :label-width="$t('bas_ContainerManagement.lblWidthDialog')">
<!-- 容器编号 -->
<el-form-item :label="$t('bas_ContainerManagement.containerId')" prop="containerId">
<el-input v-model="form.containerId" :placeholder="$t('bas_ContainerManagement.placeholderContainerId')" :disabled="!containerIdIsEnabled"/>
</el-form-item>
<el-form-item label="点位名称" prop="portName">
<el-select v-model="form.portName" placeholder="请选择点位名称" clearable>
<!-- 点位名称 -->
<el-form-item :label="$t('bas_ContainerManagement.portName')" prop="portName">
<el-select v-model="form.portName" :placeholder="$t('bas_ContainerManagement.placeholderPortName')" clearable>
<el-option
v-for="(item, index) in portNameOptions"
:key="index"
@@ -148,8 +172,9 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="portName">
<el-select v-model="form.status" placeholder="请选择货架状态" clearable>
<!-- 状态 -->
<el-form-item :label="$t('bas_ContainerManagement.status')" prop="portName">
<el-select v-model="form.status" :placeholder="$t('bas_ContainerManagement.placeholderStatus')" clearable>
<el-option
v-for="status in dict.type.stock_status.slice(0, 2)"
:key="status.value"
@@ -158,23 +183,27 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="物料种类" prop="productTypeQuantity">
<el-input v-model="form.productTypeQuantity" placeholder="请输入物料种类" />
<!-- 物料种类 -->
<!-- <el-form-item label="$t('bas_ContainerManagement.btnDeleteOrUnbinding')" prop="productTypeQuantity">
<el-input v-model="form.productTypeQuantity" placeholder="$t('bas_ContainerManagement.btnDeleteOrUnbinding')" />
</el-form-item> -->
<el-form-item label="操作人" prop="operationMan">
<el-input v-model="form.operationMan" placeholder="请输入操作人" />
<!-- 操作人 -->
<el-form-item :label="$t('bas_ContainerManagement.operationMan')" prop="operationMan">
<el-input v-model="form.operationMan" :placeholder="$t('bas_ContainerManagement.placeholderOperationMan')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<!-- 【确定】按钮 -->
<el-button type="primary" @click="submitForm">{{ $t('bas_ContainerManagement.btnConfirm') }}</el-button>
<!-- 【取消】按钮 -->
<el-button @click="cancel">{{ $t('bas_ContainerManagement.btnCancel') }}</el-button>
</div>
</el-dialog>
<!-- 容器管理详细 -->
<el-dialog title="容器管理详细" :visible.sync="openView" width="700px" append-to-body>
<!-- <el-dialog title="容器管理详细" :visible.sync="openView" width="700px" append-to-body>
</el-dialog>
</el-dialog> -->
</div>
</template>
@@ -220,7 +249,7 @@ export default {
operationMan: null,
},
portNameOptions: [],
statusOptions: ['空', '有货'],
// statusOptions: ['空', '有货'],
// 表单参数
form: {},
// 表单校验
@@ -251,11 +280,13 @@ export default {
this.portNameOptions = Array.isArray(res.data) ? [...res.data] : [];
// console.log(this.portNameOptions);
} else {
this.$message.error('获取点位名称失败');
// 获取点位名称失败
this.$message.error(this.$t('bas_ContainerManagement.textErrorForGetPortName'));
}
})
.catch(error => {
this.$message.error('请求异常，请检查网络');
// 请求异常
this.$message.error(this.$t('bas_ContainerManagement.textErrorForRequestException'));
console.error(error);
});
@@ -304,7 +335,8 @@ export default {
this.reset()
this.containerIdIsEnabled = true
this.open = true
this.title = "添加容器管理"
// 标题：添加容器管理
this.title = this.$t('bas_ContainerManagement.addContainerItem')
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -314,7 +346,8 @@ export default {
this.form = response.data
this.containerIdIsEnabled = false
this.open = true
this.title = "修改容器管理"
// 标题：修改容器管理
this.title = this.$t('bas_ContainerManagement.editContainerItem')
})
},
/** 详情按钮操作 */
@@ -331,9 +364,11 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.title === "修改容器管理") {
// 标题：修改容器管理
if (this.title === this.$t('bas_ContainerManagement.editContainerItem')) {
updateContainer(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
// 提示信息：修改成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.editSuccessInfo'))
this.open = false
this.getList()
})
@@ -342,7 +377,8 @@ export default {
this.form.productTypeQuantity = '3';
this.form.capacity = 10;
addContainer(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
// 提示信息：新增成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.addSuccessInfo'))
// console.log(this.form.containerId + this.form.portName +this.form.operationMan);
this.open = false
this.getList()
@@ -354,11 +390,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const containerIds = row.containerId || this.ids
this.$modal.confirm('是否确认删除容器管理编号为"' + containerIds + '"的数据项？').then(function() {
// 提示信息：是否确认删除容器编号为" + containerIds + "的数据项？
this.$modal.confirm(this.$t('bas_ContainerManagement.textDeleteConfirm1') + containerIds + this.$t('bas_ContainerManagement.textDeleteConfirm2')).then(function() {
return delContainer(containerIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
// 提示信息：删除成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.deleteSuccessInfo'))
}).catch(() => {})
},
/** 导出按钮操作 */

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

@@ -1,78 +1,86 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="容器编号" prop="containerId">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="$t('bas_ContainerManagement.lblWidthSearch')">
<!-- 容器编号 -->
<el-form-item :label="$t('bas_ContainerManagement.containerId')" prop="containerId">
<el-input
v-model="queryParams.containerId"
placeholder="请输入容器编号"
:placeholder="$t('bas_ContainerManagement.placeholderContainerId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<!-- 物料编码 -->
<el-form-item :label="$t('bas_ContainerManagement.productId')" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
:placeholder="$t('bas_ContainerManagement.placeholderProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<!-- 物料名称 -->
<el-form-item :label="$t('bas_ContainerManagement.productName')" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('bas_ContainerManagement.placeholderProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<!-- 数量 -->
<!-- <el-form-item :label="$t('bas_ContainerManagement.quantity')" prop="quantity">
<el-input
v-model="queryParams.quantity"
placeholder="请输入数量"
:placeholder="$t('bas_ContainerManagement.placeholderQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="单位" prop="unit">
</el-form-item> -->
<!-- 单位 -->
<!-- <el-form-item :label="$t('bas_ContainerManagement.unit')" prop="unit">
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
:placeholder="$t('bas_ContainerManagement.placeholderUnit')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用" prop="spare1">
<el-form-item :label="备用" prop="spare1">
<el-input
v-model="queryParams.spare1"
placeholder="请输入备用"
:placeholder="请输入备用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用" prop="spare2">
<el-form-item :label="备用" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入备用"
:placeholder="请输入备用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用" prop="spare3">
<el-form-item :label="备用" prop="spare3">
<el-input
v-model="queryParams.spare3"
placeholder="请输入备用"
:placeholder="请输入备用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<!-- 【搜索】按钮 -->
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('bas_ContainerManagement.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('bas_ContainerManagement.btnReset') }}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- 【新增】按钮 -->
<el-button
type="primary"
plain
@@ -80,9 +88,10 @@
size="mini"
@click="handleAdd"
v-hasPermi="['bas:containerDetails:add']"
>新增</el-button>
>{{ $t('bas_ContainerManagement.btnAdd') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【修改】按钮 -->
<el-button
type="success"
plain
@@ -91,9 +100,10 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['bas:containerDetails:edit']"
>修改</el-button>
>{{ $t('bas_ContainerManagement.btnEdit') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button
type="danger"
plain
@@ -102,9 +112,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['bas:containerDetails:remove']"
>删除</el-button>
>{{ $t('bas_ContainerManagement.btnDelete') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【导出】按钮 -->
<!-- <el-button
type="warning"
plain
@@ -112,7 +123,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['bas:containerDetails:export']"
>导出</el-button> -->
>{{ $t('bas_ContainerManagement.btnExport') }}</el-button> -->
<!-- 【关闭】按钮 -->
<el-button
type="warning"
@@ -120,38 +131,48 @@
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
>{{ $t('bas_ContainerManagement.btnClose') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="containerDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="id" />
<el-table-column label="容器编号" align="center" prop="containerId" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<!-- <el-table-column label="数量" align="center" prop="quantity" /> -->
<el-table-column label="单位" align="center" prop="unit" />
<!-- 序号 -->
<el-table-column :label="$t('bas_ContainerManagement.id')" align="center" prop="id" />
<!-- 容器编号 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" align="center" prop="containerId" />
<!-- 物料编码 -->
<el-table-column :label="$t('bas_ContainerManagement.productId')" align="center" prop="productId" />
<!-- 物料名称 -->
<el-table-column :label="$t('bas_ContainerManagement.productName')" align="center" prop="productName" />
<!-- 数量 -->
<el-table-column :label="$t('bas_ContainerManagement.quantity')" align="center" 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="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="备用" align="center" prop="spare2" />
<el-table-column :label="备用" align="center" prop="spare3" /> -->
<!-- 人工操作 -->
<el-table-column :label="$t('bas_ContainerManagement.containerId')" 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:containerDetails:edit']"
>修改</el-button>
>{{ $t('bas_ContainerManagement.btnEdit') }}</el-button>
<!-- 【删除】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:containerDetails:remove']"
>删除</el-button>
>{{ $t('bas_ContainerManagement.btnDelete') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -166,35 +187,42 @@
<!-- 添加或修改容器物料明细对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="容器编号" prop="containerId">
<el-input v-model="form.containerId" placeholder="请输入容器编号" disabled/>
<el-form ref="form" :model="form" :rules="rules" :label-width="$t('bas_ContainerManagement.lblWidthDialog')">
<!-- 容器编号 -->
<el-form-item :label="$t('bas_ContainerManagement.containerId')" prop="containerId">
<el-input v-model="form.containerId" :placeholder="$t('bas_ContainerManagement.placeholderContainerId')" disabled/>
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
<!-- 物料编码 -->
<el-form-item :label="$t('bas_ContainerManagement.productId')" prop="productId">
<el-input v-model="form.productId" :placeholder="$t('bas_ContainerManagement.placeholderProductId')" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<!-- 物料名称 -->
<el-form-item :label="$t('bas_ContainerManagement.productName')" prop="productName">
<el-input v-model="form.productName" :placeholder="$t('bas_ContainerManagement.placeholderProductName')" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量" />
<!-- 数量 -->
<el-form-item :label="$t('bas_ContainerManagement.quantity')" prop="quantity">
<el-input v-model="form.quantity" :placeholder="$t('bas_ContainerManagement.placeholderQuantity')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<!-- 单位 -->
<el-form-item :label="$t('bas_ContainerManagement.unit')" prop="unit">
<el-input v-model="form.unit" :placeholder="$t('bas_ContainerManagement.placeholderUnit')" />
</el-form-item>
<!-- <el-form-item label="备用" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用" />
<!-- <el-form-item :label="备用" prop="spare1">
<el-input v-model="form.spare1" :placeholder="请输入备用" />
</el-form-item>
<el-form-item label="备用" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用" />
<el-form-item :label="备用" prop="spare2">
<el-input v-model="form.spare2" :placeholder="请输入备用" />
</el-form-item>
<el-form-item label="备用" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用" />
<el-form-item :label="备用" prop="spare3">
<el-input v-model="form.spare3" :placeholder="请输入备用" />
</el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<!-- 【确定】按钮 -->
<el-button type="primary" @click="submitForm">{{ $t('bas_ContainerManagement.btnConfirm') }}</el-button>
<!-- 【取消】按钮 -->
<el-button @click="cancel">{{ $t('bas_ContainerManagement.btnCancel') }}</el-button>
</div>
</el-dialog>
</div>
@@ -318,7 +346,8 @@ export default {
this.reset()
this.form.containerId = this.$route.params.containerId
this.open = true
this.title = "添加容器物料明细"
// 标题：添加容器物料明细
this.title = this.$t('bas_ContainerManagement.addContainerDetailsItem')
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -327,7 +356,8 @@ export default {
getContainerDetails(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改容器物料明细"
// 标题：修改容器物料明细
this.title = this.$t('bas_ContainerManagement.editContainerDetailsItem')
})
},
/** 提交按钮 */
@@ -336,13 +366,15 @@ export default {
if (valid) {
if (this.form.id != null) {
updateContainerDetails(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
// 提示信息：修改成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.editSuccessInfo'))
this.open = false
this.getList()
})
} else {
addContainerDetails(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
// 提示信息：新增成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.addSuccessInfo'))
this.open = false
this.getList()
})
@@ -353,11 +385,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除容器物料明细编号为"' + ids + '"的数据项？').then(function() {
// 提示信息：是否确认删除容器物料明细编号为"' + ids + '"的数据项？
this.$modal.confirm(this.$t('bas_ContainerManagement.textDeleteDetailsConfirm1') + ids + this.$t('bas_ContainerManagement.textDeleteDetailsConfirm2')).then(function() {
return delContainerDetails(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
// 删除成功
this.$modal.msgSuccess(this.$t('bas_ContainerManagement.deleteSuccessInfo'))
}).catch(() => {})
},
/** 导出按钮操作 */

10
ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue
View File

@@ -118,7 +118,7 @@ export default {
// 获取数据中所有的巷道字段
const firstItem = this.chartData.data[0];
// 巷道
const roadwayFields = Object.keys(firstItem).filter(key => key.startsWith('巷道'));
const roadwayFields = Object.keys(firstItem).filter(key => key.startsWith('巷道') || key.startsWith(this.$t('KPIAnalysis_CargoSpace.roadway')));
// 准备系列配置
const series = roadwayFields.map(roadway => ({
@@ -128,10 +128,10 @@ export default {
barWidth: '30%',
itemStyle: {
// 巷道1-4
color: roadway === '巷道1' ? '#1890ff' :
roadway === '巷道2' ? '#52c41a' :
roadway === '巷道3' ? '#1890ff' :
roadway === '巷道4' ? '#52c41a' : '#1890ff'
color: roadway === this.$t('KPIAnalysis_CargoSpace.roadway1') ? '#1890ff' :
roadway === this.$t('KPIAnalysis_CargoSpace.roadway2') ? '#52c41a' :
roadway === this.$t('KPIAnalysis_CargoSpace.roadway3') ? '#1890ff' :
roadway === this.$t('KPIAnalysis_CargoSpace.roadway4') ? '#52c41a' : '#1890ff'
},
label: {
show: true,