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 
# Conflicts:
#	ruoyi-ui/src/lang/en.js
#	ruoyi-ui/src/lang/zh.js
This commit is contained in:
lsymicc
2025-06-05 18:08:16 +08:00
parent 95fde513e9 2549e7c80c
commit 0fcccabc7d
17 changed files with 1551 additions and 2649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,7 +361,7 @@ export default {
isCurrent: 'Enable',
operation: 'Operation',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderId: 'Enter ID',
placeholderWarehouseId: 'Enter WarehouseId',
placeholderProjectNo: 'Enter WarehouseNo',
@@ -388,7 +388,7 @@ export default {
addWarehouseItem: 'Add Warehouse Item',
editWarehouseItem: 'Edit Warehouse Item',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
@@ -430,7 +430,7 @@ export default {
thisCargoAreaId: 'This CargoAreaId',
operation: 'Operation',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderCargoSpaceId: 'Enter CargoSpaceId',
placeholderWarehouseId: 'Enter WarehouseId',
placeholderRoadwayId: 'Enter RoadwayId',
@@ -469,7 +469,7 @@ export default {
addCargoSpaceItem: 'Add CargoSpace Item',
editCargoSpaceItem: 'Edit CargoSpace Item',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
@@ -493,7 +493,7 @@ export default {
//=====================系统管理=====================
systemManagement_UserManagement: {
systemManagement_RoleManagement: {
//--------------数据表标题--------------
userId: 'UserId',
userName: 'UserName',
@@ -510,7 +510,7 @@ export default {
gender: 'Gender',
remark: 'Remark',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderDeptName: 'Enter DeptName',
placeholderUserId: 'Enter UserId',
placeholderUserName: 'Enter UserName',
@@ -579,7 +579,7 @@ export default {
textImportResult: 'Result',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
@@ -604,199 +604,4 @@ export default {
},
//=====================系统管理:角色管理=====================
systemManagement_RoleManagement: {
//--------------数据表标题--------------
roleId: 'RoleId',
roleName: 'RoleName',
roleKey: 'RoleKey',
dataScope: 'DataScope',
menuAccess: 'MenuAccess',
roleSort: 'RoleSort',
status: 'Status',
createTime: 'CreateTime',
operation: 'Operation',
role: 'Role',
remark: 'Remark',
//--------------交互框操作提示--------------
placeholderRoleId: 'Enter RoleId',
placeholderRoleName: 'Enter RoleName',
placeholderRoleKey: 'Enter RoleKey',
placeholderRoleSort: 'Enter RoleSort',
placeholderStatus: 'Enter RoleStatus',
placeholderCreatTime: 'Select CreatTime',
placeholderDateStart: 'DateStart',
placeholderDateEnd: 'DateEnd',
placeholderEmail: 'Enter Email',
placeholderPost: 'Select Post',
placeholderRole: 'Select Role',
placeholderGender: 'Select Gender',
placeholderRemark: 'Enter Remark',
//--------------交互按钮--------------
btnSearch: 'Search',
btnReset: 'Reset',
btnAdd: 'Add',
btnEdit: 'Edit',
btnDelete: 'Delete',
btnImport: 'Import',
btnExport: 'Export',
btnSubmit: 'Submit',
btnCancel: 'Cancel',
btnMore: 'More',
btnDataPermission: 'Data Permission',
btnAssignRole: 'Assign Role',
//--------------二级窗口标题--------------
addRoleItem: 'Add Role',
editRoleItem: 'Edit Role',
AssignDataPermission: 'Assign Data Permission',
//--------------提示文本--------------
//---布局---
//---角色配置对话框---
roleKeyContent: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasRole('admin')`)",
//---复选框---
cbxExpandOrCollapse: 'Expand/Collapse',
cbxAllOrNone: 'All/None',
cbxInherite:'Inherite',
txtLoading: 'Loading...',
//输入框
tbxRemark: 'Please Enter',
//权限范围选项文本
lblDataScopeOption1: 'Full Data Permission',
lblDataScopeOption2: 'Custom Data Permission',
lblDataScopeOption3: 'Department Data Permission Only',
lblDataScopeOption4: 'Full Department Data Permission',
lblDataScopeOption5: 'Personal Data Permission',
//---函数：handleStatusChange---
textEnable: 'enable',
textDisable: 'disable',
textUserConfirm1:"Are you sure you want to \"",
textUserConfirm2:"\" role？",
textSuccess: 'success',
//---函数：handleDelete---
textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "',
textDeleteConfirm2: '"?',
//--------------操作提示--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
resetDataPermissionInfo: 'Data Permission Configure Success',
assignRoleSuccessInfo: 'Assign Role Success',
//--------------校验提示--------------
checkRoleNameIsNull: 'RoleName cannot be null!',
checkRoleKeyIsNull: 'RoleKey cannot be null!',
checkRoleSortIsNull: 'RoleSort cannot be null!',
//--------------其他--------------
lblWidthUserName: '68px',
lblWidthPhoneNumber: '68px',
},
//=====================系统管理:菜单管理=====================
systemManagement_MenuManagement: {
//--------------数据表标题--------------
menuName: 'MenuName',
icon: 'Icon',
orderNum: 'OrderNum',
perms: 'Perms',
componentPath: 'ComponentPath',
status: 'Status',
createTime: 'CreateTime',
operation: 'Operation',
role: 'Role',
remark: 'Remark',
//--------------交互框操作提示--------------
placeholderMenuName: 'Enter MenuName',
placeholderIcon: 'Enter Icon',
placeholderOrderNum: 'Enter OrderNum',
placeholderPerms: 'Enter Perms',
placeholderComponentPath: 'Enter ComponentPath',
placeholderStatus: 'Enter Status',
placeholderOperation: 'Enter Operation',
placeholderRole: 'Enter Role',
placeholderRemark: 'Enter Remark',
//--------------二级窗口操作提示--------------
placeholderParentMenu: 'Select Parent Menu',
placeholderMenuIcon: 'Select Menu Icon',
placeholderRouterName: 'Enter Router Name',
placeholderRouterPath: 'Enter Router Path',
placeholderParams: 'Enter Router Params',
//--------------交互按钮--------------
btnSearch: 'Search',
btnReset: 'Reset',
btnAdd: 'Add',
btnEdit: 'Edit',
btnDelete: 'Delete',
btnImport: 'Import',
btnExport: 'Export',
btnSubmit: 'Submit',
btnCancel: 'Cancel',
btnExpandOrCollapse: 'Expand/Collapse',
//--------------二级窗口标题--------------
addMenuItem: 'Add Menu',
editMenuItem: 'Edit Menu',
parentMenu: 'Parent Menu',
menuType: 'MenuType',
menuTypeOptions1: 'Catalog',
menuTypeOptions2: 'Menu',
menuTypeOptions3: 'Button',
menuIcon: 'Menu Icon',
routerName: 'RouterName',
isFrame: 'IsFrame',
isFrameOptions1:' Yes',
isFrameOptions2:' No',
routerPath: 'RouterPath',
routerParams: 'RouterParams',
isCache: 'IsCache',
isCacheOptions1: 'Yes',
isCacheOptions2: 'No',
isVisible: 'IsVisible',
//--------------提示文本--------------
//---二级窗口提示文本---
textRouterName: 'The default is the same as the routing address: if the address is: `user`, then the name is `User` (note: to avoid name conflicts, in special cases please customize to ensure uniqueness)',
textIsFrame:"For outbound links, the routing address should start with `http(s)://`.",
textRouterPath: 'The routing address is the path of the menu, such as `user`, `user/add`, etc. (note: to avoid conflicts, please ensure that the routing address is unique)',
textComponentPath: "Path to the accessed component, e.g. `system/user/index`, defaults to the `views` directory.",
textPerms: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasPermi('system:user:list')`).",
textRouterParams: "Default pass parameters for access routes, e.g. `{“id”: 1, “name”: “ry”}`.",
textIsCache: "Selecting yes will be cached by `keep-alive`, which requires the matching component's `name` and address to be the same",
textIsVisible: "If you choose to hide it, the route will not appear in the sidebar, but it will still be accessible.Whether to display the menu, if not displayed, it will not be displayed in the menu list",
textStatus: "If you choose to deactivate, the route will not appear in the sidebar and cannot be accessed.",
//---函数：getTreeselect---
MainTitle: 'MainTitle',
//---函数：handleDelete---
txtDeleteConfirm1: 'Are you sure to delete the data item with menu name "',
txtDeleteConfirm2: '"?',
//--------------操作提示--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
//--------------校验提示--------------
checkMenuNameIsNull: 'MenuName cannot be null',
checkOrderNumIsNull: 'OrderNum cannot be null',
checkRouterPathIsNull: 'RouterPath cannot be null',
},
}

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

@@ -1,7 +1,6 @@
// import "core-js/fn/symbol";
// import { assign } from 'core-js/core/object'
import 'core-js/features/symbol'
// import { isValidElement } from 'react'
// import { Dialog } from 'element-ui'
export default {
@@ -26,6 +25,7 @@ export default {
fixedHeader: '固定 Header',
sidebarLogo: '侧边栏 Logo'
},
// ***************收货单据新增*************
receiveStockinAdd:{
title: '新增收货单据',
warehouse: '仓库',
@@ -68,7 +68,240 @@ export default {
totalQuantity: '总数量',
totalAmount: '总金额',
submit: '提交',
selectProduct: '选择物料'
selectProduct: '选择物料',
productId:'物料编码',
spare1:'英文描述',
spare2:'单件净重KG',
totalNetWeight:'总净重',
spare3:'箱号',
spare4:'包装方式',
spare5:'长MM',
spare6:'宽MM',
spare7:'高MM',
spare8:'体积m³',
netWeight:'净重KG',
grossWeight:'毛重KG'
},
// ***************收货单据管理*************
inReceiveStockin:{
stockinId:'入库订单ID',
inputstockinId:'请输入入库订单ID',
supplierNo:'供应商编码',
selecInType:"请选择入库类型",
inputSupplierNo:'请输入供应商编码',
stockSource:'单据来源',
inputStockSource:'请输入单据来源',
warehouseId:'仓库',
selectWarehouseId:'请选择仓库',
status:'单据状态',
selectStatus:'请选择单据状态',
search:'搜索',
reset:'重置',
generateStockin:'生成入库单据',
delet:'删除',
inType:'入库类型',
createDate:'建立时间',
createManName:'创建人',
warehouseName:'仓库',
departmentName:'部门',
supplierName:'供应商',
testing:'质检',
stockinDetailId:'子单ID',
lotNo:'批次号',
productId:'物料编码',
materialDesc:'物料描述',
englishDesc:'英文描述',
cartonNo:'箱号',
packingMethod:'包装方式',
quantity:'计划数量',
stockStatus:'单据状态',
operate:'操作'
},
// ***************入库单据管理*************
inStockin:{
selecInType:"请选择入库类型",
cancel:'单据作废',
examine:'单据审核',
confirm:'单据确认',
printBarcode:'打印条码',
finishDate:'完成日期',
scanNum:'扫码数量',
assignNum:'实际数量'
},
// ***************入库作业管理*************
inJob: {
jobId: '任务ID',
status: '任务状态',
onLineType: '上线类型',
inOrOut: '任务类型',
taskNo: '任务号',
supplierName: '供应商',
departmentName: '部门',
trayCode: '托盘码',
roadwayId: '巷道ID',
cargoSpaceName: '货位',
targetRoadwayId: '目标巷道',
targetCargoSpaceName: '目标货位',
lineId: '产线ID',
workshopId: '车间ID',
priority: '优先级',
executionPhase: '执行阶段',
startTime: '开始时间',
finishTime: '结束时间',
entranceId: '入口ID',
exitId: '出口ID',
classId: '班组ID',
warehouseId: '仓库ID',
faultFlag: '重分标记',
jobDetailId: '子任务ID',
stockId: '库存ID',
lotNo: '批次号',
inDate: '入库时间',
inOrOutId: '单据ID',
inOrOutDId: '子单据ID',
productGuid: '物料GUID',
productId: '物料编码',
stockStatus: '库存状态',
inQuantity: '入库数量',
printDate: '生产日期',
supplierId: '供应商ID',
// Placeholder translations
inputJobId: '请输入任务ID',
selectStatus: '请选择任务状态',
inputTaskNo: '请输入任务号',
inputTrayCode: '请输入托盘码',
targetCargoSpaceId:'目标货位ID',
inputTargetCargoSpaceId: '请输入目标货位ID',
selectExecutionPhase: '请选择执行阶段',
selectInOrOut: '请选择任务类型',
selectStartTime: '请选择开始时间',
selectFinishTime: '请选择结束时间',
inputEntranceId: '请输入入口ID',
inputExitId: '请输入出口ID'
},
addOutStockout:{
warehouse: '仓库',
selectWarehouse: '请选择仓库',
customer: '客户',
inputCustomerNo: '请输入客户编号',
documentType: '单据类型',
selectDocumentType: '请选择单据类型',
reset: '重置',
saveDocument: '保存单据',
selectMaterial: '选择物资',
recreateDocument: '重新建单',
materialCode: '物资编号',
materialName: '物资名称',
batchNo: '批号',
quantity: '数量',
operation: '操作',
delete: '删除',
inputMaterialCode: '请输入物资编码',
inputMaterialName: '请输入物资名称',
inputBatchNo: '请输入批号',
inputWarehouse: '请输入仓库',
search: '搜索',
confirm: '确 定',
cancel: '取 消'
},
outStockoutManage:{
stockoutId: '出库单编号',
outType: '出库类型',
status: '单据状态',
customerNo: '客户编码',
createManId: '建单人',
createDate: '创建时间',
startDate: '开始时间',
finishDate: '确认时间',
warehouseId: '仓库编号',
stockoutDetailId: '出库子单编号',
productId: '物资编码',
lotNo: '批次',
quantity: '计划数量',
assignNum: '实际数量',
allotQuantity: '分配数量',
unit: '单位',
spec: '规格',
price: '价格',
remark: '备注',
// 按钮文本
search: '搜索',
reset: '重置',
audit: '单据审核',
confirm: '单据确认',
cancel: '单据作废',
autoAllot: '自动分配',
manualAllot: '手动分配',
// placeholder文本
inputStockoutId: '请输入出库单编号',
selectOutType: '请选择出库类型',
selectStatus: '请选择单据状态',
inputCustomerNo: '请输入客户编码'
},
productAndStock:{
serialNumber: '序号',
productId: '物资编码',
lotNo: '批号',
productName: '物资名称',
warehouse: '仓库',
quantity: '数量',
search: '搜索',
reset: '重置',
export: '导出',
// placeholder文本
inputSerialNumber: '请输入序号',
inputProductId: '请输入物资编码',
inputLotNo: '请输入批号',
inputProductName: '请输入物资名称',
inputWarehouse: '请输入仓库'
},
outJobManagement: {
// 状态和作业类型
status: '状态',
selectStatus: '请选择状态',
jobType: '作业类型',
selectJobType: '请选择作业类型',
onLineType: '上线类型',
executionPhase: '执行阶段',
// 任务信息
jobId: '任务ID',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
subTaskId: '子任务ID',
subDocumentId: '子单据ID',
priority: '优先级',
// 时间相关
startTime: '开始时间',
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
// 位置信息
warehouse: '仓库',
selectWarehouse: '请选择仓库',
warehouseId: '仓库ID',
roadwayId: '巷道ID',
cargoSpaceId: '货位ID',
exitId: '出口ID',
// 物料信息
materialCode: '物料编码',
stockId: '库存ID',
lotNo: '批次号',
outQuantity: '出库数量',
// 客户信息
customerId: '客户ID',
trayCode: '托盘码',
inputTrayCode: '请输入托盘条码',
// 按钮文本
search: '搜索',
reset: '重置',
manualComplete: '手动完成',
manualInvalidate: '手动作废'
},
menu:{
InboundManagement:"入库管理",
@@ -82,10 +315,15 @@ export default {
//********************仓库管理********************
WarehouseManagement: '仓库管理',
//仓库（库区）管理
WarehouseAreaManagement: '库区管理',
//货位管理
CargoSpaceManagement: '货位管理',
//仓库（库区）管理
WarehouseAreaManagement: '库区管理',
//货位管理
CargoSpaceManagement: '货位管理',
//********************出库管理********************
outboundManagement:'出库管理',
createNewOutboundDocument:'新建出库单据',
outboundDocumentManagement:'出库单据管理',
outboundTaskManagement:'出库作业管理',
//********************系统管理********************
SystemManagement: '系统管理',
@@ -111,7 +349,7 @@ export default {
},
//=====================仓库管理:仓库（库区）管理=====================
//=====================仓库（库区）管理=====================
warehouse: {
//--------------数据表标题--------------
title: '仓库管理',
@@ -126,7 +364,7 @@ export default {
isCurrent: '是否可用',
operation: '操作',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderId: '序号',
placeholderWarehouseId: '请输入仓库编码',
placeholderProjectNo: '请输入项目编号',
@@ -153,7 +391,7 @@ export default {
addWarehouseItem: '添加仓库管理',
editWarehouseItem: '修改仓库管理',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
@@ -171,7 +409,7 @@ export default {
},
//=====================仓库管理:货位管理=====================
//=====================货位管理=====================
cargoSpace: {
//--------------数据表标题--------------
title: '货位管理',
@@ -197,7 +435,7 @@ export default {
operation: '操作',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderCargoSpaceId: '请输入货位编码',
placeholderWarehouseId: '请输入仓库编码',
placeholderRoadwayId: '请输入巷道号',
@@ -233,7 +471,7 @@ export default {
addCargoSpaceItem: '添加库存信息',
editCargoSpaceItem: '修改仓库管理',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
@@ -253,8 +491,12 @@ export default {
//=====================系统管理:用户管理=====================
systemManagement_UserManagement: {
systemManagement_RoleManagement: {
//--------------数据表标题--------------
userId: '用户编号',
userName: '用户名称',
@@ -271,7 +513,7 @@ export default {
gender: '性别',
remark: '备注',
//--------------交互框操作提示--------------
//--------------交互框提示信息--------------
placeholderDeptName: '请输入部门名称',
placeholderUserId: '请输入用户编号',
placeholderUserName: '请输入用户名称',
@@ -340,7 +582,7 @@ export default {
textImportResult: '导入结果',
//--------------操作提示--------------
//--------------提示信息--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
@@ -360,228 +602,9 @@ export default {
//--------------其他--------------
lblWidthUserName: '68px',
lblWidthPhoneNumber: '68px',
lblWidthDialog: '80px',
},
//=====================系统管理:角色管理=====================
systemManagement_RoleManagement: {
//--------------数据表标题--------------
roleId: '角色编号',
roleName: '角色名称',
roleKey: '权限字符',
dataScope: '权限范围',
menuAccess: '菜单权限',
roleSort: '显示顺序',
roleStatus: '角色状态',
createTime: '创建时间',
operation: '操作',
role: '角色',
remark: '备注',
//--------------交互框操作提示--------------
placeholderRoleId: '请输入角色编号',
placeholderRoleName: '请输入角色名称',
placeholderRoleKey: '请输入权限字符',
placeholderRoleSort: '请输入显示顺序',
placeholderRoleStatus: '请输入角色状态',
placeholderCreatTime: '请选择创建时间',
placeholderRole: '请输入角色',
placeholderRemark: '请输入备注',
placeholderDateStart: '开始日期',
placeholderDateEnd: '结束日期',
placeholderEmail: '请输入邮箱',
placeholderPost: '请选择岗位',
placeholderGender: '请选择性别',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnImport: '导入',
btnExport: '导出',
btnSubmit: '确定',
btnCancel: '取消',
btnMore: '更多',
btnDataPermission: '数据权限',
btnAssignRole: '分配角色',
//--------------二级窗口标题--------------
addRoleItem: '添加角色',
editRoleItem: '修改角色',
AssignDataPermission: '配置数据权限',
//--------------提示文本--------------
//---布局---
//---角色配置对话框---
roleKeyContent: "控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)",
//---复选框---
cbxExpandOrCollapse: '展开/折叠',
cbxAllOrNone: '全选/全不选',
cbxInherite:'父子联动',
txtLoading: '加载中,请稍候...',
//输入框
tbxRemark: '备注',
//权限范围选项文本
lblDataScopeOption1: '全部数据权限',
lblDataScopeOption2: '自定数据权限',
lblDataScopeOption3: '仅本部门数据权限',
lblDataScopeOption4: '本部门及以下数据权限',
lblDataScopeOption5: '仅本人数据权限',
//---函数：handleStatusChange---
textEnable: '启用',
textDisable: '禁用',
textUserConfirm1:"确认要\"",
textUserConfirm2:"\"角色吗？",
textSuccess: '成功',
//---handleDelete---
textDeleteConfirm1: '是否确认删除用户编号为"',
textDeleteConfirm2: '"的数据项？',
//--------------操作提示--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
resetDataPermissionInfo: '数据权限配置成功',
assignRoleSuccessInfo: '分配角色成功',
//--------------校验提示--------------
checkRoleNameIsNull: '角色名称不能为空',
checkRoleKeyIsNull: '权限字符不能为空',
checkRoleSortIsNull: '角色顺序不能为空',
//--------------其他--------------
lblWidthUserName: '68px',
lblWidthPhoneNumber: '68px',
},
//=====================系统管理:菜单管理=====================
systemManagement_MenuManagement: {
//--------------数据表标题--------------
menuName: '菜单名称',
icon: '图标',
orderNum: '排序',
perms: '权限标识',
componentPath: '组件路径',
status: '状态',
createTime: '创建时间',
operation: '操作',
role: '角色',
remark: '备注',
//--------------交互框操作提示--------------
placeholderMenuName: '菜单名称',
placeholderIcon: '图标',
placeholderOrderNum: '排序',
placeholderPerms: '权限标识',
placeholderComponentPath: '组件路径',
placeholderStatus: '状态',
placeholderOperation: '操作',
placeholderRole: '角色',
placeholderRemark: '请输入备注信息',
//--------------二级窗口操作提示--------------
placeholderParentMenu: '请选择上级菜单',
placeholderMenuIcon: '请选择菜单图标',
placeholderRouterName: '请输入路由名称',
placeholderRouterPath: '请输入路由地址',
placeholderRouterParams: '请输入路由参数',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnImport: '导入',
btnExport: '导出',
btnSubmit: '确定',
btnCancel: '取消',
btnExpandOrCollapse: '展开/折叠',
//--------------二级窗口标题--------------
addMenuItem: '添加角色',
editMenuItem: '修改角色',
parentMenu: '上级菜单',
menuType: '菜单类型',
menuTypeOptions1: '目录',
menuTypeOptions2: '菜单',
menuTypeOptions3: '按钮',
menuIcon: '菜单图标',
routerName: '路由名称',
isFrame: '是否外链',
isFrameOptions1: '是',
isFrameOptions2: '否',
routerPath: '路由地址',
routerParams: '路由参数',
isCache: '是否缓存',
isCacheOptions1: '缓存',
isCacheOptions2: '不缓存',
isVisible: '显示状态',
//--------------提示文本--------------
//---二级窗口提示文本---
textRouterName: '默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：为避免名字的冲突，特殊情况下请自定义，保证唯一性）',
textIsFrame: "选择是外链则路由地址需要以`http(s)://`开头",
textRouterPath: '路由地址：如地址为`user`，则路由地址为`/system/user`（注意：为避免名字的冲突，特殊情况下请自定义，保证唯一性）',
textComponentPath: '组件路径：组件路径为组件所在文件路径，如：`system/user/index`，则组件路径为`@/views/system/user/index`',
textPerms: "控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasPermi('system:user:list')`)",
textRouterParams: '访问路由的默认传递参数，如：`{"id": 1, "name": "ry"}`',
textIsCache: '选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致',
textIsVisible: '选择隐藏则路由将不会出现在侧边栏，但仍然可以访问',
textStatus: '选择停用则路由将不会出现在侧边栏，也不能被访问',
//---角色配置对话框---
roleKeyContent: "控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)",
//---复选框---
cbxExpandOrCollapse: '展开/折叠',
cbxAllOrNone: '全选/全不选',
cbxInherite:'父子联动',
txtLoading: '加载中,请稍候...',
//输入框
tbxRemark: '备注',
//权限范围选项文本
lblDataScopeOption1: '全部数据权限',
lblDataScopeOption2: '自定数据权限',
lblDataScopeOption3: '仅本部门数据权限',
lblDataScopeOption4: '本部门及以下数据权限',
lblDataScopeOption5: '仅本人数据权限',
//---函数：getTreeselect---
MainTitle: '主类目',
//---函数：handleDelete---
txtDeleteConfirm1: '是否确认删除菜单名称为"',
txtDeleteConfirm2: '"的数据项？',
//---handleDelete---
textDeleteConfirm1: '是否确认删除用户编号为"',
textDeleteConfirm2: '"的数据项？',
//--------------操作提示--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
//--------------校验提示--------------
checkMenuNameIsNull: '校验：菜单名称不能为空',
checkOrderNumIsNull: '菜单顺序不能为空',
checkRouterPathIsNull: '路由地址不能为空',
},
}

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

@@ -2,8 +2,8 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item label="仓库" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" placeholder="请选择仓库" clearable>
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required> <!-- 仓库 -->
<el-select v-model="formData.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
@@ -12,15 +12,15 @@
/>
</el-select>
</el-form-item>
<el-form-item label="客户" prop="customerNo" required>
<el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> <!-- 客户 -->
<el-input
v-model="formData.customerNo"
placeholder="请输入客户编号"
:placeholder="$t('checkCreate.inputCustomerNo')"
clearable
/>
</el-form-item>
<el-form-item label="单据类型" prop="checkType" required>
<el-select v-model="formData.checkType" placeholder="请选择单据类型" clearable>
<el-form-item :label="$t('checkCreate.documentType')" prop="checkType" required> <!-- 单据类型 -->
<el-select v-model="formData.checkType" :placeholder="$t('checkCreate.selectDocumentType')" clearable>
<el-option
v-for="dict in dict.type.check_stock_type"
:key="dict.value"
@@ -30,60 +30,60 @@
</el-select>
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">重置</el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">保存单据</el-button>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">选择物资</el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">重新建单</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{ $t('checkCreate.recreateDocument') }}</el-button> <!-- 重新建单 -->
</div>
<!-- 物资明细表格 -->
<el-table v-loading="loading" :data="materialList">
<el-table-column label="物资编号" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column label="批号" align="center" prop="lotNo">
<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"> <!-- 批号 -->
<template slot-scope="scope">
<el-input v-model="scope.row.lotNo" size="mini" placeholder="请输入批号" />
<el-input v-model="scope.row.lotNo" size="mini" :placeholder="$t('checkCreate.inputBatchNo')" />
</template>
</el-table-column>
<el-table-column label="数量" align="center" prop="quantity">
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity"> <!-- 数量 -->
<template slot-scope="scope">
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<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)">删除</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{ $t('checkCreate.delete') }}</el-button> <!-- 删除 -->
</template>
</el-table-column>
</el-table>
<!-- 选择物资弹窗 -->
<el-dialog title="选择物资" :visible.sync="materialDialog" width="800px" append-to-body>
<el-dialog :title="$t('checkCreate.selectMaterial')" :visible.sync="materialDialog" width="800px" append-to-body> <!-- 选择物资 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="物资编码" prop="productId">
<el-form-item :label="$t('checkCreate.materialCode')" prop="productId"> <!-- 物资编码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物资编码"
:placeholder="$t('checkCreate.inputMaterialCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-form-item :label="$t('checkCreate.materialName')" prop="productName"> <!-- 物资名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物资名称"
:placeholder="$t('checkCreate.inputMaterialName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('checkCreate.batchNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('checkCreate.inputBatchNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -97,27 +97,21 @@
/>
</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('checkCreate.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
<el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column label="物资编码" align="center" prop="productId" />
<el-table-column label="物资名称" align="center" prop="productName" />
<!-- <el-table-column label="批号" align="center" prop="lotNo">
<template slot-scope="scope">
<el-input v-model="scope.row.lotNo" size="mini" placeholder="请输入批号" />
</template>
</el-table-column> -->
<el-table-column label="数量" align="center" prop="quantity" />
<!-- <el-table-column label="仓库" align="center" prop="warehouseId" /> -->
<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>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmSelectMaterials">确 定</el-button>
<el-button @click="cancelSelectMaterials">取 消</el-button>
<el-button type="primary" @click="confirmSelectMaterials">{{ $t('checkCreate.confirm') }}</el-button> <!-- 确定 -->
<el-button @click="cancelSelectMaterials">{{ $t('checkCreate.cancel') }}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>
@@ -139,13 +133,13 @@
// 表单验证规则
rules: {
warehouseId: [
{ required: true, message: "请选择仓库", trigger: "change" }
{ required: true, message: this.$t('checkCreate.warehouseRequired'), trigger: "change" }
],
customerNo: [
{ required: true, message: "请输入客户编号", trigger: "blur" }
{ required: true, message: this.$t('checkCreate.customerRequired'), trigger: "blur" }
],
billType: [
{ required: true, message: "请选择单据类型", trigger: "change" }
{ required: true, message: this.$t('checkCreate.documentTypeRequired'), trigger: "change" }
]
},
// 主表数据
@@ -208,7 +202,7 @@
/** 确认选择物资 */
confirmSelectMaterials() {
if (this.selectedMaterials.length === 0) {
this.$modal.msgError("请选择物资");
this.$modal.msgError(this.$t('checkCreate.selectMaterialRequired'));
return;
}
// 过滤掉已经存在的物资
@@ -217,7 +211,7 @@
});
if (newMaterials.length === 0) {
this.$modal.msgWarning("所选物资已存在，请重新选择");
this.$modal.msgWarning(this.$t('checkCreate.materialExistWarning'));
return;
}
@@ -260,7 +254,7 @@
// 如果修改后的数量大于初始数量，给出提示并重置为当前值
if (row.quantity > row.quantityOrignal) {
this.$modal.msgError("数量不能大于库存数量");
this.$modal.msgError(this.$t('checkCreate.quantityExceedError'));
row.quantity = row.quantityOrignal;
}
},
@@ -269,7 +263,7 @@
this.$refs.formRef.validate(valid => {
if (valid) {
if (this.materialList.length === 0) {
this.$modal.msgError("请选择物资");
this.$modal.msgError(this.$t('checkCreate.selectMaterialRequired'));
return;
}
const data = {
@@ -279,7 +273,7 @@
// 这里需要调用保存接口
saveCheckStock(data).then(response => {
console.log(response)
this.$modal.msgSuccess("单据"+response.msg+"保存成功");
this.$modal.msgSuccess(this.$t('checkCreate.saveSuccess', { msg: response.msg }));
this.$tab.refreshPage(this.$route);
// this.reset();
});

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

@@ -1,50 +1,50 @@
<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="盘点单据id" prop="checkStockDetailId">
<el-form-item :label="$t('checkDifference.checkStockDetailId')" prop="checkStockDetailId"> <!-- 盘点单据id -->
<el-input
v-model="queryParams.checkStockDetailId"
placeholder="请输入盘点单据id"
:placeholder="$t('checkDifference.inputCheckStockDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存id" prop="stockId">
<el-form-item :label="$t('checkDifference.stockId')" prop="stockId"> <!-- 库存id -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存id"
:placeholder="$t('checkDifference.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘" prop="trayCode">
<el-form-item :label="$t('checkDifference.trayCode')" prop="trayCode"> <!-- 托盘 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘"
:placeholder="$t('checkDifference.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-form-item :label="$t('checkDifference.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位id -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位id"
:placeholder="$t('checkDifference.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料id" prop="productId">
<el-form-item :label="$t('checkDifference.productId')" prop="productId"> <!-- 物料id -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料id"
:placeholder="$t('checkDifference.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('checkDifference.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('checkDifference.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -90,8 +90,8 @@
/>
</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('checkDifference.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkDifference.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -143,20 +143,20 @@
<el-table v-loading="loading" :data="differenceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="盘点id" align="center" prop="checkGuid" />
<el-table-column label="盘点单据id" align="center" prop="checkStockDetailId" />
<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="cargoSpaceId" />
<el-table-column label="物料id" align="center" prop="productId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="供应商" align="center" prop="supplier" />
<el-table-column label="客户" align="center" prop="customer" />
<el-table-column label="原值" align="center" prop="oldQuantity" />
<el-table-column label="新值" align="center" prop="newQuantity" />
<el-table-column label="操作方式" align="center" prop="recordType" />
<el-table-column label="物料guid" align="center" prop="productGuid" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('checkDifference.checkGuid')" align="center" prop="checkGuid" /> <!-- 盘点id -->
<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="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('checkDifference.productId')" align="center" prop="productId" /> <!-- 物料id -->
<el-table-column :label="$t('checkDifference.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('checkDifference.supplier')" align="center" prop="supplier" /> <!-- 供应商 -->
<el-table-column :label="$t('checkDifference.customer')" align="center" prop="customer" /> <!-- 客户 -->
<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.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid -->
<el-table-column :label="$t('checkDifference.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
@@ -164,14 +164,14 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['check:difference:edit']"
>修改</el-button>
>{{$t('checkDifference.edit')}}</el-button> <!-- 修改 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['check:difference:remove']"
>删除</el-button>
>{{$t('checkDifference.delete')}}</el-button> <!-- 删除 -->
</template>
</el-table-column>
</el-table>
@@ -187,43 +187,43 @@
<!-- 添加或修改盘点差异对话框 -->
<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="盘点单据id" prop="checkStockDetailId">
<el-input v-model="form.checkStockDetailId" placeholder="请输入盘点单据id" />
<el-form-item :label="$t('checkDifference.checkStockDetailId')" prop="checkStockDetailId"> <!-- 盘点单据id -->
<el-input v-model="form.checkStockDetailId" :placeholder="$t('checkDifference.inputCheckStockDetailId')" />
</el-form-item>
<el-form-item label="库存id" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存id" />
<el-form-item :label="$t('checkDifference.stockId')" prop="stockId"> <!-- 库存id -->
<el-input v-model="form.stockId" :placeholder="$t('checkDifference.inputStockId')" />
</el-form-item>
<el-form-item label="托盘" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘" />
<el-form-item :label="$t('checkDifference.trayCode')" prop="trayCode"> <!-- 托盘 -->
<el-input v-model="form.trayCode" :placeholder="$t('checkDifference.inputTrayCode')" />
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位id" />
<el-form-item :label="$t('checkDifference.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位id -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('checkDifference.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="物料id" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料id" />
<el-form-item :label="$t('checkDifference.productId')" prop="productId"> <!-- 物料id -->
<el-input v-model="form.productId" :placeholder="$t('checkDifference.inputProductId')" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('checkDifference.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('checkDifference.inputLotNo')" />
</el-form-item>
<el-form-item label="供应商" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供应商" />
<el-form-item :label="$t('checkDifference.supplier')" prop="supplier"> <!-- 供应商 -->
<el-input v-model="form.supplier" :placeholder="$t('checkDifference.inputSupplier')" />
</el-form-item>
<el-form-item label="客户" prop="customer">
<el-input v-model="form.customer" placeholder="请输入客户" />
<el-form-item :label="$t('checkDifference.customer')" prop="customer"> <!-- 客户 -->
<el-input v-model="form.customer" :placeholder="$t('checkDifference.inputCustomer')" />
</el-form-item>
<el-form-item label="原值" prop="oldQuantity">
<el-input v-model="form.oldQuantity" placeholder="请输入原值" />
<el-form-item :label="$t('checkDifference.oldQuantity')" prop="oldQuantity"> <!-- 原值 -->
<el-input v-model="form.oldQuantity" :placeholder="$t('checkDifference.inputOldQuantity')" />
</el-form-item>
<el-form-item label="新值" prop="newQuantity">
<el-input v-model="form.newQuantity" placeholder="请输入新值" />
<el-form-item :label="$t('checkDifference.newQuantity')" prop="newQuantity"> <!-- 新值 -->
<el-input v-model="form.newQuantity" :placeholder="$t('checkDifference.inputNewQuantity')" />
</el-form-item>
<el-form-item label="物料guid" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料guid" />
<el-form-item :label="$t('checkDifference.productGuid')" prop="productGuid"> <!-- 物料guid -->
<el-input v-model="form.productGuid" :placeholder="$t('checkDifference.inputProductGuid')" />
</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('checkDifference.confirm')}}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{$t('checkDifference.cancel')}}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>

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

@@ -1,16 +1,16 @@
<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="任务ID" prop="jobId">
<el-form-item :label="$t('checkJobIn.jobId')" prop="jobId"> <!--任务ID-->
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
:placeholder="$t('checkJobIn.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-form-item :label="$t('checkJobIn.status')" prop="status"> <!--任务状态-->
<el-select v-model="queryParams.status" :placeholder="$t('checkJobIn.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -29,10 +29,10 @@
/>
</el-select>
</el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('checkJobIn.taskNo')" prop="taskNo"> <!--任务号-->
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('checkJobIn.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -61,10 +61,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('checkJobIn.trayCode')" prop="trayCode"> <!--托盘码-->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
:placeholder="$t('checkJobIn.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -93,10 +93,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="目标货位" prop="targetCargoSpaceId">
<el-form-item :label="$t('checkJobIn.targetCargoSpace')" prop="targetCargoSpaceId"> <!--目标货位-->
<el-input
v-model="queryParams.targetCargoSpaceId"
placeholder="请输入目标货位ID"
:placeholder="$t('checkJobIn.inputTargetCargoSpace')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -125,8 +125,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-form-item :label="$t('checkJobIn.executionPhase')" prop="executionPhase"> <!--执行阶段-->
<el-select v-model="queryParams.executionPhase" :placeholder="$t('checkJobIn.selectExecutionPhase')" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
@@ -135,8 +135,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-form-item :label="$t('checkJobIn.jobType')" prop="inOrOut"> <!--任务类型-->
<el-select v-model="queryParams.inOrOut" :placeholder="$t('checkJobIn.selectJobType')" clearable>
<el-option
v-for="dict in dict.type.check_in_job_type"
:key="dict.value"
@@ -145,34 +145,34 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('checkJobIn.startTime')" prop="startTime"> <!--开始时间-->
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('checkJobIn.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('checkJobIn.finishTime')" prop="finishTime"> <!--结束时间-->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('checkJobIn.selectFinishTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-form-item :label="$t('checkJobIn.entrance')" prop="entranceId"> <!--入口-->
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
:placeholder="$t('checkJobIn.inputEntranceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-form-item :label="$t('checkJobIn.exit')" prop="exitId"> <!--出口-->
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口ID"
:placeholder="$t('checkJobIn.inputExitId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -185,10 +185,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('checkJobIn.warehouse')" prop="warehouseId"> <!--仓库-->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('checkJobIn.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -202,97 +202,87 @@
/>
</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('checkJobIn.search')}}</el-button> <!--搜索-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkJobIn.reset')}}</el-button> <!--重置-->
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
>手动作废</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
>手动完成</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['job:mydoJob:export']"
>导出</el-button>
</el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleManualVoid"
v-hasPermi="['check:job:in:void']"
>{{$t('checkJobIn.manualVoid')}}</el-button> <!--手动作废-->
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="multiple"
@click="handleManualFinish"
v-hasPermi="['check:job:in:finish']"
>{{$t('checkJobIn.manualFinish')}}</el-button> <!--手动完成-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<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="任务ID" align="center" prop="jobId" fixed />
<el-table-column label="任务状态" align="center" prop="status">
<el-table-column :label="$t('checkJobIn.jobId')" align="center" prop="jobId" /> <!--任务ID-->
<el-table-column :label="$t('checkJobIn.status')" align="center" 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="上线类型" align="center" prop="onLineType">
<el-table-column :label="$t('checkJobIn.onLineType')" align="center" 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="任务类型" align="center" prop="inOrOut">
<el-table-column :label="$t('checkJobIn.jobType')" align="center" 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="任务号" align="center" prop="taskNo" />
<el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="部门" align="center" prop="departmentName" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位" align="center" prop="cargoSpaceName" />
<el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
<el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
<el-table-column label="产线ID" align="center" prop="lineId" />
<el-table-column label="车间ID" align="center" prop="workshopId" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<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" /> <!--巷道ID-->
<el-table-column :label="$t('checkJobIn.cargoSpace')" align="center" prop="cargoSpaceName" /> <!--货位-->
<el-table-column :label="$t('checkJobIn.targetRoadway')" align="center" prop="targetRoadwayId" /> <!--目标巷道-->
<el-table-column :label="$t('checkJobIn.targetCargoSpace')" align="center" prop="targetCargoSpaceName" /> <!--目标货位-->
<el-table-column :label="$t('checkJobIn.lineId')" align="center" prop="lineId" /> <!--产线ID-->
<el-table-column :label="$t('checkJobIn.workshopId')" align="center" prop="workshopId" /> <!--车间ID-->
<el-table-column :label="$t('checkJobIn.priority')" align="center" prop="priority" /> <!--优先级-->
<el-table-column :label="$t('checkJobIn.executionPhase')" align="center" 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="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('checkJobIn.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="结束时间" align="center" prop="finishTime" width="180">
<el-table-column :label="$t('checkJobIn.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="入口ID" align="center" prop="entranceId" />
<!-- <el-table-column label="出口ID" align="center" prop="exitId" />-->
<el-table-column label="班组ID" align="center" prop="classId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="重分标记" align="center" prop="faultFlag" />
<el-table-column :label="$t('checkJobIn.entranceId')" align="center" prop="entranceId" /> <!--入口ID-->
<el-table-column :label="$t('checkJobIn.classId')" align="center" prop="classId" /> <!--班组ID-->
<el-table-column :label="$t('checkJobIn.warehouseId')" align="center" prop="warehouseId" /> <!--仓库ID-->
<el-table-column :label="$t('checkJobIn.faultFlag')" align="center" prop="faultFlag" /> <!--重分标记-->
</el-table>
<pagination
@@ -307,36 +297,23 @@
max-height="300"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="center" prop="jobDetailId" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" width="180">
<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" /> <!--库存ID-->
<el-table-column :label="$t('checkJobIn.lotNo')" align="center" prop="lotNo" /> <!--批次号-->
<el-table-column :label="$t('checkJobIn.inDate')" align="center" 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="单据ID" align="center" prop="inOrOutId" />
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column label="物料GUID" align="center" prop="productGuid" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="库存状态" align="center" prop="stockStatus" />
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />-->
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />
<!-- <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="备用字段4" align="center" prop="spare4" />-->
<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" /> <!--物料GUID-->
<el-table-column :label="$t('checkJobIn.productId')" align="center" prop="productId" /> <!--物料编码-->
<el-table-column :label="$t('checkJobIn.stockStatus')" align="center" prop="stockStatus" /> <!--库存状态-->
<el-table-column :label="$t('checkJobIn.inQuantity')" align="center" prop="inQuantity" /> <!--入库数量-->
<el-table-column :label="$t('checkJobIn.printDate')" align="center" prop="printDate" /> <!--生产日期-->
<el-table-column :label="$t('checkJobIn.supplierId')" align="center" prop="supplierId" /> <!--供应商ID-->
</el-table>
<pagination
@@ -423,15 +400,16 @@ export default {
// 表单参数
form: {},
// 表单校验
// 表单校验
rules: {
jobId: [
{ required: true, message: "任务ID不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkJobIn.jobIdRequired'), trigger: "blur" }
],
status: [
{ required: true, message: "任务状态不能为空", trigger: "change" }
{ required: true, message: this.$t('checkJobIn.statusRequired'), trigger: "change" }
],
taskNo: [
{ required: true, message: "任务号不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkJobIn.taskNoRequired'), trigger: "blur" }
],
}
}
@@ -522,7 +500,7 @@ export default {
handleCompletedManually(row) {
const jobIds = this.ids;
if (jobIds.length === 0) {
this.$modal.msgError("请选择要操作的数据");
this.$modal.msgError(this.$t('checkJobIn.selectData'));
return;
}
if (row.type === 'invalid'){

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

@@ -1,16 +1,16 @@
<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="任务ID" prop="jobId">
<el-form-item :label="$t('checkJobOut.jobId')" prop="jobId"> <!-- 任务ID -->
<el-input
v-model="queryParams.jobId"
placeholder="请输入任务ID"
:placeholder="$t('checkJobOut.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-form-item :label="$t('checkJobOut.status')" prop="status"> <!-- 任务状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('checkJobOut.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -29,10 +29,10 @@
/>
</el-select>
</el-form-item>-->
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('checkJobOut.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('checkJobOut.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -61,10 +61,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('checkJobOut.trayCode')" prop="trayCode"> <!-- 托盘码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
:placeholder="$t('checkJobOut.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -93,10 +93,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="目标货位" prop="targetCargoSpaceId">
<el-form-item :label="$t('checkJobOut.targetCargoSpace')" prop="targetCargoSpaceId"> <!-- 目标货位 -->
<el-input
v-model="queryParams.targetCargoSpaceId"
placeholder="请输入目标货位ID"
:placeholder="$t('checkJobOut.inputTargetCargoSpace')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -125,8 +125,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="queryParams.executionPhase" placeholder="请选择执行阶段" clearable>
<el-form-item :label="$t('checkJobOut.executionPhase')" prop="executionPhase"> <!-- 执行阶段 -->
<el-select v-model="queryParams.executionPhase" :placeholder="$t('checkJobOut.selectExecutionPhase')" clearable>
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
@@ -135,8 +135,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="inOrOut">
<el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
<el-form-item :label="$t('checkJobOut.jobType')" prop="inOrOut"> <!-- 任务类型 -->
<el-select v-model="queryParams.inOrOut" :placeholder="$t('checkJobOut.selectJobType')" clearable>
<el-option
v-for="dict in dict.type.check_out_job_type"
:key="dict.value"
@@ -145,34 +145,34 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('checkJobOut.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('checkJobOut.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('checkJobOut.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('checkJobOut.selectFinishTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="入口" prop="entranceId">
<el-form-item :label="$t('checkJobOut.entranceId')" prop="entranceId"> <!-- 入口ID -->
<el-input
v-model="queryParams.entranceId"
placeholder="请输入入口ID"
:placeholder="$t('checkJobOut.inputEntranceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出口" prop="exitId">
<el-form-item :label="$t('checkJobOut.exitId')" prop="exitId"> <!-- 出口ID -->
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口ID"
:placeholder="$t('checkJobOut.inputExitId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -185,10 +185,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('checkJobOut.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('checkJobOut.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -202,12 +202,13 @@
/>
</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('checkJobOut.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkJobOut.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="danger"
@@ -216,7 +217,7 @@
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
>手动作废</el-button>
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -226,9 +227,9 @@
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
>手动完成</el-button>
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
</el-col>
&lt;!&ndash; <el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -237,62 +238,73 @@
@click="handleExport"
v-hasPermi="['job:mydoJob:export']"
>导出</el-button>
</el-col>&ndash;&gt;
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>-->
</el-row>
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
max-height="300">
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange" @row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务ID" align="center" prop="jobId" fixed />
<el-table-column label="任务状态" align="center" prop="status">
<el-table-column :label="$t('checkJobOut.jobId')" align="center" prop="jobId" /> <!-- 任务ID -->
<el-table-column :label="$t('checkJobOut.status')" align="center" 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="上线类型" align="center" prop="onLineType">
<el-table-column :label="$t('checkJobOut.onLineType')" align="center" 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="任务类型" align="center" prop="inOrOut">
<el-table-column :label="$t('checkJobOut.jobType')" align="center" 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="任务号" align="center" prop="taskNo" />
<el-table-column label="供应商" align="center" prop="supplierName" key="supplierId" value="supplierName" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="部门" align="center" prop="departmentName" />
<el-table-column label="托盘码" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位" align="center" prop="cargoSpaceName" />
<el-table-column label="目标巷道" align="center" prop="targetRoadwayId" />
<el-table-column label="目标货位" align="center" prop="targetCargoSpaceName" />
<el-table-column label="产线ID" align="center" prop="lineId" />
<el-table-column label="车间ID" align="center" prop="workshopId" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<el-table-column :label="$t('checkJobOut.taskNo')" align="center" prop="taskNo" /> <!-- 任务号 -->
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<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.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道ID -->
<el-table-column :label="$t('checkJobOut.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('checkJobOut.targetRoadwayId')" align="center" prop="targetRoadwayId" /> <!-- 目标巷道ID -->
<el-table-column :label="$t('checkJobOut.targetCargoSpace')" align="center" prop="targetCargoSpaceId" /> <!-- 目标货位 -->
<el-table-column :label="$t('checkJobOut.lineId')" align="center" prop="lineId" /> <!-- 产线ID -->
<el-table-column :label="$t('checkJobOut.workshopId')" align="center" prop="workshopId" /> <!-- 车间ID -->
<el-table-column :label="$t('checkJobOut.priority')" align="center" prop="priority" /> <!-- 优先级 -->
<el-table-column :label="$t('checkJobOut.executionPhase')" align="center" 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="开始时间" align="center" prop="startTime" width="180">
<el-table-column :label="$t('checkJobOut.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="结束时间" align="center" prop="finishTime" width="180">
<el-table-column :label="$t('checkJobOut.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="入口ID" align="center" prop="entranceId" />
<!-- <el-table-column label="出口ID" align="center" prop="exitId" />-->
<el-table-column label="班组ID" align="center" prop="classId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="重分标记" align="center" prop="faultFlag" />
<el-table-column :label="$t('checkJobOut.entranceId')" align="center" prop="entranceId" /> <!-- 入口ID -->
<el-table-column :label="$t('checkJobOut.exitId')" align="center" prop="exitId" /> <!-- 出口ID -->
<el-table-column :label="$t('checkJobOut.classId')" align="center" prop="classId" /> <!-- 班组ID -->
<el-table-column :label="$t('checkJobOut.warehouse')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('checkJobOut.faultFlag')" align="center" prop="faultFlag" /> <!-- 重分标记 -->
<el-table-column :label="$t('checkJobOut.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleManualFinish(scope.row)"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
<el-button
size="mini"
type="text"
@click="handleManualInvalid(scope.row)"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</template>
</el-table-column>
</el-table>
<pagination
@@ -303,32 +315,36 @@
@pagination="getList"
/>
<el-table v-loading="detailLoading" :data="mydoJobDetailList" @selection-change="handleSelectionChange"
max-height="300"
>
<el-table v-loading="loading" :data="subJobList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="子任务ID" align="center" prop="jobDetailId" />
<el-table-column label="任务ID" align="center" prop="jobId" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" width="180">
<el-table-column :label="$t('checkJobOut.subJobId')" align="center" prop="subJobId" /> <!-- 子任务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="batchNo" /> <!-- 批次号 -->
<el-table-column :label="$t('checkJobOut.inTime')" align="center" prop="inTime" width="180"> <!-- 入库时间 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.inTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="单据ID" align="center" prop="inOrOutId" />
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column label="物料GUID" align="center" prop="productGuid" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="库存状态" align="center" prop="stockStatus" />
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />-->
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />-->
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />-->
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />-->
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />-->
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />-->
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />-->
<el-table-column :label="$t('checkJobOut.billId')" align="center" prop="billId" /> <!-- 单据ID -->
<el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="subBillId" /> <!-- 子单据ID -->
<el-table-column :label="$t('checkJobOut.materialGuid')" align="center" prop="materialGuid" /> <!-- 物料GUID -->
<el-table-column :label="$t('checkJobOut.materialCode')" align="center" prop="materialCode" /> <!-- 物料编码 -->
<el-table-column :label="$t('checkJobOut.stockStatus')" align="center" prop="stockStatus" /> <!-- 库存状态 -->
<el-table-column :label="$t('checkJobOut.inQty')" align="center" prop="inQty" /> <!-- 入库数量 -->
<el-table-column :label="$t('checkJobOut.productDate')" align="center" prop="productDate" width="180"> <!-- 生产日期 -->
<template slot-scope="scope">
<span>{{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
@@ -425,13 +441,13 @@ export default {
// 表单校验
rules: {
jobId: [
{ required: true, message: "任务ID不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkJobOut.inputJobId'), trigger: 'blur' }
],
status: [
{ required: true, message: "任务状态不能为空", trigger: "change" }
{ required: true, message: this.$t('checkJobOut.selectStatus'), trigger: 'change' }
],
taskNo: [
{ required: true, message: "任务号不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkJobOut.inputTaskNo'), trigger: 'blur' }
],
}
}
@@ -522,7 +538,7 @@ export default {
handleCompletedManually(row) {
const jobIds = this.ids;
if (jobIds.length === 0) {
this.$modal.msgError("请选择要操作的数据");
this.$modal.msgError(this.$t('checkJobOut.selectData')); // 请选择要操作的数据
return;
}
if (row.type === 'invalid'){
@@ -563,6 +579,34 @@ export default {
this.detailLoading = false;
});
},
/** 手动完成按钮操作 */
handleManualFinish(row) {
const jobIds = row.jobId || this.ids;
if (jobIds.length === 0) {
this.$modal.msgError(this.$t('checkJobOut.selectData'));
return;
}
this.$modal.confirm(this.$t('checkJobOut.confirmFinish', { jobIds: jobIds })).then(function() {
return manualFinish(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('checkJobOut.finishSuccess'));
}).catch(() => {});
},
/** 手动作废按钮操作 */
handleManualInvalid(row) {
const jobIds = row.jobId || this.ids;
if (jobIds.length === 0) {
this.$modal.msgError(this.$t('checkJobOut.selectData'));
return;
}
this.$modal.confirm(this.$t('checkJobOut.confirmInvalid', { jobIds: jobIds })).then(function() {
return manualInvalid(jobIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess(this.$t('checkJobOut.invalidSuccess'));
}).catch(() => {});
},
}
}
</script>

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

@@ -1,16 +1,16 @@
<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="盘点单据ID" prop="stockCheckId">
<el-form-item :label="$t('checkStockCheck.stockCheckId')" prop="stockCheckId"> <!-- 盘点单据ID -->
<el-input
v-model="queryParams.stockCheckId"
placeholder="请输入盘点单据ID"
:placeholder="$t('checkStockCheck.inputStockCheckId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="盘库类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="请选择盘库类型" clearable>
<el-form-item :label="$t('checkStockCheck.checkType')" prop="checkType"> <!-- 盘库类型 -->
<el-select v-model="queryParams.checkType" :placeholder="$t('checkStockCheck.selectCheckType')" clearable>
<el-option
v-for="dict in dict.type.check_stock_type"
:key="dict.value"
@@ -19,8 +19,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择盘库类型" clearable>
<el-form-item :label="$t('checkStockCheck.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('checkStockCheck.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.check_bill_status"
:key="dict.value"
@@ -45,8 +45,8 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-form-item :label="$t('checkStockCheck.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-select v-model="queryParams.warehouseId" :placeholder="$t('checkStockCheck.selectWarehouse')" clearable>
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
@@ -144,8 +144,8 @@
/>
</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('checkStockCheck.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkStockCheck.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -159,7 +159,7 @@
:disabled="multiple"
@click="handleInvalidated"
v-hasPermi="['check:stockCheck:edit']"
>单据作废</el-button>
>{{$t('checkStockCheck.invalidate')}}</el-button> <!-- 单据作废 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -169,7 +169,7 @@
size="mini"
@click="handleReview"
v-hasPermi="['check:stockCheck:edit']"
>单据审核</el-button>
>{{$t('checkStockCheck.review')}}</el-button> <!-- 单据审核 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -180,7 +180,7 @@
:disabled="single"
@click="handleConfirmation"
v-hasPermi="['check:stockCheck:edit']"
>单据确认</el-button>
>{{$t('checkStockCheck.confirm')}}</el-button> <!-- 单据确认 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -189,25 +189,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="盘点单据ID" align="center" prop="stockCheckId" />
<el-table-column label="盘库类型" align="center" prop="checkType">
<el-table-column :label="$t('checkStockCheck.stockCheckId')" align="center" prop="stockCheckId" /> <!-- 盘点单据ID -->
<el-table-column :label="$t('checkStockCheck.checkType')" align="center" 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="单据状态" align="center" prop="status" >
<el-table-column :label="$t('checkStockCheck.status')" align="center" 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="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="单据来源" align="center" prop="stockSource" />
<el-table-column label="部门编码" align="center" prop="departmentNo" />
<el-table-column label="创建人" align="center" prop="createManId" />
<el-table-column label="建立时间" align="center" prop="createDate" />
<el-table-column label=" 完成日期" align="center" prop="finishDate" />
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库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>
<pagination
@@ -220,19 +219,19 @@
<el-table v-loading="detailLoading" :data="stockCheckDetailList" @selection-change="handleDetailSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="子单ID" align="center" prop="stockCheckDetailId" />
<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="主单ID" align="center" prop="stockCheckId" />
<el-table-column label="批次号" align="center" prop="lotNo"/>
<el-table-column :label="$t('checkStockCheck.mainId')" align="center" prop="stockCheckId" /> <!-- 主单ID -->
<el-table-column :label="$t('checkStockCheck.lotNo')" align="center" prop="lotNo"/> <!-- 批次号 -->
<!-- <el-table-column label="物料ID" align="center" prop="productGuid"/>-->
<el-table-column label="物料编码" align="center" prop="productId"/>
<el-table-column label="物料描述" align="center" prop="extraField.materialDesc"/>
<el-table-column label="英文描述" align="center" prop="extraField.englishDesc"/>
<el-table-column label="箱号" align="center" prop="extraField.cartonNo"/>
<el-table-column label="包装方式" align="center" prop="extraField.packingMethod"/>
<el-table-column label="计划数量" align="center" prop="quantity"/>
<el-table-column label="扫码数量" align="center" prop="scanNum"/>
<el-table-column label="实际数量" align="center" prop="assignNum"/>
<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"/> <!-- 箱号 -->
<el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> <!-- 包装方式 -->
<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>
<pagination
@@ -318,16 +317,16 @@ export default {
// 表单校验
rules: {
stockCheckId: [
{ required: true, message: "盘点单据ID不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkStockCheck.stockCheckIdRequired'), trigger: "blur" }
],
checkType: [
{ required: true, message: "盘库类型不能为空", trigger: "change" }
{ required: true, message: this.$t('checkStockCheck.checkTypeRequired'), trigger: "change" }
],
createDate: [
{ required: true, message: "建立时间不能为空", trigger: "blur" }
{ required: true, message: this.$t('checkStockCheck.createDateRequired'), trigger: "blur" }
],
status: [
{ required: true, message: "单据状态不能为空", trigger: "change" }
{ required: true, message: this.$t('checkStockCheck.statusRequired'), trigger: "change" }
],
}
}
@@ -438,13 +437,13 @@ export default {
if (valid) {
if (this.form.stockGuid != null) {
updateStockCheck(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess(this.$t('checkStockCheck.editSuccess'))
this.open = false
this.getList()
})
} else {
addStockCheck(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.$modal.msgSuccess(this.$t('checkStockCheck.addSuccess'))
this.open = false
this.getList()
})
@@ -461,18 +460,18 @@ export default {
"status": "5"
}
updateStockCheck(data).then(response => {
this.$modal.msgSuccess("作废成功")
this.$modal.msgSuccess(this.$t('checkStockCheck.invalidateSuccess'))
this.getList()
})
} else {
this.$modal.msgError("只有未审核的单据可以作废")
this.$modal.msgError(this.$t('checkStockCheck.onlyUnreviewedCanInvalidate'))
}
},
/** 审核按钮操作 */
handleReview(row) {
let stockCheck = this.stockCheckList.find(item => item.stockGuid === (row?.stockGuid || this.ids[0]));
if (stockCheck.status === "2") {
this.$modal.msgError("单据已审核，请勿重复审核")
this.$modal.msgError(this.$t('checkStockCheck.alreadyReviewed'))
return
}
if (stockCheck.status === "1") {
@@ -481,11 +480,11 @@ export default {
"status": "2"
}
updateStockCheck(data).then(response => {
this.$modal.msgSuccess("审核成功")
this.$modal.msgSuccess(this.$t('checkStockCheck.reviewSuccess'))
this.getList()
})
} else {
this.$modal.msgError("只有未审核的单据可以审核")
this.$modal.msgError(this.$t('checkStockCheck.onlyUnreviewedCanReview'))
}
},
/** 确认按钮操作 */
@@ -497,11 +496,11 @@ export default {
"status": "4"
}
updateStockCheck(data).then(response => {
this.$modal.msgSuccess("确认成功")
this.$modal.msgSuccess(this.$t('checkStockCheck.confirmSuccess'))
this.getList()
})
} else {
this.$modal.msgError("只有已审核的单据可以确认")
this.$modal.msgError(this.$t('checkStockCheck.onlyReviewedCanConfirm'))
}
},
}

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

@@ -1,57 +1,57 @@
<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="productId">
<el-form-item :label="$t('searchStockSummary.productId')" prop="productId"> <!-- 物料编码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
:placeholder="$t('searchStockSummary.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchStockSummary.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchStockSummary.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchStockSummary.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchStockSummary.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('searchStockSummary.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('searchStockSummary.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('searchStockSummary.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('searchStockSummary.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId">
<el-form-item :label="$t('searchStockSummary.roadwayId')" prop="roadwayId"> <!-- 巷道 -->
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道"
:placeholder="$t('searchStockSummary.inputRoadwayId')"
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('searchStockSummary.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchStockSummary.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -64,7 +64,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:StockSummary:export']"
>导出</el-button>
>{{$t('searchStockSummary.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -75,16 +75,16 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column label="巷道" align="center" prop="roadwayId" />
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column :label="$t('searchStockSummary.productId')" align="center" prop="productId" /> <!-- 物料编码 -->
<el-table-column :label="$t('searchStockSummary.productName')" align="center" prop="productName" /> <!-- 物料名称 -->
<el-table-column :label="$t('searchStockSummary.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchStockSummary.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchStockSummary.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('searchStockSummary.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('searchStockSummary.roadwayId')" align="center" prop="roadwayId" /> <!-- 巷道 -->
<el-table-column :label="$t('searchStockSummary.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
</el-table>
<pagination
v-show="total>0"
:total="total"
@@ -170,4 +170,4 @@
}
}
};
</script>
</script>

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

@@ -33,8 +33,8 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseInFlow.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
@@ -43,90 +43,42 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="数量" prop="quantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- placeholder="请输入数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="创建人" prop="createMan">
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.createMan')" prop="createMan"> <!-- 创建人 -->
<el-input
v-model="queryParams.createMan"
placeholder="请输入创建人"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputCreateMan')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库名称" prop="warehouseName">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseName"-->
<!-- placeholder="请输入仓库名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库地址" prop="address">-->
<!-- <el-input-->
<!-- v-model="queryParams.address"-->
<!-- placeholder="请输入仓库地址"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库描述" prop="cDesc">-->
<!-- <el-input-->
<!-- v-model="queryParams.cDesc"-->
<!-- placeholder="请输入仓库描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseKind"-->
<!-- placeholder="请输入仓库级别"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="是否可用" prop="isCurrent">
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
<el-input
v-model="queryParams.isCurrent"
placeholder="请输入是否可用"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputIsCurrent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewFlatWarehouseInFlow.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewFlatWarehouseInFlow.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -156,8 +108,8 @@
<!-- />-->
<!-- </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('searchViewFlatWarehouseInFlow.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewFlatWarehouseInFlow.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -202,7 +154,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewFlatWarehouseInFlow:export']"
>导出</el-button>
>{{$t('searchViewFlatWarehouseInFlow.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -213,22 +165,22 @@
<!-- <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="创建人" align="center" prop="createMan" />
<el-table-column label="物料ID" 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="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column label="仓库id" align="center" prop="warehouseId" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="仓库地址" align="center" prop="address" />
<el-table-column label="仓库描述" align="center" prop="cDesc" />
<el-table-column label="仓库级别" align="center" prop="warehouseKind" />
<el-table-column label="仓库类型" align="center" prop="warehouseType" />
<el-table-column label="是否可用" align="center" prop="isCurrent" />
<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.spec')" align="center" prop="spec" /> <!-- 规格 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.unit')" align="center" prop="unit" /> <!-- 单位 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewFlatWarehouseInFlow.description')" align="center" prop="remark" /> <!-- 描述 -->
<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="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->

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

@@ -1,8 +1,8 @@
<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="warehouseId">
<el-select v-model="queryParams.warehouseId" placeholder="请选择仓库" clearable>
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouse')" prop="warehouseId"> <!-- 仓库 -->
<el-select v-model="queryParams.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
@@ -43,10 +43,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -59,10 +59,10 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="创建人" prop="createMan">
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.createMan')" prop="createMan"> <!-- 创建人 -->
<el-input
v-model="queryParams.createMan"
placeholder="请输入创建人"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputCreateMan')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -107,57 +107,33 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="是否可用" prop="isCurrent">
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.isCurrent')" prop="isCurrent"> <!-- 是否可用 -->
<el-input
v-model="queryParams.isCurrent"
placeholder="请输入是否可用"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputIsCurrent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewFlatWarehouseOutFlow.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="品牌" prop="cargoNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoNo"-->
<!-- placeholder="请输入品牌"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
<!-- placeholder="请输入单位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="价格" prop="price">-->
<!-- <el-input-->
<!-- v-model="queryParams.price"-->
<!-- 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('searchViewFlatWarehouseOutFlow.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('searchViewFlatWarehouseOutFlow.reset') }}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -202,7 +178,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewFlatWarehouseOutFlow:export']"
>导出</el-button>
>{{ $t('searchViewFlatWarehouseOutFlow.export') }}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -213,22 +189,22 @@
<!-- <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="创建人" align="center" prop="createMan" />
<el-table-column label="物料ID" 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="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="价格" align="center" prop="price" />
<el-table-column label="描述" align="center" prop="remark" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="仓库地址" align="center" prop="address" />
<el-table-column label="仓库描述" align="center" prop="cDesc" />
<el-table-column label="仓库级别" align="center" prop="warehouseKind" />
<el-table-column label="仓库类型" align="center" prop="warehouseType" />
<el-table-column label="是否可用" align="center" prop="isCurrent" />
<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.price')" align="center" prop="price" /> <!-- 价格 -->
<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="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
@@ -276,55 +252,55 @@
<el-form-item label="物料GUID" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productId')" prop="productId">
<el-input v-model="form.productId" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputProductId')" />
</el-form-item>
<el-form-item label="入出库数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入入出库数量" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.quantity')" prop="quantity">
<el-input v-model="form.quantity" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputQuantity')" />
</el-form-item>
<el-form-item label="创建人" prop="createMan">
<el-input v-model="form.createMan" placeholder="请输入创建人" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.createMan')" prop="createMan">
<el-input v-model="form.createMan" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputCreateMan')" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouseId')" prop="warehouseId">
<el-input v-model="form.warehouseId" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputWarehouseId')" />
</el-form-item>
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouseName')" prop="warehouseName">
<el-input v-model="form.warehouseName" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputWarehouseName')" />
</el-form-item>
<el-form-item label="仓库地址" prop="address">
<el-input v-model="form.address" placeholder="请输入仓库地址" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.address')" prop="address">
<el-input v-model="form.address" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputAddress')" />
</el-form-item>
<el-form-item label="仓库描述" prop="cDesc">
<el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.isCurrent')" prop="isCurrent">
<el-input v-model="form.isCurrent" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputIsCurrent')" />
</el-form-item>
<el-form-item label="仓库级别" prop="warehouseKind">
<el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.productName')" prop="productName">
<el-input v-model="form.productName" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputProductName')" />
</el-form-item>
<el-form-item label="是否可用" prop="isCurrent">
<el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.spec')" prop="spec">
<el-input v-model="form.spec" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputSpec')" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.brand')" prop="cargoNo"> <!-- 品牌 -->
<el-input v-model="form.cargoNo" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputBrand')" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.unit')" prop="unit"> <!-- 单位 -->
<el-input v-model="form.unit" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputUnit')" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.price')" prop="price"> <!-- 价格 -->
<el-input v-model="form.price" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputPrice')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.description')" prop="description"> <!-- 描述 -->
<el-input v-model="form.description" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputDescription')" />
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouseDesc')" prop="cDesc"> <!-- 仓库描述 -->
<el-input v-model="form.cDesc" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputWarehouseDesc')" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
<el-form-item :label="$t('searchViewFlatWarehouseOutFlow.warehouseLevel')" prop="warehouseKind"> <!-- 仓库级别 -->
<el-input v-model="form.warehouseKind" :placeholder="$t('searchViewFlatWarehouseOutFlow.inputWarehouseLevel')" />
</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('searchViewFlatWarehouseOutFlow.confirm') }}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{ $t('searchViewFlatWarehouseOutFlow.cancel') }}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>

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

@@ -17,8 +17,8 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-form-item :label="$t('searchViewInJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('searchViewInJobFlow.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,10 +27,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('searchViewInJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('searchViewInJobFlow.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -60,34 +60,34 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="排" prop="thePlatoon">
<el-form-item :label="$t('searchViewInJobFlow.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
:placeholder="$t('searchViewInJobFlow.inputThePlatoon')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-form-item :label="$t('searchViewInJobFlow.theColumn')" prop="theColumn"> <!-- 列 -->
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
:placeholder="$t('searchViewInJobFlow.inputTheColumn')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-form-item :label="$t('searchViewInJobFlow.theFloor')" prop="theFloor"> <!-- 层 -->
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
:placeholder="$t('searchViewInJobFlow.inputTheFloor')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘号" prop="trayCode">
<el-form-item :label="$t('searchViewInJobFlow.trayCode')" prop="trayCode"> <!-- 托盘号 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘号"
:placeholder="$t('searchViewInJobFlow.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -126,18 +126,18 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewInJobFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewInJobFlow.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('searchViewInJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('searchViewInJobFlow.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -150,8 +150,8 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('searchViewInJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewInJobFlow.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -160,10 +160,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewInJobFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewInJobFlow.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -200,28 +200,28 @@
<!-- placeholder="请选择创建时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="仓库ID" prop="warehouseId">
<el-form-item :label="$t('searchViewInJobFlow.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('searchViewInJobFlow.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('searchViewInJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
:placeholder="$t('searchViewInJobFlow.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('searchViewInJobFlow.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择结束时间">
:placeholder="$t('searchViewInJobFlow.selectFinishTime')">
</el-date-picker>
</el-form-item>
@@ -251,8 +251,8 @@
<!-- />-->
<!-- </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('searchViewInJobFlow.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewInJobFlow.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -297,67 +297,67 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewInJobFlow:export']"
>导出</el-button>
>{{$t('searchViewInJobFlow.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewInJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="作业ID" align="center" prop="jobId" />
<el-table-column label="子作业ID" align="center" prop="jobDetailId" />
<el-table-column label="状态" align="center" prop="status">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="托盘号" align="center" prop="trayCode" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<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="货位名称" align="center" prop="cargoSpaceName" />
<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="优先级" align="center" prop="priority" />
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<el-table-column :label="$t('searchViewInJobFlow.priority')" align="center" prop="priority" />
<el-table-column :label="$t('searchViewInJobFlow.executionPhase')" align="center" 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="作业类型" align="center" prop="inOrOut" />
<el-table-column label="入口ID" align="center" prop="entranceId" />
<el-table-column label="物料ID" align="center" prop="productId" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="垛型ID" align="center" prop="stackingId" />
<el-table-column label="库存状态" align="center" prop="stockStatus">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="入库数量" align="center" prop="inQuantity" />
<el-table-column label="单据ID" align="center" prop="inOrOutId" />
<el-table-column label="子单据ID" align="center" prop="inOrOutDId" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<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="开始时间" align="center" prop="startTime" width="180">
<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="结束时间" align="center" prop="finishTime" width="180">
<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="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<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="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -389,14 +389,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="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
<el-form-item :label="$t('searchViewInJobFlow.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('searchViewInJobFlow.inputJobId')" />
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input v-model="form.jobDetailId" placeholder="请输入子作业ID" />
<el-form-item :label="$t('searchViewInJobFlow.jobDetailId')" prop="jobDetailId"> <!-- 子作业ID -->
<el-input v-model="form.jobDetailId" :placeholder="$t('searchViewInJobFlow.inputJobDetailId')" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-form-item :label="$t('searchViewInJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="form.status" :placeholder="$t('searchViewInJobFlow.selectStatus')">
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -405,35 +405,35 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
<el-form-item :label="$t('searchViewInJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input v-model="form.taskNo" :placeholder="$t('searchViewInJobFlow.inputTaskNo')" />
</el-form-item>
<el-form-item label="托盘号" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘号" />
<el-form-item :label="$t('searchViewInJobFlow.trayCode')" prop="trayCode"> <!-- 托盘号 -->
<el-input v-model="form.trayCode" :placeholder="$t('searchViewInJobFlow.inputTrayCode')" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
<el-form-item :label="$t('searchViewInJobFlow.roadwayId')" prop="roadwayId"> <!-- 巷道ID -->
<el-input v-model="form.roadwayId" :placeholder="$t('searchViewInJobFlow.inputRoadwayId')" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-form-item :label="$t('searchViewInJobFlow.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewInJobFlow.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
<el-form-item :label="$t('searchViewInJobFlow.cargoSpaceName')" prop="cargoSpaceName"> <!-- 货位名称 -->
<el-input v-model="form.cargoSpaceName" :placeholder="$t('searchViewInJobFlow.inputCargoSpaceName')" />
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-input v-model="form.thePlatoon" placeholder="请输入排" />
<el-form-item :label="$t('searchViewInJobFlow.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input v-model="form.thePlatoon" :placeholder="$t('searchViewInJobFlow.inputThePlatoon')" />
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input v-model="form.theColumn" placeholder="请输入列" />
<el-form-item :label="$t('searchViewInJobFlow.theColumn')" prop="theColumn"> <!-- 列 -->
<el-input v-model="form.theColumn" :placeholder="$t('searchViewInJobFlow.inputTheColumn')" />
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input v-model="form.theFloor" placeholder="请输入层" />
<el-form-item :label="$t('searchViewInJobFlow.theFloor')" prop="theFloor"> <!-- 层 -->
<el-input v-model="form.theFloor" :placeholder="$t('searchViewInJobFlow.inputTheFloor')" />
</el-form-item>
<el-form-item label="优先级" prop="priority">
<el-input v-model="form.priority" placeholder="请输入优先级" />
<el-form-item :label="$t('searchViewInJobFlow.priority')" prop="priority"> <!-- 优先级 -->
<el-input v-model="form.priority" :placeholder="$t('searchViewInJobFlow.inputPriority')" />
</el-form-item>
<el-form-item label="执行阶段" prop="executionPhase">
<el-select v-model="form.executionPhase" placeholder="请选择执行阶段">
<el-form-item :label="$t('searchViewInJobFlow.executionPhase')" prop="executionPhase"> <!-- 执行阶段 -->
<el-select v-model="form.executionPhase" :placeholder="$t('searchViewInJobFlow.selectExecutionPhase')">
<el-option
v-for="dict in dict.type.execution_phase_type"
:key="dict.value"
@@ -442,23 +442,23 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="作业类型" prop="inOrOut">
<el-input v-model="form.inOrOut" placeholder="请输入作业类型" />
<el-form-item :label="$t('searchViewInJobFlow.inOrOut')" prop="inOrOut"> <!-- 作业类型 -->
<el-input v-model="form.inOrOut" :placeholder="$t('searchViewInJobFlow.inputInOrOut')" />
</el-form-item>
<el-form-item label="入口ID" prop="entranceId">
<el-input v-model="form.entranceId" placeholder="请输入入口ID" />
<el-form-item :label="$t('searchViewInJobFlow.entranceId')" prop="entranceId"> <!-- 入口ID -->
<el-input v-model="form.entranceId" :placeholder="$t('searchViewInJobFlow.inputEntranceId')" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
<el-form-item :label="$t('searchViewInJobFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input v-model="form.productId" :placeholder="$t('searchViewInJobFlow.inputProductId')" />
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批号" />
<el-form-item :label="$t('searchViewInJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input v-model="form.lotNo" :placeholder="$t('searchViewInJobFlow.inputLotNo')" />
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
<el-form-item :label="$t('searchViewInJobFlow.stackingId')" prop="stackingId"> <!-- 垛型ID -->
<el-input v-model="form.stackingId" :placeholder="$t('searchViewInJobFlow.inputStackingId')" />
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-form-item :label="$t('searchViewInJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" :placeholder="$t('searchViewInJobFlow.selectStockStatus')">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -467,50 +467,50 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="入库数量" prop="inQuantity">
<el-input v-model="form.inQuantity" placeholder="请输入入库数量" />
<el-form-item :label="$t('searchViewInJobFlow.inQuantity')" prop="inQuantity"> <!-- 入库数量 -->
<el-input v-model="form.inQuantity" :placeholder="$t('searchViewInJobFlow.inputInQuantity')" />
</el-form-item>
<el-form-item label="单据ID" prop="inOrOutId">
<el-input v-model="form.inOrOutId" placeholder="请输入单据ID" />
<el-form-item :label="$t('searchViewInJobFlow.inOrOutId')" prop="inOrOutId"> <!-- 单据ID -->
<el-input v-model="form.inOrOutId" :placeholder="$t('searchViewInJobFlow.inputInOrOutId')" />
</el-form-item>
<el-form-item label="子单据ID" prop="inOrOutDId">
<el-input v-model="form.inOrOutDId" placeholder="请输入子单据ID" />
<el-form-item :label="$t('searchViewInJobFlow.inOrOutDId')" prop="inOrOutDId"> <!-- 子单据ID -->
<el-input v-model="form.inOrOutDId" :placeholder="$t('searchViewInJobFlow.inputInOrOutDId')" />
</el-form-item>
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('searchViewInJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
:placeholder="$t('searchViewInJobFlow.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('searchViewInJobFlow.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="form.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择结束时间">
:placeholder="$t('searchViewInJobFlow.selectFinishTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
<el-form-item :label="$t('searchViewInJobFlow.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
<el-input v-model="form.warehouseId" :placeholder="$t('searchViewInJobFlow.inputWarehouseId')" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item :label="$t('searchViewInJobFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input v-model="form.productName" :placeholder="$t('searchViewInJobFlow.inputProductName')" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item :label="$t('searchViewInJobFlow.spec')" prop="spec"> <!-- 规格 -->
<el-input v-model="form.spec" :placeholder="$t('searchViewInJobFlow.inputSpec')" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
<el-form-item :label="$t('searchViewInJobFlow.cargoNo')" prop="cargoNo"> <!-- 品牌 -->
<el-input v-model="form.cargoNo" :placeholder="$t('searchViewInJobFlow.inputCargoNo')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<el-form-item :label="$t('searchViewInJobFlow.unit')" prop="unit"> <!-- 单位 -->
<el-input v-model="form.unit" :placeholder="$t('searchViewInJobFlow.inputUnit')" />
</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('searchViewInJobFlow.confirm')}}</el-button> <!-- 确 定 -->
<el-button @click="cancel">{{$t('searchViewInJobFlow.cancel')}}</el-button> <!-- 取 消 -->
</div>
</el-dialog>
</div>
@@ -661,7 +661,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加入库作业流水"
this.title = this.$t('searchViewInJobFlow.addTitle')
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -670,7 +670,7 @@ export default {
getViewInJobFlow(jobId).then(response => {
this.form = response.data
this.open = true
this.title = "修改入库作业流水"
this.title = this.$t('searchViewInJobFlow.editTitle')
})
},
/** 提交按钮 */
@@ -679,13 +679,13 @@ export default {
if (valid) {
if (this.form.jobId != null) {
updateViewInJobFlow(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess(this.$t('searchViewInJobFlow.editSuccess'))
this.open = false
this.getList()
})
} else {
addViewInJobFlow(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.$modal.msgSuccess(this.$t('searchViewInJobFlow.addSuccess'))
this.open = false
this.getList()
})
@@ -696,11 +696,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const jobIds = row.jobId || this.ids
this.$modal.confirm('是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？').then(function() {
this.$modal.confirm(this.$t('searchViewInJobFlow.deleteConfirm') + jobIds + '"的数据项？').then(function() {
return delViewInJobFlow(jobIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess(this.$t('searchViewInJobFlow.deleteSuccess'))
}).catch(() => {})
},
/** 导出按钮操作 */

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

@@ -1,10 +1,10 @@
<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="作业ID" prop="jobId">
<el-form-item :label="$t('searchViewOutJobFlow.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input
v-model="queryParams.jobId"
placeholder="请输入作业ID"
:placeholder="$t('searchViewOutJobFlow.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -17,8 +17,8 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-form-item :label="$t('searchViewOutJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('searchViewOutJobFlow.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.mydo_job_status"
:key="dict.value"
@@ -27,24 +27,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('searchViewOutJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input
v-model="queryParams.taskNo"
placeholder="请输入任务号"
:placeholder="$t('searchViewOutJobFlow.inputTaskNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('searchViewOutJobFlow.trayCode')" prop="trayCode"> <!-- 托盘码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘码"
:placeholder="$t('searchViewOutJobFlow.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewOutJobFlow.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -77,26 +77,26 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="排" prop="thePlatoon">
<el-form-item :label="$t('searchViewOutJobFlow.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
:placeholder="$t('searchViewOutJobFlow.inputThePlatoon')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-form-item :label="$t('searchViewOutJobFlow.theColumn')" prop="theColumn"> <!-- 列 -->
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
:placeholder="$t('searchViewOutJobFlow.inputTheColumn')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-form-item :label="$t('searchViewOutJobFlow.theFloor')" prop="theFloor"> <!-- 层 -->
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
:placeholder="$t('searchViewOutJobFlow.inputTheFloor')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -135,26 +135,26 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewOutJobFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewOutJobFlow.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewOutJobFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewOutJobFlow.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('searchViewOutJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('searchViewOutJobFlow.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -192,20 +192,20 @@
<!-- placeholder="请选择创建时间">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item label="开始时间" prop="startTime">
<el-form-item :label="$t('searchViewOutJobFlow.startTime')" prop="startTime"> <!-- 开始时间 -->
<el-date-picker clearable
v-model="queryParams.startTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
:placeholder="$t('searchViewOutJobFlow.selectStartTime')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-form-item :label="$t('searchViewOutJobFlow.finishTime')" prop="finishTime"> <!-- 结束时间 -->
<el-date-picker clearable
v-model="queryParams.finishTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择开始时间">
:placeholder="$t('searchViewOutJobFlow.selectFinishTime')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
@@ -250,8 +250,8 @@
<!-- />-->
<!-- </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('searchViewOutJobFlow.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewOutJobFlow.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -296,7 +296,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewOutJobFlow:export']"
>导出
>{{$t('searchViewOutJobFlow.export')}} <!-- 导出 -->
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -304,62 +304,62 @@
<el-table v-loading="loading" :data="ViewOutJobFlowList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="作业ID" align="center" prop="jobId"/>
<el-table-column label="子作业ID" align="center" prop="jobDetailId"/>
<el-table-column label="状态" align="center" prop="status">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="任务号" align="center" prop="taskNo"/>
<el-table-column label="托盘码" align="center" prop="trayCode"/>
<el-table-column label="巷道ID" align="center" prop="roadwayId"/>
<el-table-column label="货位ID" align="center" prop="cargoSpaceId"/>
<el-table-column label="货位名称" 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="优先级" align="center" prop="priority"/>
<el-table-column label="执行阶段" align="center" prop="executionPhase">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>
</template>
</el-table-column>
<el-table-column label="作业类型" align="center" prop="inOrOut"/>
<el-table-column label="出口ID" align="center" prop="exitId"/>
<el-table-column label="物料ID" align="center" prop="productId"/>
<el-table-column label="批号" align="center" prop="lotNo"/>
<el-table-column label="剁型ID" align="center" prop="stackingId"/>
<el-table-column label="库存状态" align="center" prop="stockStatus">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="出库数量" align="center" prop="outQuantity"/>
<el-table-column label="回流数量" align="center" prop="giveNum"/>
<el-table-column label="单据ID" align="center" prop="inOrOutId"/>
<el-table-column label="子单据ID" align="center" prop="inOrOutDId"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<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="开始时间" align="center" prop="startTime" width="180">
<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="结束时间" align="center" prop="finishTime" width="180">
<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="仓库ID" align="center" prop="warehouseId"/>
<el-table-column label="物料名称" align="center" prop="productName"/>
<el-table-column label="规格" align="center" prop="spec"/>
<el-table-column label="品牌" align="center" prop="cargoNo"/>
<el-table-column label="单位" align="center" prop="unit"/>
<el-table-column label="客户名称" align="center" prop="customerName"/>
<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="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -388,16 +388,25 @@
@pagination="getList"
/>
<!-- 导出对话框 -->
<el-dialog :title="$t('searchViewOutJobFlow.export')" :visible.sync="exportOpen" width="400px" append-to-body>
<div class="el-message-box__status el-icon-question">{{$t('searchViewOutJobFlow.confirmExport')}}</div>
<div slot="footer" class="dialog-footer">
<el-button @click="exportOpen = false">{{$t('searchViewOutJobFlow.cancel')}} <!-- 取消 --></el-button>
<el-button type="primary" @click="confirmExport">{{$t('searchViewOutJobFlow.confirm')}} <!-- 确定 --></el-button>
</div>
</el-dialog>
<!-- 添加或修改出库做业务流水对话框 -->
<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="作业ID" prop="jobId">
<el-form-item :label="$t('searchViewOutJobFlow.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" placeholder="请输入作业ID"/>
</el-form-item>
<el-form-item label="子作业ID" prop="jobDetailId">
<el-input v-model="form.jobDetailId" placeholder="请输入子作业ID"/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item :label="$t('searchViewOutJobFlow.status')" prop="status"> <!-- 状态 -->
<el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.mydo_job_status"
@@ -407,10 +416,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-form-item :label="$t('searchViewOutJobFlow.taskNo')" prop="taskNo"> <!-- 任务号 -->
<el-input v-model="form.taskNo" placeholder="请输入任务号"/>
</el-form-item>
<el-form-item label="托盘码" prop="trayCode">
<el-form-item :label="$t('searchViewOutJobFlow.trayCode')" prop="trayCode"> <!-- 托盘码 -->
<el-input v-model="form.trayCode" placeholder="请输入托盘码"/>
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
@@ -422,13 +431,13 @@
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称"/>
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-form-item :label="$t('searchViewOutJobFlow.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input v-model="form.thePlatoon" placeholder="请输入排"/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-form-item :label="$t('searchViewOutJobFlow.theColumn')" prop="theColumn"> <!-- 列 -->
<el-input v-model="form.theColumn" placeholder="请输入列"/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-form-item :label="$t('searchViewOutJobFlow.theFloor')" prop="theFloor"> <!-- 层 -->
<el-input v-model="form.theFloor" placeholder="请输入层"/>
</el-form-item>
<el-form-item label="优先级" prop="priority">
@@ -450,16 +459,16 @@
<el-form-item label="出口ID" prop="exitId">
<el-input v-model="form.exitId" placeholder="请输入出口ID"/>
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewOutJobFlow.productId')" prop="productId"> <!-- 物料ID -->
<el-input v-model="form.productId" placeholder="请输入物料ID"/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('searchViewOutJobFlow.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input v-model="form.lotNo" placeholder="请输入批号"/>
</el-form-item>
<el-form-item label="剁型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入剁型ID"/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-form-item :label="$t('searchViewOutJobFlow.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-option
v-for="dict in dict.type.stock_status"
@@ -480,7 +489,7 @@
v-model="form.startTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择开始时间">
placeholder="请选择结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
@@ -494,7 +503,7 @@
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID"/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewOutJobFlow.productName')" prop="productName"> <!-- 物料名称 -->
<el-input v-model="form.productName" placeholder="请输入物料名称"/>
</el-form-item>
<el-form-item label="规格" prop="spec">
@@ -511,8 +520,8 @@
</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('searchViewOutJobFlow.confirm')}}</el-button> <!-- 确 定 -->
<el-button @click="cancel">{{$t('searchViewOutJobFlow.cancel')}}</el-button> <!-- 取 消 -->
</div>
</el-dialog>
</div>
@@ -550,6 +559,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 是否显示导出弹出层
exportOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -717,11 +728,17 @@ export default {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('search/ViewOutJobFlow/export', {
...this.queryParams
}, `ViewOutJobFlow_${new Date().getTime()}.xlsx`)
}
handleExport() {
this.exportOpen = true;
},
/** 确认导出 */
confirmExport() {
this.download('search/ViewOutJobFlow/export', {
...this.queryParams
}, `ViewOutJobFlow_${new Date().getTime()}.xlsx`)
this.$modal.msgSuccess($t('searchViewOutJobFlow.exportSuccess'));
this.exportOpen = false;
}
}
}
</script>

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

@@ -9,153 +9,153 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="库存ID" prop="stockId">
<el-form-item :label="$t('searchViewStockDetail.stockId')" prop="stockId"> <!-- 库存ID -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存ID"
:placeholder="$t('searchViewStockDetail.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-form-item :label="$t('searchViewStockDetail.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位ID"
:placeholder="$t('searchViewStockDetail.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('searchViewStockDetail.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('searchViewStockDetail.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-form-item :label="$t('searchViewStockDetail.quantity')" prop="quantity"> <!-- 数量 -->
<el-input
v-model="queryParams.quantity"
placeholder="请输入数量"
:placeholder="$t('searchViewStockDetail.inputQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-form-item :label="$t('searchViewStockDetail.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input
v-model="queryParams.jobId"
placeholder="请输入作业ID"
:placeholder="$t('searchViewStockDetail.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('searchViewStockDetail.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('searchViewStockDetail.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库子单ID" prop="stockinDetailId" style="white-space: nowrap">
<el-form-item :label="$t('searchViewStockDetail.stockinDetailId')" prop="stockinDetailId" style="white-space: nowrap"> <!-- 入库子单ID -->
<el-input
v-model="queryParams.stockinDetailId"
placeholder="请输入入库子单ID"
:placeholder="$t('searchViewStockDetail.inputStockinDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-form-item :label="$t('searchViewStockDetail.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
placeholder="请输入入库时间"
:placeholder="$t('searchViewStockDetail.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('searchViewStockDetail.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="剁型ID" prop="stackingId">
<el-form-item :label="$t('searchViewStockDetail.stackingId')" prop="stackingId"> <!-- 剁型ID -->
<el-input
v-model="queryParams.stackingId"
placeholder="请输入剁型ID"
:placeholder="$t('searchViewStockDetail.inputStackingId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-form-item :label="$t('searchViewStockDetail.cargoSpaceName')" prop="cargoSpaceName"> <!-- 货位名称 -->
<el-input
v-model="queryParams.cargoSpaceName"
placeholder="请输入货位名称"
:placeholder="$t('searchViewStockDetail.inputCargoSpaceName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-form-item :label="$t('searchViewStockDetail.roadwayId')" prop="roadwayId"> <!-- 巷道ID -->
<el-input
v-model="queryParams.roadwayId"
placeholder="请输入巷道ID"
:placeholder="$t('searchViewStockDetail.inputRoadwayId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否锁定" prop="locked">
<el-form-item :label="$t('searchViewStockDetail.locked')" prop="locked"> <!-- 是否锁定 -->
<el-input
v-model="queryParams.locked"
placeholder="请输入是否锁定"
:placeholder="$t('searchViewStockDetail.inputLocked')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewStockDetail.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewStockDetail.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewStockDetail.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewStockDetail.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewStockDetail.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewStockDetail.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-form-item :label="$t('searchViewStockDetail.unit')" prop="unit"> <!-- 单位 -->
<el-input
v-model="queryParams.unit"
placeholder="请输入单位"
:placeholder="$t('searchViewStockDetail.inputUnit')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="价格" prop="price">
<el-form-item :label="$t('searchViewStockDetail.price')" prop="price"> <!-- 价格 -->
<el-input
v-model="queryParams.price"
placeholder="请输入价格"
:placeholder="$t('searchViewStockDetail.inputPrice')"
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('searchViewStockDetail.search')}} <!-- 搜索 --></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockDetail.reset')}} <!-- 重置 --></el-button>
</el-form-item>
</el-form>
@@ -200,7 +200,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockDetail:export']"
>导出</el-button>
>{{$t('searchViewStockDetail.export')}} <!-- 导出 --></el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -208,25 +208,25 @@
<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="库存ID" align="center" prop="stockId" />
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="数量" align="center" prop="quantity" />
<el-table-column label="作业ID" align="center" prop="jobId" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="入库子单ID" align="center" prop="stockinDetailId" />
<el-table-column label="入库时间" align="center" prop="inDate" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column label="剁型ID" align="center" prop="stackingId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
<el-table-column label="货位状态" align="center" prop="cargoSpaceStatus" />
<el-table-column label="是否锁定" align="center" prop="locked" />
<el-table-column label="物料ID" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="价格" align="center" prop="price" />
<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="warehouseId" />
<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.locked')" align="center" prop="locked" />
<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('searchViewStockDetail.price')" align="center" prop="price" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -258,67 +258,67 @@
<!-- 添加或修改库存明细查询对话框 -->
<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="id" prop="onlyIdentity">
<el-input v-model="form.onlyIdentity" placeholder="请输入id" />
<el-form-item :label="$t('searchViewStockDetail.onlyIdentity')" prop="onlyIdentity">
<el-input v-model="form.onlyIdentity" :placeholder="$t('searchViewStockDetail.inputOnlyIdentity')" />
</el-form-item>
<el-form-item label="库存ID" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
<el-form-item :label="$t('searchViewStockDetail.stockId')" prop="stockId">
<el-input v-model="form.stockId" :placeholder="$t('searchViewStockDetail.inputStockId')" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-form-item :label="$t('searchViewStockDetail.cargoSpaceId')" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockDetail.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('searchViewStockDetail.trayCode')" prop="trayCode">
<el-input v-model="form.trayCode" :placeholder="$t('searchViewStockDetail.inputTrayCode')" />
</el-form-item>
<el-form-item label="数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入数量" />
<el-form-item :label="$t('searchViewStockDetail.quantity')" prop="quantity">
<el-input v-model="form.quantity" :placeholder="$t('searchViewStockDetail.inputQuantity')" />
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
<el-form-item :label="$t('searchViewStockDetail.jobId')" prop="jobId">
<el-input v-model="form.jobId" :placeholder="$t('searchViewStockDetail.inputJobId')" />
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批号" />
<el-form-item :label="$t('searchViewStockDetail.lotNo')" prop="lotNo">
<el-input v-model="form.lotNo" :placeholder="$t('searchViewStockDetail.inputLotNo')" />
</el-form-item>
<el-form-item label="入库子单ID" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
<el-form-item :label="$t('searchViewStockDetail.stockinDetailId')" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" :placeholder="$t('searchViewStockDetail.inputStockinDetailId')" />
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-input v-model="form.inDate" placeholder="请输入入库时间" />
<el-form-item :label="$t('searchViewStockDetail.inDate')" prop="inDate">
<el-input v-model="form.inDate" :placeholder="$t('searchViewStockDetail.inputInDate')" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库" />
<el-form-item :label="$t('searchViewStockDetail.warehouseId')" prop="warehouseId">
<el-input v-model="form.warehouseId" :placeholder="$t('searchViewStockDetail.inputWarehouseId')" />
</el-form-item>
<el-form-item label="剁型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入剁型ID" />
<el-form-item :label="$t('searchViewStockDetail.stackingId')" prop="stackingId">
<el-input v-model="form.stackingId" :placeholder="$t('searchViewStockDetail.inputStackingId')" />
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
<el-form-item :label="$t('searchViewStockDetail.cargoSpaceName')" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" :placeholder="$t('searchViewStockDetail.inputCargoSpaceName')" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
<el-form-item :label="$t('searchViewStockDetail.roadwayId')" prop="roadwayId">
<el-input v-model="form.roadwayId" :placeholder="$t('searchViewStockDetail.inputRoadwayId')" />
</el-form-item>
<el-form-item label="是否锁定" prop="locked">
<el-input v-model="form.locked" placeholder="请输入是否锁定" />
<el-form-item :label="$t('searchViewStockDetail.locked')" prop="locked">
<el-input v-model="form.locked" :placeholder="$t('searchViewStockDetail.inputLocked')" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
<el-form-item :label="$t('searchViewStockDetail.productId')" prop="productId">
<el-input v-model="form.productId" :placeholder="$t('searchViewStockDetail.inputProductId')" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item :label="$t('searchViewStockDetail.productName')" prop="productName">
<el-input v-model="form.productName" :placeholder="$t('searchViewStockDetail.inputProductName')" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item :label="$t('searchViewStockDetail.spec')" prop="spec">
<el-input v-model="form.spec" :placeholder="$t('searchViewStockDetail.inputSpec')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<el-form-item :label="$t('searchViewStockDetail.unit')" prop="unit">
<el-input v-model="form.unit" :placeholder="$t('searchViewStockDetail.inputUnit')" />
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
<el-form-item :label="$t('searchViewStockDetail.price')" prop="price">
<el-input v-model="form.price" :placeholder="$t('searchViewStockDetail.inputPrice')" />
</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('searchViewStockDetail.confirm')}} <!-- 确 定 --></el-button>
<el-button @click="cancel">{{$t('searchViewStockDetail.cancel')}} <!-- 取 消 --></el-button>
</div>
</el-dialog>
</div>
@@ -448,7 +448,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加库存明细查询"
this.title = this.$t('searchViewStockDetail.addTitle')
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -457,7 +457,7 @@ export default {
getViewStockDetail(onlyIdentity).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存明细查询"
this.title = this.$t('searchViewStockDetail.editTitle')
})
},
/** 提交按钮 */
@@ -466,13 +466,13 @@ export default {
if (valid) {
if (this.form.onlyIdentity != null) {
updateViewStockDetail(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess(this.$t('searchViewStockDetail.editSuccess'))
this.open = false
this.getList()
})
} else {
addViewStockDetail(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.$modal.msgSuccess(this.$t('searchViewStockDetail.addSuccess'))
this.open = false
this.getList()
})
@@ -483,11 +483,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const onlyIdentitys = row.onlyIdentity || this.ids
this.$modal.confirm('是否确认删除库存明细查询编号为"' + onlyIdentitys + '"的数据项？').then(function() {
this.$modal.confirm(this.$t('searchViewStockDetail.deleteConfirm', {id: onlyIdentitys})).then(function() {
return delViewStockDetail(onlyIdentitys)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess(this.$t('searchViewStockDetail.deleteSuccess'))
}).catch(() => {})
},
/** 导出按钮操作 */

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

@@ -1,24 +1,24 @@
<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="库存ID" prop="stockId">
<el-form-item :label="$t('searchViewStockSecure.stockId')" prop="stockId"> <!-- 库存ID -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存ID"
:placeholder="$t('searchViewStockSecure.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="货位ID" prop="cargoSpaceId">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceId"-->
<!-- placeholder="请输入货位ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('searchViewStockSecure.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input
v-model="queryParams.cargoSpaceId"
:placeholder="$t('searchViewStockSecure.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockSecure.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -27,8 +27,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
<el-form-item :label="$t('searchViewStockSecure.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="queryParams.productStatus" :placeholder="$t('searchViewStockSecure.selectProductStatus')" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -37,72 +37,88 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('searchViewStockSecure.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('searchViewStockSecure.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-form-item :label="$t('searchViewStockSecure.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
placeholder="请输入入库时间"
:placeholder="$t('searchViewStockSecure.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="回流时间" prop="backDate">
<el-form-item :label="$t('searchViewStockSecure.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input
v-model="queryParams.backDate"
placeholder="请输入回流时间"
:placeholder="$t('searchViewStockSecure.inputBackDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="物料GUID" prop="productGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.productGuid"-->
<!-- placeholder="请输入物料GUID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="作业ID" prop="jobId">-->
<!-- <el-input-->
<!-- v-model="queryParams.jobId"-->
<!-- placeholder="请输入作业ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('searchViewStockSecure.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input
v-model="queryParams.productGuid"
:placeholder="$t('searchViewStockSecure.inputProductGuid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input
v-model="queryParams.quantity"
:placeholder="$t('searchViewStockSecure.inputContent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input
v-model="queryParams.jobId"
:placeholder="$t('searchViewStockSecure.inputJobId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('searchViewStockSecure.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="入库子单ID" prop="stockinDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinDetailId"-->
<!-- placeholder="请输入入库子单ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库主单" prop="stockinId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinId"-->
<!-- placeholder="请输入入库主单"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-form-item :label="$t('searchViewStockSecure.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input
v-model="queryParams.outQuantity"
:placeholder="$t('searchViewStockSecure.inputContent')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单ID -->
<el-input
v-model="queryParams.stockinDetailId"
:placeholder="$t('searchViewStockSecure.inputStockinDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.stockinId')" prop="stockinId"> <!-- 入库主单 -->
<el-input
v-model="queryParams.stockinId"
:placeholder="$t('searchViewStockSecure.inputStockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('searchViewStockSecure.inType')" prop="inType"> <!-- 入库类型 -->
<el-select v-model="queryParams.inType" :placeholder="$t('searchViewStockSecure.selectInType')" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -111,317 +127,13 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="入库班组ID" prop="inClassId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inClassId"-->
<!-- placeholder="请输入入库班组ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stackingId"-->
<!-- placeholder="请输入垛型ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存预警" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入库存预警"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare5">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare5"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare6">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare6"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料ID" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库名称" prop="warehouseName">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseName"-->
<!-- placeholder="请输入仓库名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库地址" prop="address">-->
<!-- <el-input-->
<!-- v-model="queryParams.address"-->
<!-- placeholder="请输入仓库地址"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库描述" prop="cDesc">-->
<!-- <el-input-->
<!-- v-model="queryParams.cDesc"-->
<!-- placeholder="请输入仓库描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseKind"-->
<!-- placeholder="请输入仓库级别"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否可用" prop="isCurrent">-->
<!-- <el-input-->
<!-- v-model="queryParams.isCurrent"-->
<!-- placeholder="请输入是否可用"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料名称" prop="productName">
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="品牌" prop="cargoNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoNo"-->
<!-- placeholder="请输入品牌"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
<!-- placeholder="请输入单位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="价格" prop="price">-->
<!-- <el-input-->
<!-- v-model="queryParams.price"-->
<!-- placeholder="请输入价格"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位名称" prop="cargoSpaceName">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceName"-->
<!-- placeholder="请输入货位名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
<!-- placeholder="请输入巷道ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="货区ID" prop="cargoAreaId">
<el-input
v-model="queryParams.cargoAreaId"
placeholder="请输入货区ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="货位类型名称" prop="theTypeName">-->
<!-- <el-input-->
<!-- v-model="queryParams.theTypeName"-->
<!-- placeholder="请输入货位类型名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="排" prop="thePlatoon">
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="是否锁定" prop="locked">-->
<!-- <el-input-->
<!-- v-model="queryParams.locked"-->
<!-- placeholder="请输入是否锁定"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位高度" prop="cargoHight">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoHight"-->
<!-- placeholder="请输入货位高度"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否双伸" prop="issDouble">-->
<!-- <el-input-->
<!-- v-model="queryParams.issDouble"-->
<!-- placeholder="请输入是否双伸"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位分组编码" prop="groupCodingNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.groupCodingNo"-->
<!-- placeholder="请输入双货位分组编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位分组编码" prop="groupCoding">-->
<!-- <el-input-->
<!-- v-model="queryParams.groupCoding"-->
<!-- placeholder="请输入双货位分组编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位标识" prop="cargoSpaceLogo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceLogo"-->
<!-- placeholder="请输入双货位标识"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="本仓库区域" prop="thisCargoArea">-->
<!-- <el-input-->
<!-- v-model="queryParams.thisCargoArea"-->
<!-- 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('searchViewStockSecure.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockSecure.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['search:ViewStockSecure:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -430,96 +142,58 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockSecure:export']"
>导出</el-button>
>{{$t('searchViewStockSecure.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewStockSecureList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="stockList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column label="库存状态" align="center" prop="stockStatus">
<el-table-column :label="$t('searchViewStockSecure.stockId')" align="center" prop="stockId" /> <!-- 库存ID -->
<el-table-column :label="$t('searchViewStockSecure.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位ID -->
<el-table-column :label="$t('searchViewStockSecure.stockStatus')" align="center" prop="stockStatus"> <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="物料状态" align="center" prop="productStatus">
<el-table-column :label="$t('searchViewStockSecure.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" />
<el-table-column label="回流时间" align="center" prop="backDate" />
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="作业ID" align="center" prop="jobId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="入库子单ID" align="center" prop="stockinDetailId" />-->
<el-table-column label="入库主单" align="center" prop="stockinId" />
<el-table-column label="入库类型" align="center" prop="inType">
<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"> <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<!-- <el-table-column label="入库班组ID" align="center" prop="inClassId" />-->
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="库存预警" align="center" prop="spare1" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare3" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare4" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare5" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare6" />-->
<el-table-column label="物料ID" align="center" prop="productId" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<!-- <el-table-column label="仓库地址" align="center" prop="address" />-->
<!-- <el-table-column label="仓库描述" align="center" prop="cDesc" />-->
<!-- <el-table-column label="仓库级别" align="center" prop="warehouseKind" />-->
<el-table-column label="仓库类型" align="center" prop="warehouseType" />
<el-table-column label="是否可用" align="center" prop="isCurrent" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="价格" align="center" prop="price" />
<!-- <el-table-column label="描述" align="center" prop="remark" />-->
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<!-- <el-table-column label="巷道ID" align="center" prop="roadwayId" />-->
<el-table-column label="货区ID" align="center" prop="cargoAreaId" />
<el-table-column label="货位类型" align="center" prop="theType" />
<!-- <el-table-column label="货位类型名称" align="center" prop="theTypeName" />-->
<!-- <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="货位状态" align="center" prop="cargoStatus" />
<el-table-column label="是否锁定" align="center" prop="locked" />
<el-table-column label="货位高度" align="center" prop="cargoHight" />
<el-table-column label="是否双伸" align="center" prop="issDouble" />
<!-- <el-table-column label="双货位分组编码" align="center" prop="groupCodingNo" />-->
<!-- <el-table-column label="双货位分组编码" align="center" prop="groupCoding" />-->
<!-- <el-table-column label="双货位标识" align="center" prop="cargoSpaceLogo" />-->
<!-- <el-table-column label="本仓库区域" align="center" prop="thisCargoArea" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewStockSecure.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="['search:ViewStockSecure:edit']"
>{{$t('searchViewStockSecure.modify')}}</el-button> <!-- 修改 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['search:ViewStockSecure:remove']"
>{{$t('searchViewStockSecure.delete')}}</el-button> <!-- 删除 -->
</template>
</el-table-column>
</el-table>
<pagination
@@ -533,14 +207,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="库存ID" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
<el-form-item :label="$t('searchViewStockSecure.stockId')" prop="stockId"> <!-- 库存ID -->
<el-input v-model="form.stockId" :placeholder="$t('searchViewStockSecure.inputStockId')" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-form-item :label="$t('searchViewStockSecure.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockSecure.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-form-item :label="$t('searchViewStockSecure.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" :placeholder="$t('searchViewStockSecure.selectStockStatus')">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -549,8 +223,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="form.productStatus" placeholder="请选择物料状态">
<el-form-item :label="$t('searchViewStockSecure.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('searchViewStockSecure.selectProductStatus')">
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -559,38 +233,38 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('searchViewStockSecure.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('searchViewStockSecure.inputLotNo')" />
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-input v-model="form.inDate" placeholder="请输入入库时间" />
<el-form-item :label="$t('searchViewStockSecure.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input v-model="form.inDate" :placeholder="$t('searchViewStockSecure.inputInDate')" />
</el-form-item>
<el-form-item label="回流时间" prop="backDate">
<el-input v-model="form.backDate" placeholder="请输入回流时间" />
<el-form-item :label="$t('searchViewStockSecure.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input v-model="form.backDate" :placeholder="$t('searchViewStockSecure.inputBackDate')" />
</el-form-item>
<el-form-item label="物料GUID" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
<el-form-item :label="$t('searchViewStockSecure.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input v-model="form.productGuid" :placeholder="$t('searchViewStockSecure.inputProductGuid')" />
</el-form-item>
<el-form-item label="库存数量" prop="quantity">
<el-input v-model="form.quantity" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('searchViewStockSecure.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" type="textarea" :placeholder="$t('searchViewStockSecure.inputContent')" />
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
<el-form-item :label="$t('searchViewStockSecure.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('searchViewStockSecure.inputJobId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('searchViewStockSecure.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('searchViewStockSecure.inputTrayCode')" />
</el-form-item>
<el-form-item label="出库数量" prop="outQuantity">
<el-input v-model="form.outQuantity" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('searchViewStockSecure.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input v-model="form.outQuantity" type="textarea" :placeholder="$t('searchViewStockSecure.inputContent')" />
</el-form-item>
<el-form-item label="入库子单ID" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
<el-form-item :label="$t('searchViewStockSecure.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单ID -->
<el-input v-model="form.stockinDetailId" :placeholder="$t('searchViewStockSecure.inputStockinDetailId')" />
</el-form-item>
<el-form-item label="入库主单" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库主单" />
<el-form-item :label="$t('searchViewStockSecure.stockinId')" prop="stockinId"> <!-- 入库主单 -->
<el-input v-model="form.stockinId" :placeholder="$t('searchViewStockSecure.inputStockinId')" />
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="form.inType" placeholder="请选择入库类型">
<el-form-item :label="$t('searchViewStockSecure.inType')" prop="inType"> <!-- 入库类型 -->
<el-select v-model="form.inType" :placeholder="$t('searchViewStockSecure.selectInType')">
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -599,115 +273,10 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="入库班组ID" prop="inClassId">
<el-input v-model="form.inClassId" placeholder="请输入入库班组ID" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
</el-form-item>
<el-form-item label="库存预警" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入库存预警" />
</el-form-item>
<el-form-item label="${comment}" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="仓库地址" prop="address">
<el-input v-model="form.address" placeholder="请输入仓库地址" />
</el-form-item>
<el-form-item label="仓库描述" prop="cDesc">
<el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
</el-form-item>
<el-form-item label="仓库级别" prop="warehouseKind">
<el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
</el-form-item>
<el-form-item label="是否可用" prop="isCurrent">
<el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
</el-form-item>
<el-form-item label="货区ID" prop="cargoAreaId">
<el-input v-model="form.cargoAreaId" placeholder="请输入货区ID" />
</el-form-item>
<el-form-item label="货位类型名称" prop="theTypeName">
<el-input v-model="form.theTypeName" placeholder="请输入货位类型名称" />
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-input v-model="form.thePlatoon" placeholder="请输入排" />
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input v-model="form.theColumn" placeholder="请输入列" />
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input v-model="form.theFloor" placeholder="请输入层" />
</el-form-item>
<el-form-item label="是否锁定" prop="locked">
<el-input v-model="form.locked" placeholder="请输入是否锁定" />
</el-form-item>
<el-form-item label="货位高度" prop="cargoHight">
<el-input v-model="form.cargoHight" placeholder="请输入货位高度" />
</el-form-item>
<el-form-item label="是否双伸" prop="issDouble">
<el-input v-model="form.issDouble" placeholder="请输入是否双伸" />
</el-form-item>
<el-form-item label="双货位分组编码" prop="groupCodingNo">
<el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
</el-form-item>
<el-form-item label="双货位分组编码" prop="groupCoding">
<el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码" />
</el-form-item>
<el-form-item label="双货位标识" prop="cargoSpaceLogo">
<el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识" />
</el-form-item>
<el-form-item label="本仓库区域" prop="thisCargoArea">
<el-input v-model="form.thisCargoArea" 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('searchViewStockSecure.confirm')}}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{$t('searchViewStockSecure.cancel')}}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>

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

@@ -1,24 +1,24 @@
<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="库存ID" prop="stockId">
<el-form-item :label="$t('searchViewStockWarning.stockId')" prop="stockId"> <!-- 库存ID -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存ID"
:placeholder="$t('searchViewStockWarning.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-form-item :label="$t('searchViewStockWarning.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位ID"
:placeholder="$t('searchViewStockWarning.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('searchViewStockWarning.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockWarning.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -27,8 +27,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
<el-form-item :label="$t('searchViewStockWarning.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="queryParams.productStatus" :placeholder="$t('searchViewStockWarning.selectProductStatus')" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -37,88 +37,40 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('searchViewStockWarning.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
placeholder="请输入入库时间"
:placeholder="$t('searchViewStockWarning.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="回流时间" prop="backDate">
<el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input
v-model="queryParams.backDate"
placeholder="请输入回流时间"
:placeholder="$t('searchViewStockWarning.inputBackDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="物料GUID" prop="productGuid">-->
<!-- <el-input-->
<!-- v-model="queryParams.productGuid"-->
<!-- placeholder="请输入物料GUID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="库存数量" prop="quantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.quantity"-->
<!-- placeholder="请输入库存数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="作业ID" prop="jobId">-->
<!-- <el-input-->
<!-- v-model="queryParams.jobId"-->
<!-- placeholder="请输入作业ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('searchViewStockWarning.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="出库数量" prop="outQuantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.outQuantity"-->
<!-- placeholder="请输入出库数量"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库子单ID" prop="stockinDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinDetailId"-->
<!-- placeholder="请输入入库子单ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库主单" prop="stockinId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockinId"-->
<!-- placeholder="请输入入库主单"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-form-item :label="$t('searchViewStockWarning.inType')" prop="inType"> <!-- 入库类型 -->
<el-select v-model="queryParams.inType" :placeholder="$t('searchViewStockWarning.selectInType')" clearable>
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
@@ -127,317 +79,61 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="入库班组ID" prop="inClassId">-->
<!-- <el-input-->
<!-- v-model="queryParams.inClassId"-->
<!-- placeholder="请输入入库班组ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库ID" prop="warehouseId">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseId"-->
<!-- placeholder="请输入仓库ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="垛型ID" prop="stackingId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stackingId"-->
<!-- placeholder="请输入垛型ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="预警标识" prop="spare1">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare1"-->
<!-- placeholder="请输入预警标识"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare2">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare2"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare3">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare3"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare4">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare4"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare5">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare5"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="${comment}" prop="spare6">-->
<!-- <el-input-->
<!-- v-model="queryParams.spare6"-->
<!-- placeholder="请输入${comment}"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料ID" prop="productId">
<el-form-item :label="$t('searchViewStockWarning.productId')" prop="productId"> <!-- 物料ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料ID"
:placeholder="$t('searchViewStockWarning.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库名称" prop="warehouseName">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseName"-->
<!-- placeholder="请输入仓库名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库地址" prop="address">-->
<!-- <el-input-->
<!-- v-model="queryParams.address"-->
<!-- placeholder="请输入仓库地址"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库描述" prop="cDesc">-->
<!-- <el-input-->
<!-- v-model="queryParams.cDesc"-->
<!-- placeholder="请输入仓库描述"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<!-- <el-input-->
<!-- v-model="queryParams.warehouseKind"-->
<!-- placeholder="请输入仓库级别"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否可用" prop="isCurrent">-->
<!-- <el-input-->
<!-- v-model="queryParams.isCurrent"-->
<!-- placeholder="请输入是否可用"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewStockWarning.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewStockWarning.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewStockWarning.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewStockWarning.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="品牌" prop="cargoNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoNo"-->
<!-- placeholder="请输入品牌"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="单位" prop="unit">-->
<!-- <el-input-->
<!-- v-model="queryParams.unit"-->
<!-- placeholder="请输入单位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="价格" prop="price">-->
<!-- <el-input-->
<!-- v-model="queryParams.price"-->
<!-- placeholder="请输入价格"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位名称" prop="cargoSpaceName">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceName"-->
<!-- placeholder="请输入货位名称"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
<!-- <el-input-->
<!-- v-model="queryParams.roadwayId"-->
<!-- placeholder="请输入巷道ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货区ID" prop="cargoAreaId">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoAreaId"-->
<!-- placeholder="请输入货区ID"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="the_type_name：" prop="theTypeName">-->
<!-- <el-input-->
<!-- v-model="queryParams.theTypeName"-->
<!-- placeholder="请输入the_type_name："-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="排" prop="thePlatoon">
<el-form-item :label="$t('searchViewStockWarning.thePlatoon')" prop="thePlatoon"> <!-- 排 -->
<el-input
v-model="queryParams.thePlatoon"
placeholder="请输入排"
:placeholder="$t('searchViewStockWarning.inputThePlatoon')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-form-item :label="$t('searchViewStockWarning.theColumn')" prop="theColumn"> <!-- 列 -->
<el-input
v-model="queryParams.theColumn"
placeholder="请输入列"
:placeholder="$t('searchViewStockWarning.inputTheColumn')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-form-item :label="$t('searchViewStockWarning.theFloor')" prop="theFloor"> <!-- 层 -->
<el-input
v-model="queryParams.theFloor"
placeholder="请输入层"
:placeholder="$t('searchViewStockWarning.inputTheFloor')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="是否锁定" prop="locked">-->
<!-- <el-input-->
<!-- v-model="queryParams.locked"-->
<!-- placeholder="请输入是否锁定"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="货位高度" prop="cargoHight">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoHight"-->
<!-- placeholder="请输入货位高度"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="是否双伸" prop="issDouble">-->
<!-- <el-input-->
<!-- v-model="queryParams.issDouble"-->
<!-- placeholder="请输入是否双伸"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位分组编码" prop="groupCodingNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.groupCodingNo"-->
<!-- placeholder="请输入双货位分组编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位分组编码" prop="groupCoding">-->
<!-- <el-input-->
<!-- v-model="queryParams.groupCoding"-->
<!-- placeholder="请输入双货位分组编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="双货位标识" prop="cargoSpaceLogo">-->
<!-- <el-input-->
<!-- v-model="queryParams.cargoSpaceLogo"-->
<!-- placeholder="请输入双货位标识"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="本仓库区域" prop="thisCargoArea">-->
<!-- <el-input-->
<!-- v-model="queryParams.thisCargoArea"-->
<!-- 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('searchViewStockWarning.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockWarning.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['search:ViewStockWarning:add']"-->
<!-- >新增</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="success"-->
<!-- plain-->
<!-- icon="el-icon-edit"-->
<!-- size="mini"-->
<!-- :disabled="single"-->
<!-- @click="handleUpdate"-->
<!-- v-hasPermi="['search:ViewStockWarning:edit']"-->
<!-- >修改</el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="danger"-->
<!-- plain-->
<!-- icon="el-icon-delete"-->
<!-- size="mini"-->
<!-- :disabled="multiple"-->
<!-- @click="handleDelete"-->
<!-- v-hasPermi="['search:ViewStockWarning:remove']"-->
<!-- >删除</el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -446,96 +142,56 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockWarning:export']"
>导出</el-button>
>{{$t('searchViewStockWarning.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewStockWarningList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存ID" align="center" prop="stockId" />
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
<el-table-column label="库存状态" align="center" prop="stockStatus">
<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"> <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="物料状态" align="center" prop="productStatus">
<el-table-column :label="$t('searchViewStockWarning.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" />
<el-table-column label="回流时间" align="center" prop="backDate" />
<!-- <el-table-column label="物料GUID" align="center" prop="productGuid" />-->
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="作业ID" align="center" prop="jobId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="入库子单ID" align="center" prop="stockinDetailId" />-->
<el-table-column label="入库主单" align="center" prop="stockinId" />
<el-table-column label="入库类型" align="center" prop="inType">
<el-table-column :label="$t('searchViewStockWarning.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('searchViewStockWarning.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('searchViewStockWarning.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('searchViewStockWarning.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"> <!-- 入库类型 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<!-- <el-table-column label="入库班组ID" align="center" prop="inClassId" />-->
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="库存预警" align="center" prop="spare1" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare2" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare3" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare4" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare5" />-->
<!-- <el-table-column label="${comment}" align="center" prop="spare6" />-->
<el-table-column label="物料ID" align="center" prop="productId" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<!-- <el-table-column label="仓库地址" align="center" prop="address" />-->
<!-- <el-table-column label="仓库描述" align="center" prop="cDesc" />-->
<!-- <el-table-column label="仓库级别" align="center" prop="warehouseKind" />-->
<el-table-column label="仓库类型" align="center" prop="warehouseType" />
<el-table-column label="是否可用" align="center" prop="isCurrent" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="价格" align="center" prop="price" />
<!-- <el-table-column label="描述" align="center" prop="remark" />-->
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<!-- <el-table-column label="巷道ID" align="center" prop="roadwayId" />-->
<el-table-column label="货区ID" align="center" prop="cargoAreaId" />
<el-table-column label="货位类型" align="center" prop="theType" />
<!-- <el-table-column label="货位类型名称" align="center" prop="theTypeName" />-->
<!-- <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="货位状态" align="center" prop="cargoStatus" />
<el-table-column label="是否锁定" align="center" prop="locked" />
<el-table-column label="货位高度" align="center" prop="cargoHight" />
<el-table-column label="是否双伸" align="center" prop="issDouble" />
<!-- <el-table-column label="双货位分组编码" align="center" prop="groupCodingNo" />-->
<!-- <el-table-column label="双货位分组编码" align="center" prop="groupCoding" />-->
<!-- <el-table-column label="双货位标识" align="center" prop="cargoSpaceLogo" />-->
<!-- <el-table-column label="本仓库区域" align="center" prop="thisCargoArea" />-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:edit']"-->
<!-- >修改</el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['search:ViewStockSecure:remove']"-->
<!-- >删除</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column :label="$t('searchViewStockWarning.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('searchViewStockWarning.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
<el-table-column :label="$t('searchViewStockWarning.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" /> <!-- 规格 -->
<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('searchViewStockWarning.price')" align="center" prop="price" /> <!-- 价格 -->
<el-table-column :label="$t('searchViewStockWarning.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<el-table-column :label="$t('searchViewStockWarning.cargoAreaId')" align="center" prop="cargoAreaId" /> <!-- 货区ID -->
<el-table-column :label="$t('searchViewStockWarning.theType')" align="center" prop="theType" /> <!-- 货位类型 -->
<el-table-column :label="$t('searchViewStockWarning.cargoStatus')" align="center" prop="cargoStatus" /> <!-- 货位状态 -->
<el-table-column :label="$t('searchViewStockWarning.locked')" align="center" prop="locked" /> <!-- 是否锁定 -->
<el-table-column :label="$t('searchViewStockWarning.cargoHight')" align="center" prop="cargoHight" /> <!-- 货位高度 -->
<el-table-column :label="$t('searchViewStockWarning.issDouble')" align="center" prop="issDouble" /> <!-- 是否双伸 -->
</el-table>
<pagination
@@ -549,14 +205,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="库存ID" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存ID" />
<el-form-item :label="$t('searchViewStockWarning.stockId')" prop="stockId"> <!-- 库存ID -->
<el-input v-model="form.stockId" :placeholder="$t('searchViewStockWarning.inputStockId')" />
</el-form-item>
<el-form-item label="货位ID" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
<el-form-item :label="$t('searchViewStockWarning.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位ID -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('searchViewStockWarning.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-form-item :label="$t('searchViewStockWarning.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" :placeholder="$t('searchViewStockWarning.selectStockStatus')">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -565,8 +221,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="form.productStatus" placeholder="请选择物料状态">
<el-form-item :label="$t('searchViewStockWarning.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('searchViewStockWarning.selectProductStatus')">
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -575,155 +231,34 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('searchViewStockWarning.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('searchViewStockWarning.inputLotNo')" />
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-input v-model="form.inDate" placeholder="请输入入库时间" />
<el-form-item :label="$t('searchViewStockWarning.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input v-model="form.inDate" :placeholder="$t('searchViewStockWarning.inputInDate')" />
</el-form-item>
<el-form-item label="回流时间" prop="backDate">
<el-input v-model="form.backDate" placeholder="请输入回流时间" />
<el-form-item :label="$t('searchViewStockWarning.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input v-model="form.backDate" :placeholder="$t('searchViewStockWarning.inputBackDate')" />
</el-form-item>
<el-form-item label="物料GUID" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
<el-form-item :label="$t('searchViewStockWarning.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input v-model="form.productGuid" :placeholder="$t('searchViewStockWarning.inputProductGuid')" />
</el-form-item>
<el-form-item label="库存数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
<el-form-item :label="$t('searchViewStockWarning.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('searchViewStockWarning.inputQuantity')" />
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
<el-form-item :label="$t('searchViewStockWarning.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('searchViewStockWarning.inputJobId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('searchViewStockWarning.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('searchViewStockWarning.inputTrayCode')" />
</el-form-item>
<el-form-item label="出库数量" prop="outQuantity">
<el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
</el-form-item>
<el-form-item label="入库子单ID" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单ID" />
</el-form-item>
<el-form-item label="入库主单" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库主单" />
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="form.inType" placeholder="请选择入库类型">
<el-option
v-for="dict in dict.type.in_bill_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="入库班组ID" prop="inClassId">
<el-input v-model="form.inClassId" placeholder="请输入入库班组ID" />
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
</el-form-item>
<el-form-item label="预警标识" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入预警标识" />
</el-form-item>
<el-form-item label="${comment}" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="${comment}" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入${comment}" />
</el-form-item>
<el-form-item label="物料ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
</el-form-item>
<el-form-item label="仓库地址" prop="address">
<el-input v-model="form.address" placeholder="请输入仓库地址" />
</el-form-item>
<el-form-item label="仓库描述" prop="cDesc">
<el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
</el-form-item>
<el-form-item label="仓库级别" prop="warehouseKind">
<el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
</el-form-item>
<el-form-item label="是否可用" prop="isCurrent">
<el-input v-model="form.isCurrent" placeholder="请输入是否可用" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="价格" prop="price">
<el-input v-model="form.price" placeholder="请输入价格" />
</el-form-item>
<el-form-item label="描述" prop="remark">
<el-input v-model="form.remark" placeholder="请输入描述" />
</el-form-item>
<el-form-item label="货位名称" prop="cargoSpaceName">
<el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
</el-form-item>
<el-form-item label="巷道ID" prop="roadwayId">
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
</el-form-item>
<el-form-item label="货区ID" prop="cargoAreaId">
<el-input v-model="form.cargoAreaId" placeholder="请输入货区ID" />
</el-form-item>
<el-form-item label="the_type_name：" prop="theTypeName">
<el-input v-model="form.theTypeName" placeholder="请输入the_type_name：" />
</el-form-item>
<el-form-item label="排" prop="thePlatoon">
<el-input v-model="form.thePlatoon" placeholder="请输入排" />
</el-form-item>
<el-form-item label="列" prop="theColumn">
<el-input v-model="form.theColumn" placeholder="请输入列" />
</el-form-item>
<el-form-item label="层" prop="theFloor">
<el-input v-model="form.theFloor" placeholder="请输入层" />
</el-form-item>
<el-form-item label="是否锁定" prop="locked">
<el-input v-model="form.locked" placeholder="请输入是否锁定" />
</el-form-item>
<el-form-item label="货位高度" prop="cargoHight">
<el-input v-model="form.cargoHight" placeholder="请输入货位高度" />
</el-form-item>
<el-form-item label="是否双伸" prop="issDouble">
<el-input v-model="form.issDouble" placeholder="请输入是否双伸" />
</el-form-item>
<el-form-item label="双货位分组编码" prop="groupCodingNo">
<el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
</el-form-item>
<el-form-item label="双货位分组编码" prop="groupCoding">
<el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码" />
</el-form-item>
<el-form-item label="双货位标识" prop="cargoSpaceLogo">
<el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识" />
</el-form-item>
<el-form-item label="本仓库区域" prop="thisCargoArea">
<el-input v-model="form.thisCargoArea" placeholder="请输入本仓库区域" />
<el-form-item :label="$t('searchViewStockWarning.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input v-model="form.outQuantity" :placeholder="$t('searchViewStockWarning.inputOutQuantity')" />
</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('searchViewStockWarning.confirm')}}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{$t('searchViewStockWarning.cancel')}}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>

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

@@ -9,16 +9,16 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="入库单号" prop="stockinId">
<el-form-item :label="$t('searchViewStockinHistory.stockinId')" prop="stockinId"> <!-- 入库单号 -->
<el-input
v-model="queryParams.stockinId"
placeholder="请输入入库单号"
:placeholder="$t('searchViewStockinHistory.inputStockinId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="queryParams.inType" placeholder="请选择入库类型" clearable>
<el-form-item :label="$t('searchViewStockinHistory.inType')" prop="inType"> <!-- 入库类型 -->
<el-select v-model="queryParams.inType" :placeholder="$t('searchViewStockinHistory.selectInType')" clearable>
<el-option
v-for="dict in dict.type.in_job_type"
:key="dict.value"
@@ -27,20 +27,20 @@
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> <!-- 创建时间 -->
<el-date-picker
v-model="queryParams.createDate"
type="datetime"
placeholder="请选择创建时间"
:placeholder="$t('searchViewStockinHistory.selectCreateDate')"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
</el-form-item>
<el-form-item label="完成时间" prop="finishDate">
<el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> <!-- 完成时间 -->
<el-date-picker
v-model="queryParams.finishDate"
type="datetime"
placeholder="请选择完成时间"
:placeholder="$t('searchViewStockinHistory.selectFinishDate')"
value-format="yyyy-MM-dd HH:mm:ss"
clearable
/>
@@ -63,19 +63,19 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="仓库ID" prop="warehouseId">
<el-form-item :label="$t('searchViewStockinHistory.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
:placeholder="$t('searchViewStockinHistory.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="ERP单号" prop="erpBill" style="white-space: nowrap">
<el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill" style="white-space: nowrap"> <!-- ERP单号 -->
<el-input
v-model="queryParams.erpBill"
placeholder="请输入ERP单号"
:placeholder="$t('searchViewStockinHistory.inputErpBill')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -96,18 +96,18 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="供应商编号" prop="supplierNo" style="white-space: nowrap">
<el-form-item :label="$t('searchViewStockinHistory.supplierNo')" prop="supplierNo" style="white-space: nowrap"> <!-- 供应商编号 -->
<el-input
v-model="queryParams.supplierNo"
placeholder="请输入供应商编号"
:placeholder="$t('searchViewStockinHistory.inputSupplierNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="供应商名称" prop="supplierName" style="white-space: nowrap">
<el-form-item :label="$t('searchViewStockinHistory.supplierName')" prop="supplierName" style="white-space: nowrap"> <!-- 供应商名称 -->
<el-input
v-model="queryParams.supplierName"
placeholder="请输入供应商名称"
:placeholder="$t('searchViewStockinHistory.inputSupplierName')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -152,24 +152,24 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('searchViewStockinHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('searchViewStockinHistory.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库日期" prop="printDate">
<el-form-item :label="$t('searchViewStockinHistory.printDate')" prop="printDate"> <!-- 入库日期 -->
<el-date-picker clearable
v-model="queryParams.printDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库日期">
:placeholder="$t('searchViewStockinHistory.selectPrintDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -194,18 +194,18 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="物料编码" prop="productId">
<el-form-item :label="$t('searchViewStockinHistory.productId')" prop="productId"> <!-- 物料编码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物料编码"
:placeholder="$t('searchViewStockinHistory.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-form-item :label="$t('searchViewStockinHistory.productName')" prop="productName"> <!-- 物料名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物料名称"
:placeholder="$t('searchViewStockinHistory.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -226,17 +226,17 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewStockinHistory.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewStockinHistory.inputSpec')"
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('searchViewStockinHistory.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockinHistory.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -281,7 +281,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockinHistory:export']"
>导出</el-button>
>{{$t('searchViewStockinHistory.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -289,59 +289,59 @@
<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="入库单号" align="center" prop="stockinId" />
<el-table-column label="入库类型" align="center" prop="inType">
<el-table-column :label="$t('searchViewStockinHistory.stockinId')" align="center" prop="stockinId" />
<el-table-column :label="$t('searchViewStockinHistory.inType')" align="center" prop="inType">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_job_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createDate" />
<el-table-column label="创建人" align="center" prop="createManId" />
<el-table-column label="单据状态" align="center" prop="status">
<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">
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="完成时间" align="center" prop="finishDate" />
<el-table-column label="ERP单号" align="center" prop="erpBill" />
<el-table-column label="单据来源" align="center" prop="stockSource" />
<el-table-column label="部门编码" align="center" prop="departmentNo" />
<el-table-column label="班组编码" align="center" prop="classNo" />
<el-table-column label="供应商编号" align="center" prop="supplierNo" />
<el-table-column label="供应商名称" align="center" prop="supplierName" />
<el-table-column label="供应商简称" align="center" prop="simpleName" />
<el-table-column label="联系人" align="center" prop="contactName" />
<el-table-column label="联系电话" align="center" prop="contactNumber" />
<el-table-column label="供应商地址" align="center" prop="address" />
<el-table-column label="入库明细ID" align="center" prop="stockinDetailId" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="计划数量" align="center" prop="quantity" />
<el-table-column label="计划箱数" align="center" prop="quantityX" />
<el-table-column label="计划件数" align="center" prop="quantityJ" />
<el-table-column label="实际数量" align="center" prop="assignNum" />
<el-table-column label="实际箱数" align="center" prop="assignNumX" />
<el-table-column label="实际件数" align="center" prop="assignNumJ" />
<el-table-column label="扫码数量" align="center" prop="scanNum" />
<el-table-column label="扫码箱数" align="center" prop="scanNumX" />
<el-table-column label="扫码件数" align="center" prop="scanNumJ" />
<el-table-column label="入库日期" align="center" prop="printDate" width="180">
<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">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.printDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="库存状态" align="center" prop="stockStatus">
<el-table-column :label="$t('searchViewStockinHistory.stockStatus')" align="center" prop="stockStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="单价" align="center" prop="price" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column :label="$t('searchViewStockinHistory.price')" align="center" prop="price" />
<el-table-column :label="$t('searchViewStockinHistory.remark')" align="center" prop="remark" />
<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.cargoNo')" align="center" prop="cargoNo" />
<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="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -373,123 +373,133 @@
<!-- 添加或修改入库单据历史对话框 -->
<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="入库单guid" prop="stockinGuid">
<el-input v-model="form.stockinGuid" placeholder="请输入入库单guid" />
<el-form-item :label="$t('searchViewStockinHistory.stockinGuid')" prop="stockinGuid"> <!-- 入库单guid -->
<el-input v-model="form.stockinGuid" :placeholder="$t('searchViewStockinHistory.inputStockinGuid')" />
</el-form-item>
<el-form-item label="入库单号" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库单号" />
<el-form-item :label="$t('searchViewStockinHistory.stockinId')" prop="stockinId"> <!-- 入库单号 -->
<el-input v-model="form.stockinId" :placeholder="$t('searchViewStockinHistory.inputStockinId')" />
</el-form-item>
<el-form-item label="入库类型" prop="inType">
<el-select v-model="form.inType" placeholder="请选择入库类型">
<el-form-item :label="$t('searchViewStockinHistory.inType')" prop="inType"> <!-- 入库类型 -->
<el-select v-model="form.inType" :placeholder="$t('searchViewStockinHistory.selectInType')">
<el-option
v-for="dict in dict.type.in_job_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-input v-model="form.createDate" placeholder="请输入创建时间" />
<el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> <!-- 创建时间 -->
<el-date-picker clearable
v-model="form.createDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewStockinHistory.selectCreateDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入创建人" />
<el-form-item :label="$t('searchViewStockinHistory.createManId')" prop="createManId"> <!-- 创建人 -->
<el-input v-model="form.createManId" :placeholder="$t('searchViewStockinHistory.inputCreateManId')" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" placeholder="请选择单据状态">
<el-form-item :label="$t('searchViewStockinHistory.status')" prop="status"> <!-- 单据状态 -->
<el-select v-model="form.status" :placeholder="$t('searchViewStockinHistory.selectStatus')">
<el-option
v-for="dict in dict.type.in_bill_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
<el-form-item :label="$t('searchViewStockinHistory.warehouseId')" prop="warehouseId"> <!-- 仓库ID -->
<el-input v-model="form.warehouseId" :placeholder="$t('searchViewStockinHistory.inputWarehouseId')" />
</el-form-item>
<el-form-item label="完成时间" prop="finishDate">
<el-input v-model="form.finishDate" placeholder="请输入完成时间" />
<el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> <!-- 完成时间 -->
<el-date-picker clearable
v-model="form.finishDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('searchViewStockinHistory.selectFinishDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="ERP单号" prop="erpBill">
<el-input v-model="form.erpBill" placeholder="请输入ERP单号" />
<el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill"> <!-- ERP单号 -->
<el-input v-model="form.erpBill" :placeholder="$t('searchViewStockinHistory.inputErpBill')" />
</el-form-item>
<el-form-item label="单据来源" prop="stockSource">
<el-input v-model="form.stockSource" placeholder="请输入单据来源" />
<el-form-item :label="$t('searchViewStockinHistory.stockSource')" prop="stockSource"> <!-- 单据来源 -->
<el-input v-model="form.stockSource" :placeholder="$t('searchViewStockinHistory.inputStockSource')" />
</el-form-item>
<el-form-item label="部门编码" prop="departmentNo">
<el-input v-model="form.departmentNo" type="textarea" placeholder="请输入内容" />
<el-form-item :label="$t('searchViewStockinHistory.departmentNo')" prop="departmentNo"> <!-- 部门编码 -->
<el-input v-model="form.departmentNo" :placeholder="$t('searchViewStockinHistory.inputDepartmentNo')" />
</el-form-item>
<el-form-item label="班组编码" prop="classNo">
<el-input v-model="form.classNo" placeholder="请输入班组编码" />
<el-form-item :label="$t('searchViewStockinHistory.classNo')" prop="classNo"> <!-- 班组编码 -->
<el-input v-model="form.classNo" :placeholder="$t('searchViewStockinHistory.inputClassNo')" />
</el-form-item>
<el-form-item label="供应商编号" prop="supplierNo">
<el-input v-model="form.supplierNo" placeholder="请输入供应商编号" />
<el-form-item :label="$t('searchViewStockinHistory.supplierNo')" prop="supplierNo"> <!-- 供应商编号 -->
<el-input v-model="form.supplierNo" :placeholder="$t('searchViewStockinHistory.inputSupplierNo')" />
</el-form-item>
<el-form-item label="供应商名称" prop="supplierName">
<el-input v-model="form.supplierName" placeholder="请输入供应商名称" />
<el-form-item :label="$t('searchViewStockinHistory.supplierName')" prop="supplierName"> <!-- 供应商名称 -->
<el-input v-model="form.supplierName" :placeholder="$t('searchViewStockinHistory.inputSupplierName')" />
</el-form-item>
<el-form-item label="供应商简称" prop="simpleName">
<el-input v-model="form.simpleName" placeholder="请输入供应商简称" />
<el-form-item :label="$t('searchViewStockinHistory.simpleName')" prop="simpleName"> <!-- 供应商简称 -->
<el-input v-model="form.simpleName" :placeholder="$t('searchViewStockinHistory.inputSimpleName')" />
</el-form-item>
<el-form-item label="联系人" prop="contactName">
<el-input v-model="form.contactName" placeholder="请输入联系人" />
<el-form-item :label="$t('searchViewStockinHistory.contactName')" prop="contactName"> <!-- 联系人 -->
<el-input v-model="form.contactName" :placeholder="$t('searchViewStockinHistory.inputContactName')" />
</el-form-item>
<el-form-item label="联系电话" prop="contactNumber">
<el-input v-model="form.contactNumber" placeholder="请输入联系电话" />
<el-form-item :label="$t('searchViewStockinHistory.contactNumber')" prop="contactNumber"> <!-- 联系电话 -->
<el-input v-model="form.contactNumber" :placeholder="$t('searchViewStockinHistory.inputContactNumber')" />
</el-form-item>
<el-form-item label="供应商地址" prop="address">
<el-input v-model="form.address" placeholder="请输入供应商地址" />
<el-form-item :label="$t('searchViewStockinHistory.address')" prop="address"> <!-- 供应商地址 -->
<el-input v-model="form.address" :placeholder="$t('searchViewStockinHistory.inputAddress')" />
</el-form-item>
<el-form-item label="入库明细ID" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库明细ID" />
<el-form-item :label="$t('searchViewStockinHistory.stockinDetailId')" prop="stockinDetailId"> <!-- 入库明细ID -->
<el-input v-model="form.stockinDetailId" :placeholder="$t('searchViewStockinHistory.inputStockinDetailId')" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('searchViewStockinHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('searchViewStockinHistory.inputLotNo')" />
</el-form-item>
<el-form-item label="入库日期" prop="printDate">
<el-form-item :label="$t('searchViewStockinHistory.printDate')" prop="printDate"> <!-- 入库日期 -->
<el-date-picker clearable
v-model="form.printDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择入库日期">
:placeholder="$t('searchViewStockinHistory.selectPrintDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
:value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="单价" prop="price">
<el-input v-model="form.price" placeholder="请输入单价" />
<el-form-item :label="$t('searchViewStockinHistory.price')" prop="price"> <!-- 单价 -->
<el-input v-model="form.price" :placeholder="$t('searchViewStockinHistory.inputPrice')" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-form-item :label="$t('searchViewStockinHistory.remark')" prop="remark"> <!-- 备注 -->
<el-input v-model="form.remark" :placeholder="$t('searchViewStockinHistory.inputRemark')" />
</el-form-item>
<el-form-item label="物料编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物料编码" />
<el-form-item :label="$t('searchViewStockinHistory.productId')" prop="productId"> <!-- 物料编码 -->
<el-input v-model="form.productId" :placeholder="$t('searchViewStockinHistory.inputProductId')" />
</el-form-item>
<el-form-item label="物料名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物料名称" />
<el-form-item :label="$t('searchViewStockinHistory.productName')" prop="productName"> <!-- 物料名称 -->
<el-input v-model="form.productName" :placeholder="$t('searchViewStockinHistory.inputProductName')" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
<el-form-item :label="$t('searchViewStockinHistory.cargoNo')" prop="cargoNo"> <!-- 品牌 -->
<el-input v-model="form.cargoNo" :placeholder="$t('searchViewStockinHistory.inputCargoNo')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<el-form-item :label="$t('searchViewStockinHistory.unit')" prop="unit"> <!-- 单位 -->
<el-input v-model="form.unit" :placeholder="$t('searchViewStockinHistory.inputUnit')" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item :label="$t('searchViewStockinHistory.spec')" prop="spec"> <!-- 规格 -->
<el-input v-model="form.spec" :placeholder="$t('searchViewStockinHistory.inputSpec')" />
</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('searchViewStockinHistory.confirm') }}</el-button> <!-- 确 定 -->
<el-button @click="cancel">{{ $t('searchViewStockinHistory.cancel') }}</el-button> <!-- 取 消 -->
</div>
</el-dialog>
</div>
@@ -654,19 +664,19 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加入库单据历史"
this.reset();
this.open = true;
this.title = this.$t('searchViewStockinHistory.addTitle'); // "添加入库单据历史"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
this.reset();
const stockinGuid = row.stockinGuid || this.ids
getViewStockinHistory(stockinGuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改入库单据历史"
})
this.form = response.data;
this.open = true;
this.title = this.$t('searchViewStockinHistory.editTitle'); // "修改入库单据历史"
});
},
/** 提交按钮 */
submitForm() {
@@ -674,13 +684,13 @@ export default {
if (valid) {
if (this.form.stockinGuid != null) {
updateViewStockinHistory(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess(this.$t('searchViewStockinHistory.editSuccess')); // "修改成功"
this.open = false
this.getList()
})
} else {
addViewStockinHistory(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.$modal.msgSuccess(this.$t('searchViewStockinHistory.addSuccess')); // "新增成功"
this.open = false
this.getList()
})
@@ -691,11 +701,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockinGuids = row.stockinGuid || this.ids
this.$modal.confirm('是否确认删除入库单据历史编号为"' + stockinGuids + '"的数据项？').then(function() {
this.$modal.confirm(this.$t('searchViewStockinHistory.deleteConfirm', {id: stockinGuids})).then(function() { // '是否确认删除入库单据历史编号为"' + stockinGuids + '"的数据项？'
return delViewStockinHistory(stockinGuids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess(this.$t('searchViewStockinHistory.deleteSuccess')); // "删除成功"
}).catch(() => {})
},
/** 导出按钮操作 */

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

@@ -1,16 +1,16 @@
<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="stockoutId">
<el-form-item :label="$t('searchViewStockoutHistory.stockoutId')" prop="stockoutId"> <!-- 出库单号 -->
<el-input
v-model="queryParams.stockoutId"
placeholder="请输入出库单号"
:placeholder="$t('searchViewStockoutHistory.inputStockoutId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<el-select v-model="queryParams.outType" placeholder="请选择出库类型" clearable>
<el-form-item :label="$t('searchViewStockoutHistory.outType')" prop="outType"> <!-- 出库类型 -->
<el-select v-model="queryParams.outType" :placeholder="$t('searchViewStockoutHistory.selectOutType')" clearable>
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
@@ -19,24 +19,24 @@
/>
</el-select>
</el-form-item>
<el-form-item label="创建日期" prop="createDate">
<el-form-item :label="$t('searchViewStockoutHistory.createDate')" prop="createDate"> <!-- 创建日期 -->
<el-date-picker clearable
v-model="queryParams.createDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建日期">
:placeholder="$t('searchViewStockoutHistory.selectCreateDate')">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="创建人ID" prop="createManId">-->
<!-- <el-form-item :label="$t('searchViewStockoutHistory.createManId')" prop="createManId">-->
<!-- <el-input-->
<!-- v-model="queryParams.createManId"-->
<!-- placeholder="请输入创建人ID"-->
<!-- :placeholder="$t('searchViewStockoutHistory.inputCreateManId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="出库状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择出库状态" clearable>
<el-form-item :label="$t('searchViewStockoutHistory.status')" prop="status"> <!-- 出库状态 -->
<el-select v-model="queryParams.status" :placeholder="$t('searchViewStockoutHistory.selectStatus')" clearable>
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
@@ -45,114 +45,114 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="出库来源" prop="stockoutSource">-->
<!-- <el-form-item :label="$t('searchViewStockoutHistory.stockoutSource')" prop="stockoutSource">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutSource"-->
<!-- placeholder="请输入出库来源"-->
<!-- :placeholder="$t('searchViewStockoutHistory.inputStockoutSource')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="出口类型" prop="exitId">
<el-form-item :label="$t('searchViewStockoutHistory.exitId')" prop="exitId"> <!-- 出口类型 -->
<el-input
v-model="queryParams.exitId"
placeholder="请输入出口类型"
:placeholder="$t('searchViewStockoutHistory.inputExitId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="出库子单ID" prop="stockoutDetailId">-->
<!-- <el-form-item :label="$t('searchViewStockoutHistory.stockoutDetailId')" prop="stockoutDetailId">-->
<!-- <el-input-->
<!-- v-model="queryParams.stockoutDetailId"-->
<!-- placeholder="请输入出库子单ID"-->
<!-- :placeholder="$t('searchViewStockoutHistory.inputStockoutDetailId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="产品ID" prop="productId">
<el-form-item :label="$t('searchViewStockoutHistory.productId')" prop="productId"> <!-- 产品ID -->
<el-input
v-model="queryParams.productId"
placeholder="请输入产品ID"
:placeholder="$t('searchViewStockoutHistory.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-form-item :label="$t('searchViewStockoutHistory.productName')" prop="productName"> <!-- 产品名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入产品名称"
:placeholder="$t('searchViewStockoutHistory.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('searchViewStockoutHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('searchViewStockoutHistory.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库数量" prop="quantity">
<el-form-item :label="$t('searchViewStockoutHistory.quantity')" prop="quantity"> <!-- 出库数量 -->
<el-input
v-model="queryParams.quantity"
placeholder="请输入出库数量"
:placeholder="$t('searchViewStockoutHistory.inputQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="分配数量" prop="allotQuantity">-->
<!-- <el-form-item :label="$t('searchViewStockoutHistory.allotQuantity')" prop="allotQuantity">-->
<!-- <el-input-->
<!-- v-model="queryParams.allotQuantity"-->
<!-- placeholder="请输入分配数量"-->
<!-- :placeholder="$t('searchViewStockoutHistory.inputAllotQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="分配编号" prop="assignNum">-->
<!-- <el-form-item :label="$t('searchViewStockoutHistory.assignNum')" prop="assignNum">-->
<!-- <el-input-->
<!-- v-model="queryParams.assignNum"-->
<!-- placeholder="请输入分配编号"-->
<!-- :placeholder="$t('searchViewStockoutHistory.inputAssignNum')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="ERP出库单ID" prop="erpStockoutId" style="white-space: nowrap">
<el-form-item :label="$t('searchViewStockoutHistory.erpStockoutId')" prop="erpStockoutId" style="white-space: nowrap"> <!-- ERP出库单ID -->
<el-input
v-model="queryParams.erpStockoutId"
placeholder="请输入ERP出库单ID"
:placeholder="$t('searchViewStockoutHistory.inputErpStockoutId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户编号" prop="entryid">
<el-form-item :label="$t('searchViewStockoutHistory.entryid')" prop="entryid"> <!-- 客户编号 -->
<el-input
v-model="queryParams.entryid"
placeholder="请输入客户编号"
:placeholder="$t('searchViewStockoutHistory.inputEntryid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-form-item :label="$t('searchViewStockoutHistory.customerName')" prop="customerName"> <!-- 客户名称 -->
<el-input
v-model="queryParams.customerName"
placeholder="请输入客户名称"
:placeholder="$t('searchViewStockoutHistory.inputCustomerName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-form-item :label="$t('searchViewStockoutHistory.spec')" prop="spec"> <!-- 规格 -->
<el-input
v-model="queryParams.spec"
placeholder="请输入规格"
:placeholder="$t('searchViewStockoutHistory.inputSpec')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-form-item :label="$t('searchViewStockoutHistory.brand')" prop="cargoNo"> <!-- 品牌 -->
<el-input
v-model="queryParams.cargoNo"
placeholder="请输入品牌"
:placeholder="$t('searchViewStockoutHistory.inputBrand')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -166,8 +166,8 @@
<!-- />-->
<!-- </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('searchViewStockoutHistory.search')}} <!-- 搜索 --></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockoutHistory.reset')}} <!-- 重置 --></el-button>
</el-form-item>
</el-form>
@@ -212,45 +212,45 @@
size="mini"
@click="handleExport"
v-hasPermi="['search:ViewStockoutHistory:export']"
>导出</el-button>
>{{$t('searchViewStockoutHistory.export')}} <!-- 导出 --></el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ViewStockoutHistoryList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="出库单号" align="center" prop="stockoutId" />
<el-table-column label="出库类型" align="center" prop="outType">
<el-table-column label="出库单号" align="center" prop="stockoutId" :label="$t('searchViewStockoutHistory.stockoutId')" /> <!-- 出库单号 -->
<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="创建日期" align="center" prop="createDate" width="180">
<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="创建人ID" align="center" prop="createManId" />
<el-table-column label="出库状态" align="center" prop="status">
<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="出库来源" align="center" prop="stockoutSource" />
<el-table-column label="出口类型" align="center" prop="exitId" />
<el-table-column label="出库明细ID" align="center" prop="stockoutDetailId" />
<el-table-column label="产品ID" align="center" prop="productId" />
<el-table-column label="产品名称" align="center" prop="productName" />
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="出库数量" align="center" prop="quantity" />
<el-table-column label="分配数量" align="center" prop="allotQuantity" />
<el-table-column label="分配编号" align="center" prop="assignNum" />
<el-table-column label="ERP出库单ID" align="center" prop="erpStockoutId" />
<el-table-column label="客户编号" align="center" prop="entryid" />
<el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column label="规格" align="center" prop="spec" />
<el-table-column label="品牌" align="center" prop="cargoNo" />
<el-table-column label="单位" align="center" prop="unit" />
<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.brand')" align="center" prop="cargoNo" /> <!-- 品牌 -->
<el-table-column :label="$t('searchViewStockoutHistory.unit')" align="center" prop="unit" /> <!-- 单位 -->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
@@ -282,11 +282,11 @@
<!-- 添加或修改出库单据历史对话框 -->
<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="stockoutId">
<el-input v-model="form.stockoutId" placeholder="请输入出库单号" />
<el-form-item :label="$t('searchViewStockoutHistory.stockoutId')" prop="stockoutId"> <!-- 出库单号 -->
<el-input v-model="form.stockoutId" :placeholder="$t('searchViewStockoutHistory.inputStockoutId')" />
</el-form-item>
<el-form-item label="出库类型" prop="outType">
<el-select v-model="form.outType" placeholder="请选择出库类型">
<el-form-item :label="$t('searchViewStockoutHistory.outType')" prop="outType"> <!-- 出库类型 -->
<el-select v-model="form.outType" :placeholder="$t('searchViewStockoutHistory.selectOutType')">
<el-option
v-for="dict in dict.type.out_bill_type"
:key="dict.value"
@@ -295,19 +295,19 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="创建日期" prop="createDate">
<el-form-item :label="$t('searchViewStockoutHistory.createDate')" prop="createDate"> <!-- 创建日期 -->
<el-date-picker clearable
v-model="form.createDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建日期">
:placeholder="$t('searchViewStockoutHistory.selectCreateDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="创建人ID" prop="createManId">
<el-input v-model="form.createManId" placeholder="请输入创建人ID" />
<el-form-item :label="$t('searchViewStockoutHistory.createManId')" prop="createManId"> <!-- 创建人ID -->
<el-input v-model="form.createManId" :placeholder="$t('searchViewStockoutHistory.inputCreateManId')" />
</el-form-item>
<el-form-item label="出库状态" prop="status">
<el-select v-model="form.status" placeholder="请选择出库状态">
<el-form-item :label="$t('searchViewStockoutHistory.status')" prop="status"> <!-- 出库状态 -->
<el-select v-model="form.status" :placeholder="$t('searchViewStockoutHistory.selectStatus')">
<el-option
v-for="dict in dict.type.out_bill_status"
:key="dict.value"
@@ -316,55 +316,55 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="出库来源" prop="stockoutSource">
<el-input v-model="form.stockoutSource" placeholder="请输入出库来源" />
<el-form-item :label="$t('searchViewStockoutHistory.stockoutSource')" prop="stockoutSource"> <!-- 出库来源 -->
<el-input v-model="form.stockoutSource" :placeholder="$t('searchViewStockoutHistory.inputStockoutSource')" />
</el-form-item>
<el-form-item label="出口类型" prop="exitId">
<el-input v-model="form.exitId" placeholder="请输入出口类型" />
<el-form-item :label="$t('searchViewStockoutHistory.exitId')" prop="exitId"> <!-- 出口类型 -->
<el-input v-model="form.exitId" :placeholder="$t('searchViewStockoutHistory.inputExitId')" />
</el-form-item>
<el-form-item label="出库明细ID" prop="stockoutDetailId">
<el-input v-model="form.stockoutDetailId" placeholder="请输入出库明细ID" />
<el-form-item :label="$t('searchViewStockoutHistory.stockoutDetailId')" prop="stockoutDetailId"> <!-- 出库明细ID -->
<el-input v-model="form.stockoutDetailId" :placeholder="$t('searchViewStockoutHistory.inputStockoutDetailId')" />
</el-form-item>
<el-form-item label="产品ID" prop="productId">
<el-input v-model="form.productId" placeholder="请输入产品ID" />
<el-form-item :label="$t('searchViewStockoutHistory.productId')" prop="productId"> <!-- 产品ID -->
<el-input v-model="form.productId" :placeholder="$t('searchViewStockoutHistory.inputProductId')" />
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入产品名称" />
<el-form-item :label="$t('searchViewStockoutHistory.productName')" prop="productName"> <!-- 产品名称 -->
<el-input v-model="form.productName" :placeholder="$t('searchViewStockoutHistory.inputProductName')" />
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('searchViewStockoutHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('searchViewStockoutHistory.inputLotNo')" />
</el-form-item>
<el-form-item label="出库数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入出库数量" />
<el-form-item :label="$t('searchViewStockoutHistory.quantity')" prop="quantity"> <!-- 出库数量 -->
<el-input v-model="form.quantity" :placeholder="$t('searchViewStockoutHistory.inputQuantity')" />
</el-form-item>
<el-form-item label="分配数量" prop="allotQuantity">
<el-input v-model="form.allotQuantity" placeholder="请输入分配数量" />
<el-form-item :label="$t('searchViewStockoutHistory.allotQuantity')" prop="allotQuantity"> <!-- 分配数量 -->
<el-input v-model="form.allotQuantity" :placeholder="$t('searchViewStockoutHistory.inputAllotQuantity')" />
</el-form-item>
<el-form-item label="分配编号" prop="assignNum">
<el-input v-model="form.assignNum" placeholder="请输入分配编号" />
<el-form-item :label="$t('searchViewStockoutHistory.assignNum')" prop="assignNum"> <!-- 分配编号 -->
<el-input v-model="form.assignNum" :placeholder="$t('searchViewStockoutHistory.inputAssignNum')" />
</el-form-item>
<el-form-item label="ERP出库单ID" prop="erpStockoutId">
<el-input v-model="form.erpStockoutId" placeholder="请输入ERP出库单ID" />
<el-form-item :label="$t('searchViewStockoutHistory.erpStockoutId')" prop="erpStockoutId"> <!-- ERP出库单ID -->
<el-input v-model="form.erpStockoutId" :placeholder="$t('searchViewStockoutHistory.inputErpStockoutId')" />
</el-form-item>
<el-form-item label="客户编号" prop="entryid">
<el-input v-model="form.entryid" placeholder="请输入客户编号" />
<el-form-item :label="$t('searchViewStockoutHistory.entryid')" prop="entryid"> <!-- 客户编号 -->
<el-input v-model="form.entryid" :placeholder="$t('searchViewStockoutHistory.inputEntryid')" />
</el-form-item>
<el-form-item label="客户名称" prop="customerName">
<el-input v-model="form.customerName" placeholder="请输入客户名称" />
<el-form-item :label="$t('searchViewStockoutHistory.customerName')" prop="customerName"> <!-- 客户名称 -->
<el-input v-model="form.customerName" :placeholder="$t('searchViewStockoutHistory.inputCustomerName')" />
</el-form-item>
<el-form-item label="规格" prop="spec">
<el-input v-model="form.spec" placeholder="请输入规格" />
<el-form-item :label="$t('searchViewStockoutHistory.spec')" prop="spec"> <!-- 规格 -->
<el-input v-model="form.spec" :placeholder="$t('searchViewStockoutHistory.inputSpec')" />
</el-form-item>
<el-form-item label="品牌" prop="cargoNo">
<el-input v-model="form.cargoNo" placeholder="请输入品牌" />
<el-form-item :label="$t('searchViewStockoutHistory.brand')" prop="cargoNo"> <!-- 品牌 -->
<el-input v-model="form.cargoNo" :placeholder="$t('searchViewStockoutHistory.inputBrand')" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" />
<el-form-item :label="$t('searchViewStockoutHistory.unit')" prop="unit"> <!-- 单位 -->
<el-input v-model="form.unit" :placeholder="$t('searchViewStockoutHistory.inputUnit')" />
</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('searchViewStockoutHistory.confirm')}} <!-- 确定 --></el-button>
<el-button @click="cancel">{{$t('searchViewStockoutHistory.cancel')}} <!-- 取消 --></el-button>
</div>
</el-dialog>
</div>