diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 956f70ffa..d3f0fecc8 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -136,6 +136,11 @@ import store from '@/store/index' value: 30, background:"#00b6ff", }, + 31: { + label: "待AGV库移", + value: 31, + background:"#00b6ff", + }, } return Enum(status, index, prop) } @@ -2586,3 +2591,18 @@ export function enumIssueSendType(index, prop) { } return Enum(type, index, prop) } + +// 库位配送方式 +export function enumLocationDeliveryType(index, prop) { + let type = { + 1: { + value: 1, + label: "正常" + }, + 2: { + value: 2, + label: "AGV" + } + } + return Enum(type, index, prop) +} \ No newline at end of file diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 5cff35235..124300d01 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -3480,7 +3480,7 @@ export const IssueJobZS = [ { label: "完成时间", prop: 'completeTime',type: "dateTime" }, // { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, - // { label: "备注", prop: "remark" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -3493,6 +3493,7 @@ export const IssueNoteZS = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -3523,6 +3524,7 @@ export const IssueJobPT = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -3535,6 +3537,7 @@ export const IssueNotePT = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -3565,6 +3568,7 @@ export const IssueJobZP = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, // { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -3577,6 +3581,7 @@ export const IssueNoteZP = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -3607,6 +3612,7 @@ export const IssueJobBP = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -3619,6 +3625,7 @@ export const IssueNoteBP = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -3650,6 +3657,7 @@ export const KittingIssueJob = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -3662,6 +3670,7 @@ export const KittingIssueNote = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -3861,6 +3870,17 @@ export const isPadForTransferLibJob = [ { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] +// 库位配送方式 +export const locationDelivery = [ + { label: "来源库位", prop: 'fromLocationCode',fixed: "left", type: "name"}, + { label: "目标库位", prop: 'toLocationCode'}, + { label: "配送方式", prop: "enumLocationDeliveryType", type: "filter", filters: "enumLocationDeliveryType" }, + { label: "备注", prop: 'remark'}, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, +] + + // 字段说明 // showProp: true //隐藏该字段的高级筛选+列表排序 // sortable: false //隐藏该字段的列表排序 diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index f7ddae988..92aba2c0b 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -2245,7 +2245,7 @@ export const IssueJobZS = [ { label: "完成时间", prop: 'completeTime',type: "dateTime" }, // { label: "任务描述", prop: 'jobDescription' }, { label: "生产线", prop: 'prodLine' }, - // { label: "备注", prop: "remark" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -2258,6 +2258,7 @@ export const IssueNoteZS = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2291,6 +2292,7 @@ export const IssueJobPT = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -2303,6 +2305,7 @@ export const IssueNotePT = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2333,6 +2336,7 @@ export const IssueJobZP = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -2345,6 +2349,7 @@ export const IssueNoteZP = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2375,6 +2380,7 @@ export const IssueJobBP = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -2387,6 +2393,7 @@ export const IssueNoteBP = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2418,6 +2425,7 @@ export const KittingIssueJob = [ { label: "完成者用户名", prop: 'completeUserName' }, { label: "完成时间", prop: 'completeTime',type: "dateTime" }, { label: "生产线", prop: 'prodLine' }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -2430,6 +2438,7 @@ export const KittingIssueNote = [ { label: "任务单号", prop: 'jobNumber' }, { label: "叫料请求来源", prop: "issueRequestType", type: "filter", filters: "issueRequestType" }, { label: "叫料发货类型", prop: "enumIssueSendType", type: "filter", filters: "enumIssueSendType" }, + { label: "备注", prop: "remark" }, { label: "操作员", prop: "worker" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, // { label: "生效日期", prop: 'activeDate', type: "dateTime" }, @@ -2611,4 +2620,14 @@ export const isPadForTransferLibJob = [ { label: "完成时间", prop: "completeTime", type: "dateTime" }, { label: "创建时间", prop: 'creationTime', type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, +] + +// 库位配送方式 +export const locationDelivery = [ + { label: "来源库位", prop: 'fromLocationCode',fixed: "left", type: "name"}, + { label: "目标库位", prop: 'toLocationCode'}, + { label: "配送方式", prop: "enumLocationDeliveryType", type: "filter", filters: "enumLocationDeliveryType" }, + { label: "备注", prop: 'remark'}, + { label: "创建时间", prop: 'creationTime', type: "dateTime" }, + { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, ] \ No newline at end of file diff --git a/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue b/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue index 44a27122a..fd1615630 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue @@ -118,7 +118,7 @@ export default { }, data () { return { - URL: 'basedata/PostionLocation', + URL: 'basedata/postion-location', tableLoading: false, //常用按钮数据 currenButtonData: [ diff --git a/fe/PC/src/views/basicData/WarehouseManage/locationDelivery.vue b/fe/PC/src/views/basicData/WarehouseManage/locationDelivery.vue new file mode 100644 index 000000000..2d86c4205 --- /dev/null +++ b/fe/PC/src/views/basicData/WarehouseManage/locationDelivery.vue @@ -0,0 +1,226 @@ + + + \ No newline at end of file