From 3e406a03b49935bf3a4d8525bc9681a03887dd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 3 Apr 2023 15:33:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AD=97=E6=AE=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/filters/options.js | 2 +- fe/PC/src/utils/tableColumns/index.js | 81 +++++++------- fe/PC/src/utils/tabsDesTions/index.js | 101 +++++++++--------- .../views/basicData/WarehouseManage/Dock.vue | 14 +-- .../WarehouseManage/ItemSafetyStock.vue | 16 +-- .../WarehouseManage/ItemStoreRelation.vue | 12 ++- .../basicData/WarehouseManage/Location.vue | 26 +++-- .../WarehouseManage/LocationGroup.vue | 82 +++++++------- .../basicData/WorkshopManage/ProdLineItem.vue | 4 +- .../basicData/WorkshopManage/WorkCenter.vue | 20 ++-- 10 files changed, 190 insertions(+), 168 deletions(-) diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js index 7632bcbc1..c3c5f518d 100644 --- a/fe/PC/src/filters/options.js +++ b/fe/PC/src/filters/options.js @@ -132,7 +132,7 @@ export function Roles(val){ // "Company": "公司", // "Customer": "客户", // "CustomerItem": "客户物品", - // "WorkStation": "工作站", + // "WorkStation": "工作中心", // "Team": "班组", // "Supplier": "供应商", // "SupplierItem": "供应商物品", diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 5f6e0b58b..8d2c18568 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -442,6 +442,7 @@ export const Dock = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "备注", prop: "remark" }, + { label: "仓库代码", prop: 'warehouseCode' }, // { // label: "操作", @@ -487,28 +488,28 @@ export const LocationGroup = [ { label: "区域代码", prop: "areaCode" }, { label: "库位组名称", prop: 'name' }, { label: "仓库代码", prop: "warehouseCode" }, - { label: "类型", prop: "groupType", type: "filter", filters: "locationType" }, - { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, + { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" }, + { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "描述", prop: "description" }, // ------------------------------------------ { label: "溢流库位组", prop: "overflowLocationGroup" }, - { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, - { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, - { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, - { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, - { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, - { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, - { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, - { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, - { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, - { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, - { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, - { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, - { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, - { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, + { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, { label: "备注", prop: "remark" }, @@ -558,8 +559,8 @@ export const Location = [ { label: "区域代码", prop: "areaCode" }, { label: "库位组代码", prop: "locationGroupCode" }, { label: "工作组代码", prop: "workGroupCode" }, - { label: "类型", prop: "type", type: "filter", filters: "locationType" }, - { label: "ERP库位", prop: "erpLocationCode" }, + { label: "库位类型", prop: "type", type: "filter", filters: "locationType" }, + { label: "ERP系统库位代码", prop: "erpLocationCode" }, { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage", width:'130px' }, // ----------------------------------------------------------------------- { label: "货架号", prop: "shelfCode" }, @@ -567,21 +568,21 @@ export const Location = [ { label: "列号", prop: "columnCode" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "拣料顺序", prop: "pickOrder" }, - { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: "remark" }, { label: "描述", prop: "description" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, @@ -662,7 +663,7 @@ export const ItemSafetyStock = [ }, { label: "仓库代码", prop: "warehouseCode" }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, - { label: "值", prop: "storeValue" }, + { label: "存储关系代码", prop: "storeValue" }, { label: "最大库存", prop: "maxStock" }, { label: "最小库存", prop: "minStock" }, { label: "安全库存", prop: "safetyStock" }, @@ -769,7 +770,7 @@ export const ProductionLine = [ // 生产线零件关系 20230328 export const ProductionLineItem = [ { label: "物品代码", prop: "itemCode", type: "name" }, - { label: "生产线编号", prop: "prodLineCode" }, + { label: "生产线代码", prop: "prodLineCode" }, { label: "备注", prop: "remark" }, // ----------------------------------------------------------------------- { label: "创建时间", prop: "creationTime", type: "dateTime" }, @@ -782,7 +783,7 @@ export const ProductionLineItem = [ // fixed: "right" // }, ] -// 工作站信息 20230328 +// 工作中心信息 20230328 export const WorkCenter = [ { label: "编号", @@ -791,10 +792,10 @@ export const WorkCenter = [ prop: "code" }, { label: "生产线", prop: "productionLineCode" }, - { label: "类型", prop: "type", type: "filter", filters: "workCenterType" }, + { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" }, // --------------------------------------- { label: "名称", prop: "name" }, - { label: "描述", prop: "description" }, + { label: "工作中心描述", prop: "description" }, { label: "原料库位", prop: "rawLocationCode" }, { label: "成品库位", prop: "productLocationCode" }, { label: "创建时间", prop: "creationTime", type: "dateTime" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index a2261fdd9..5adebb9fa 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -300,8 +300,8 @@ export const SupplierTimeWindow = [ ] // 收货口信息 20230328 export const Dock = [ - { label: "默认库位编号", prop: "defaultLocationCode" }, - { label: "收货口编号", prop: "code" }, + { label: "默认库位代码", prop: "defaultLocationCode" }, + { label: "收货口代码", prop: "code" }, { label: "收货口名称", prop: 'name' }, { label: "描述", prop: "description" }, { label: "备注", prop: 'remark' }, @@ -311,7 +311,7 @@ export const Dock = [ { label: "创建者Id", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "仓库代码", prop: 'warehouseCode' }, { label: "id", prop: 'id' }, // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- @@ -338,8 +338,8 @@ export const Area = [ // 库位组信息 20230328 export const LocationGroup = [ { label: "区域代码", prop: "areaCode" }, - { label: "类型", prop: "groupType", type: "filter", filters: "locationType" }, - { label: "状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, + { label: "库位组类型", prop: "groupType", type: "filter", filters: "locationType" }, + { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "编号", prop: "code" }, { label: "名称", prop: 'name' }, @@ -350,7 +350,7 @@ export const LocationGroup = [ // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" }, // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" }, // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" }, - // { label: "是否机会盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, + // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" }, // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" }, // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" }, @@ -367,24 +367,24 @@ export const LocationGroup = [ { label: "创建者Id", prop: "creatorId" }, { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, - { label: "仓库", prop: 'warehouseCode' }, + { label: "仓库代码", prop: 'warehouseCode' }, + { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, { label: "id", prop: 'id' }, - { label: "可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, - { label: "可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, - { label: "可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, - { label: "可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, - { label: "可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, - { label: "可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, - { label: "可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, - { label: "可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, - { label: "可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, - { label: "可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, - { label: "可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, - { label: "可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, - { label: "可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, - { label: "可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] @@ -412,35 +412,36 @@ export const Location = [ { label: "区域代码", prop: "areaCode" }, { label: "库位组代码", prop: "locationGroupCode" }, { label: "工作组代码", prop: "workGroupCode" }, - { label: "类型", prop: "type", type: "filter", filters: "locationType" }, + { label: "库位类型", prop: "type", type: "filter", filters: "locationType" }, { label: "行号", prop: "rowCode" }, { label: "列号", prop: "columnCode" }, { label: "默认库存状态", prop: "defaultInventoryStatus", type: "filter", filters: "inventoryStage" }, { label: "拣料优先级", prop: "pickPriority" }, { label: "拣料顺序", prop: "pickOrder" }, { label: "货架号", prop: "shelfCode" }, - { label: "ERP库位", prop: "erpLocationCode" }, - { label: "是否可以混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以机会盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, - { label: "是否可以拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "ERP系统库位代码", prop: "erpLocationCode" }, + { label: "是否混物品", prop: "enableMixItem", type: "filter", filters: "whetherOrNot" }, + { label: "是否混批次", prop: "enableMixLot", type: "filter", filters: "whetherOrNot" }, + { label: "是否混状态", prop: "enableMixStatus", type: "filter", filters: "whetherOrNot" }, + { label: "是否负库存", prop: "enableNegative", type: "filter", filters: "whetherOrNot" }, + { label: "是否保留零库存", prop: "enableKeepZero", type: "filter", filters: "whetherOrNot" }, + { label: "是否动态盘点", prop: "enableOpportunityCount", type: "filter", filters: "whetherOrNot" }, + { label: "是否领料", prop: "enablePick", type: "filter", filters: "whetherOrNot" }, + { label: "是否过量领料", prop: "enableOverPick", type: "filter", filters: "whetherOrNot" }, + { label: "是否整包存储", prop: "enableWholeStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否散件存储", prop: "enableBreakStore", type: "filter", filters: "whetherOrNot" }, + { label: "是否发出", prop: "enableShip", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收", prop: "enableReceive", type: "filter", filters: "whetherOrNot" }, + { label: "是否退货给供应商", prop: "enableReturnToSupplier", type: "filter", filters: "whetherOrNot" }, + { label: "是否接收客户退货", prop: "enableReturnFromCustomer", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆箱", prop: "enableSplitBox", type: "filter", filters: "whetherOrNot" }, + { label: "是否拆托", prop: "enableSplitPallet", type: "filter", filters: "whetherOrNot" }, // { label: "是否混物品", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixItem" }, // { label: "是否混批次", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixLot" }, // { label: "是否混状态", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableMixStatus" }, // { label: "是否负库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableNegative" }, // { label: "是否保留零库存", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableKeepZero" }, - // { label: "是否盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, + // { label: "是否动态盘点", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOpportunityCount" }, // { label: "是否领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enablePick" }, // { label: "是否过量领料", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableOverPick" }, // { label: "是否整包存储", prop: "locSwitch", type: "objectFilter", filters: "whetherOrNot", showProp: "enableWholeStore" }, @@ -466,7 +467,7 @@ export const Location = [ // 库位零件关系 20230331 export const ItemStoreRelation = [ { label: "物品代码", prop: "itemCode" }, - { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, + { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" }, { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, { label: "主存储容量", prop: "umQty" }, @@ -512,7 +513,7 @@ export const ItemSafetyStock = [ { label: "物品代码", prop: "itemCode" }, { label: "仓库", prop: "warehouseCode" }, { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, - { label: "值", prop: "storeValue" }, + { label: "存储关系代码", prop: "storeValue" }, { label: "最大库存", prop: "maxStock" }, { label: "最小库存", prop: "minStock" }, { label: "安全库存", prop: "safetyStock" }, @@ -600,7 +601,7 @@ export const ProductionLine = [ // 生产线零件关系 20230328 export const ProductionLineItem = [ { label: "物品代码", prop: "itemCode" }, - { label: "生产线编号", prop: "prodLineCode" }, + { label: "生产线代码", prop: "prodLineCode" }, { label: "备注", prop: "remark" }, // ----------------------------------------------------------------------- { label: "事务代码", prop: "tenantId" }, @@ -612,15 +613,15 @@ export const ProductionLineItem = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 工作站信息 20230328 +// 工作中心信息 20230328 export const WorkCenter = [ - { label: "生产线编号", prop: "productionLineCode" }, + { label: "生产线代码", prop: "productionLineCode" }, { label: "原料库位", prop: "rawLocation" }, { label: "成品库位", prop: "productLocation" }, - { label: "工作站编号", prop: "code" }, - { label: "工作站名称", prop: 'name' }, - { type: "filter", label: "类型", prop: "type", filters: "workCenterType" }, - { label: "描述", prop: "description" }, + { label: "工作中心代码", prop: "code" }, + { label: "工作中心名称", prop: 'name' }, + { label: "工作中心类型", prop: "type", type: "filter", filters: "workCenterType" }, + { label: "工作中心描述", prop: "description" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "事务代码", prop: "tenantId" }, diff --git a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue index aa44c5808..60f2ffd02 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Dock.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Dock.vue @@ -132,7 +132,7 @@ export default { defaultLocationCode: null, description: null, name: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), remark: null }, //编辑 @@ -142,27 +142,29 @@ export default { defaultLocationCode: null, description: null, name: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), remark: null }, editOptions: {}, CreateForm: [ - { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 }, - { type: "input", label: "收货口编号", prop: "code", validType:'numberLetter', colSpan: 12 }, + { type: "input", label: "收货口代码", prop: "code", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, ], editForm: [ - { type: "input", label: "收货口编号", prop: "code", disabled:"true", colSpan: 12 }, - { type: "filterSelect", label: "默认库位编号", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", + { type: "input", label: "收货口代码", prop: "code", disabled:"true", colSpan: 12 }, + { type: "filterSelect", label: "默认库位代码", prop: "defaultLocationCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "收货口名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, ], editRules: { cerateRule: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue index b36e54f1a..ea2e1563c 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue @@ -154,7 +154,7 @@ export default { //新增 CreateFormData: { itemCode: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), storeRelationType: 1, storeValue: null, maxStock: null, @@ -170,7 +170,7 @@ export default { //编辑 editFormData: { itemCode: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), storeRelationType: 1, storeValue: null, maxStock: null, @@ -188,8 +188,8 @@ export default { { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 }, - { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, - { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", + { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url, this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 }, @@ -199,11 +199,13 @@ export default { { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + ], editForm: [ { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 }, - { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, - { type: "filterSelect", label: "值", prop: "storeValue", optionsLabel: "name", optionsValue: "code", + { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url, this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "最大库存", validType:'pointNumber', prop: "maxStock", colSpan: 12 }, @@ -213,6 +215,8 @@ export default { { type: "input", label: "补料数量", validType:'pointNumber', prop: "feedQty", colSpan: 12 }, { type: "input", label: "补料单位", prop: "feedUM", colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + ], editRules: { cerateRule: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue index 08ed7a0d9..ba13e0d81 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue @@ -153,7 +153,7 @@ export default { //新增 CreateFormData: { remark: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), storeRelationType: 1, storeValue: null, enabled: true, @@ -171,7 +171,7 @@ export default { editFormData: { itemCode: null, remark: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), storeRelationType: 1, storeValue: null, enabled: true, @@ -189,7 +189,7 @@ export default { { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/item-basic', 'ItemBasic', '区域选择', this.CreateFormData) }, colSpan: 12 }, - { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' }, @@ -201,10 +201,12 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, this.storeValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.storeValue.url , this.storeValue.tabColumns, '值选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, ], editForm: [ { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 }, - { type: "select", label: "储存关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, + { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 }, { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "主存储容量", prop: "umQty", colSpan: 12, validType:'pointNumber' }, @@ -216,6 +218,8 @@ export default { focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)}, searchButton: (val) => { this.showSerarchPage(val, this.ediStoreValue.url , this.ediStoreValue.tabColumns, '值选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + { type: "input", label: "占用多库位", prop: 'multiLoc', disabled:"true", colSpan: 12 }, ], editRules: { cerateRule: { diff --git a/fe/PC/src/views/basicData/WarehouseManage/Location.vue b/fe/PC/src/views/basicData/WarehouseManage/Location.vue index f732163c4..d294cb812 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Location.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Location.vue @@ -133,7 +133,7 @@ export default { //新增 CreateFormData: { remark: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), name: null, description: null, type: 1, @@ -187,7 +187,7 @@ export default { //编辑 editFormData: { remark: null, - warehouseCode: null, + warehouseCode: localStorage.getItem('warehouseCode'), name: null, description: null, type: 1, @@ -237,20 +237,20 @@ export default { { type: "input", label: "名称", prop: "name", colSpan: 12 }, // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 }, // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 }, - { type: "select", label: "类型", prop: "type", options: "locationType", colSpan: 12 }, + { type: "select", label: "库位类型", prop: "type", options: "locationType", colSpan: 12 }, { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' }, { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' }, { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' }, { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' }, { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 }, - { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 }, + { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 }, { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, @@ -260,12 +260,13 @@ export default { { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, @@ -277,6 +278,7 @@ export default { // { type: "objectSelect", label: "是否拆箱", prop: "locSwitch", showProp: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, ], editForm: [ { type: "input", label: "库位代码", prop: "code", disabled:"true", colSpan: 12 }, @@ -292,20 +294,20 @@ export default { { type: "input", label: "名称", prop: "name", colSpan: 12 }, // { type: "input", label: "库位数量", valueType: Number, prop: "qty", colSpan: 12 }, // { type: "select", label: "库位数量单位", prop: "uom", options: "qtyUomType", colSpan: 12 }, - { type: "select", label: "类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 }, + { type: "select", label: "库位类型", prop: "type", options: "locationType", clearable: true, colSpan: 12 }, { type: "input", label: "行号", prop: "rowCode", colSpan: 12, validType:'number' }, { type: "input", label: "列号", prop: "columnCode", colSpan: 12, validType:'number' }, { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12, validType:'number' }, { type: "input", label: "拣料顺序", prop: "pickOrder", colSpan: 12, validType:'number' }, { type: "input", label: "货架号", prop: "shelfCode", colSpan: 12 }, - { type: "input", label: "ERP库位", prop: "erpLocationCode", colSpan: 12 }, + { type: "input", label: "ERP系统库位代码", prop: "erpLocationCode", colSpan: 12 }, { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, @@ -313,10 +315,12 @@ export default { { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否拆箱", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, ], editRules: { cerateRule: { @@ -328,6 +332,7 @@ export default { erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], rowCode:[{required: true, trigger: "change", message: "不可为空"}], columnCode:[{required: true, trigger: "change", message: "不可为空"}], + defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}], }, editRule: { pickPriority: [{ required: true, trigger: "change", message: "不可为空" },], @@ -337,6 +342,7 @@ export default { erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], rowCode:[{required: true, trigger: "change", message: "不可为空"}], columnCode:[{required: true, trigger: "change", message: "不可为空"}], + defaultInventoryStatus:[{required: true, trigger: "change", message: "不可为空"}], } }, // 自定义详情明细汇总等table页 diff --git a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue index 762857846..768c3bad1 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/LocationGroup.vue @@ -208,34 +208,34 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "库位组代码", prop: "code", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 }, - { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 }, - { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, + { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 }, + { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, - { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, // { type: "objectSelect", label: "是否混物品", prop: "locSwitch", showProp: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否混批次", prop: "locSwitch", showProp: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否混状态", prop: "locSwitch", showProp: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否负库存", prop: "locSwitch", showProp: "enableNegative", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否保留零库存", prop: "locSwitch", showProp: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - // { type: "objectSelect", label: "是否机会盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + // { type: "objectSelect", label: "是否动态盘点", prop: "locSwitch", showProp: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否领料", prop: "locSwitch", showProp: "enablePick", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否过量领料", prop: "locSwitch", showProp: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否整包存储", prop: "locSwitch", showProp: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, @@ -245,6 +245,7 @@ export default { // { type: "objectSelect", label: "是否退货给供应商", prop: "locSwitch", showProp: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, // { type: "objectSelect", label: "是否接收客户退货", prop: "locSwitch", showProp: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "描述", prop: 'description', colSpan: 12 }, ], editForm: [ { type: "filterSelect", label: "区域代码", prop: "areaCode", optionsLabel: "name", optionsValue: "code", @@ -252,29 +253,30 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/area', 'Area', '区域选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "库位组代码", prop: "code", disabled:"true", colSpan: 12 }, { type: "input", label: "库位组名称", prop: 'name', colSpan: 12 }, - { type: "select", label: "类型", prop: "groupType", options: "locationType", colSpan: 12 }, - { type: "select", label: "状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, + { type: "select", label: "库位组类型", prop: "groupType", options: "locationType", colSpan: 12 }, + { type: "select", label: "默认库存状态", prop: "defaultInventoryStatus", options: "inventoryStage", colSpan: 12 }, { type: "input", label: "拣料优先级", prop: "pickPriority", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "溢流库位组", prop: "overflowLocationGroup", colSpan: 12 }, - { type: "select", label: "可以混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "可以接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否可以拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, - { type: "select", label: "是否可以拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "仓库", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, + { type: "select", label: "是否混物品", prop: "enableMixItem", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否混批次", prop: "enableMixLot", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否混状态", prop: "enableMixStatus", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否负库存", prop: "enableNegative", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否保留零库存", prop: "enableKeepZero", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否动态盘点", prop: "enableOpportunityCount", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否领料", prop: "enablePick", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否过量领料", prop: "enableOverPick", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否整包存储", prop: "enableWholeStore", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否散件存储", prop: "enableBreakStore", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否发出", prop: "enableShip", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否接收", prop: "enableReceive", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否退货给供应商", prop: "enableReturnToSupplier", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否接收客户退货", prop: "enableReturnFromCustomer", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆箱", prop: "enableSplitBox", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "是否拆托", prop: "enableSplitPallet", options: "whetherOrNot", colSpan: 12 }, + { type: "input", label: "仓库代码", prop: 'warehouseCode', disabled:"true", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, + { type: "input", label: "描述", prop: 'description', colSpan: 12 }, ], editRules: { cerateRule: { @@ -284,11 +286,13 @@ export default { areaCode: [{ required: true, trigger: "change", message: "不可为空" }], pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 + defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 }, editRule: { name: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 areaCode: [{ required: true, trigger: "change", message: "不可为空" }], pickPriority: [{ required: true, trigger: "blur", message: "不可为空" }], + defaultInventoryStatus: [{ required: true, trigger: "blur", message: "不可为空" }],//编辑必选 } }, }; diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue index c0690d096..544f751c4 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue @@ -152,7 +152,7 @@ export default { { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 }, - { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, @@ -161,7 +161,7 @@ export default { { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 }, - { type: "filterSelect", label: "生产线编号", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue index b5fe0fcc3..f3ce98d3d 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/WorkCenter.vue @@ -151,7 +151,7 @@ export default { }, editOptions: {}, CreateForm: [ - { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 }, { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", @@ -160,14 +160,14 @@ export default { { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 }, - { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 }, - { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 }, - { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, + { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 }, + { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 }, + { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 }, + { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ - { type: "filterSelect", label: "生产线编号", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", + { type: "filterSelect", label: "生产线代码", prop: "productionLineCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 }, { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", @@ -176,10 +176,10 @@ export default { { type: "filterSelect", label: "成品库位", prop: "productLocation", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 }, - { type: "input", label: "工作站编号", prop: "code", validType:'numberLetter', colSpan: 12 }, - { type: "input", label: "工作站名称", prop: 'name', colSpan: 12 }, - { type: "select", label: "类型", prop: "type", options: "workCenterType", colSpan: 12 }, - { type: "input", label: "描述", prop: "description", colSpan: 12 }, + { type: "input", label: "工作中心代码", prop: "code", validType:'numberLetter', colSpan: 12 }, + { type: "input", label: "工作中心名称", prop: 'name', colSpan: 12 }, + { type: "select", label: "工作中心类型", prop: "type", options: "workCenterType", colSpan: 12 }, + { type: "input", label: "工作中心描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: {