diff --git a/fe/PC/src/api/wms-core.js b/fe/PC/src/api/wms-core.js index ce1e420bb..965aa35c5 100644 --- a/fe/PC/src/api/wms-core.js +++ b/fe/PC/src/api/wms-core.js @@ -2,7 +2,7 @@ import request from '@/utils/request' // let baseURL = localStorage.getItem('print') + '/api/' let baseURL = localStorage.getItem('base') + '/api/' -// 批量获取箱标签信息 | 到货通知 +// 批量获取箱标签信息 | 到货请求 export function getInventoryLabelByCodes(data) { return request({ url: baseURL + 'label/inventory-label/by-codes', diff --git a/fe/PC/src/components/tablePagination/index.vue b/fe/PC/src/components/tablePagination/index.vue index 0dc850f0b..80d345f81 100644 --- a/fe/PC/src/components/tablePagination/index.vue +++ b/fe/PC/src/components/tablePagination/index.vue @@ -139,7 +139,7 @@ export default { type: Boolean, default: false, }, - // todo:当前组件内没有使用，待确定是否可以删除 + // 选择当前行数据 multipleSelection: { type: Array, default: () => { diff --git a/fe/PC/src/filters/options.js b/fe/PC/src/filters/options.js index 7632bcbc1..9fee56b6f 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": "供应商物品", @@ -179,7 +179,7 @@ export function Roles(val){ // "PreparationPlan": "备料计划", // "ProductReceiptNote": "完工收货记录", // "OfflineSettlementNote": "下线结算记录", - // "ArriveNotice": "到货通知", + // "PurchaseReceiptRequest": "到货请求", // "PurchaseReceiptNote": "采购收货记录", // "ReceiptAbnormalNote": "收货异常记录", // "PurchaseReturnNote": "采购退货记录", diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 4a91aaedb..6ad595c34 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -430,9 +430,9 @@ export function calendarStatus(index, prop) { } /** * @param {Boolean} - * @returns {object} '到货通知状态' + * @returns {object} '到货请求' */ -export function arriveNoticeStatus(index, prop) { +export function PurchaseReceiptRequestStatus(index, prop) { let status = { 1: { label: "关闭", diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index 56d45b967..3a00b2674 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -136,6 +136,8 @@ export const tableMixins = { }, // 获取供应商信息过滤tableData getSupplierByCodesHandle_table() { + this.Loading.tableLoading = false + return for(let i=0;i { 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: "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 6a034a97b..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, @@ -189,7 +189,7 @@ export default { 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: "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: "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 7cb687052..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, @@ -201,6 +201,8 @@ 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 }, @@ -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: { diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue similarity index 97% rename from fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue rename to fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue index 6fb58bdee..1340ec3ba 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/ArriveNotice-ms.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptRequest.vue @@ -66,7 +66,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"; import { mixins } from "@/mixins/mixins"; import {initPrintPackingCodeManyData } from "@/mixins/printMixin" export default { - name: "ArriveNotice", + name: "PurchaseReceiptRequest", mixins: [ tableMixins, LoadingMixins, @@ -83,7 +83,7 @@ export default { }, data() { return { - URL: "wms/store/arrive-notice", + URL: "wms/store/purchase-receipt-request", DrawerButtonData: [ { type: 'info', @@ -96,6 +96,7 @@ export default { ], //常用按钮数据 currenButtonData: [ + this.defaultExportBtn(),//导出 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新 this.defaultFilterBtn(),//筛选