Browse Source

【agv-pc】12-23需求开发

ag_report_nev
安虹睿 4 months ago
parent
commit
19aac56405
  1. 20
      fe/PC/src/filters/status.js
  2. 22
      fe/PC/src/utils/tableColumns/index.js
  3. 21
      fe/PC/src/utils/tabsDesTions/index.js
  4. 2
      fe/PC/src/views/basicData/WarehouseManage/PostionLocation.vue
  5. 226
      fe/PC/src/views/basicData/WarehouseManage/locationDelivery.vue

20
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)
}

22
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 //隐藏该字段的列表排序

21
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" },
]

2
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: [

226
fe/PC/src/views/basicData/WarehouseManage/locationDelivery.vue

@ -0,0 +1,226 @@
<template>
<div class="page-box" v-loading="Loading.appMainLoading">
<tablePagination
:currenButtonData="currenButtonData"
:tableData="tableData"
:tableLoading="Loading.tableLoading"
:tableColumns="tableColumns"
@rowDrop="rowDrop"
:totalCount="totalCount"
:multipleSelection="multipleSelection"
:MaxResultCount="PageListParams.MaxResultCount"
@topbutton="topbutton"
@inlineDialog="inlineDialog"
@sortChange="sortChange"
@alertoldSkipCount="alertoldSkipCount"
@alterResultCount="alterResultCount"
@handleSelectionChange="handleSelectionChange"
@buttonOperationClick="buttonOperationClick"
:currentPageProps="oldSkipCount"
:quicklySearchOption="quicklySearchOption"
@quicklySearchClick="quicklySearchClick"
@quicklySearchClear="quicklySearchClear"
:primarySearchOption="primarySearchOption"
@overallSearchFormClick="overallSearchFormClick"
:httpOverallSearchData="httpOverallSearchData"
>
</tablePagination>
<!-- 新增与编辑 -->
<newAndEdiDialog
:loading="Loading.newAndEdiLoading"
:active="active"
:pageStatus="pageStatus"
:formReveal="formReveal"
:formTitle="formTitle"
:displayDialog="editDialog"
:FormData="formReveal ? CreateFormData : editFormData"
:Form="formReveal ? CreateForm : editForm"
:Options="editOptions"
:Handle="editHandle"
:Rules="formReveal ? editRules.cerateRule : editRules.editRule"
@FormSubmit="FormSubmit"
@close="FormClose"
@goBack="goBack"
></newAndEdiDialog>
<!-- 搜索按钮窗体组件 -->
<searchPage
ref="searchTable"
:tableLoading="Loading.autoTableLoading"
:advancedFilter="advancedFilter()"
:filterPageListParams="filterPageListParams"
:formTitle="searchTitle"
:displayDialog="displayDialog.AddNewDialog"
:searchTableData="searchData"
:searchTableColumns="searchColumns"
:searchTotalCount="searchTotalCount"
:supplierItemPage="searchPageListParams"
@handleSelectionChange="prepareFormData"
@SizeChange="searchAlterResultCount($event, searchPageListParams)"
@CurrentChange="searchAlertoldSkipCount($event, searchPageListParams)"
@tableButtonClick="searchSubmit(arguments)"
></searchPage>
<!-- 新导入 disabledMethod 导入方式禁用 disabledIsAllowPartImport 是否局部导入禁用-->
<!-- methodValue 导入方式默认选项 是否局部导入 默认选项 -->
<importFile
:loading="Loading.importLoading"
:show="displayDialog.importDialog"
:URL="URL"
:disabledMethod = {method1:false,method2:false,method3:false}
:disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
isAllowPartImportValue="1"
@importClick="postImportMergeClick(arguments)"
@postImportDown="importDown"
></importFile>
<curren-Drawer
:title="tableColumns"
:tableColumns="tableColumns"
:DrawerLoading="Loading.DrawerLoading"
:drawer="displayDialog.detailsDialog"
:dropdownData="dropdownData"
:propsData="propsData"
:tabsDesTions="tabsDesTions"
@drawerShut="(val) => (displayDialog.detailsDialog = val)"
@drawerbutton="drawerbutton"
@handleCommand="drawerHandle"
@close-value="closeValue"
></curren-Drawer>
</div>
</template>
<script>
import { postCreate, postUpdate } from "@/api/wms-api"
import { tableMixins } from "@/mixins/TableMixins"
import { LoadingMixins } from "@/mixins/LoadingMixins"
import { drawerMixins } from "@/mixins/drawerMixins"
import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
import { mixins } from "@/mixins/mixins"
import { filterSelectMixins } from '@/mixins/filter-Select'
import zh from '@/lang/zh'
let _Names = zh.ColumsNames //
export default {
name: "locationDelivery",
mixins: [
tableMixins,
LoadingMixins,
drawerMixins,
TableHeaderMixins,
mixins,
filterSelectMixins,
newAndEdiDialogMixins
],
computed: {
editDialog: {
get: function () {
return this.displayDialog.newDialog || this.displayDialog.editDialog;
},
},
},
data () {
return {
URL: 'basedata/location-delivery',
//
currenButtonData: [
this.defaultAddBtn(),//
this.defaultImportBtn(),//
this.defaultExportBtn(),//
this.defaultFieldSettingBtn(),//
this.defaultFreshBtn(),//
this.defaultFilterBtn(),//
],
//
CreateFormData: {
tenantId: null,
remark: "",
extraProperties: null,
warehouseCode: localStorage.getItem('warehouseCode'),
fromLocationCode:null,
toLocationCode: null,
enumLocationDeliveryType: 1,
},
//
editFormData: {
tenantId: null,
remark: "",
extraProperties: null,
warehouseCode: localStorage.getItem('warehouseCode'),
fromLocationCode:null,
toLocationCode: null,
enumLocationDeliveryType: 1,
},
editOptions: {},
CreateForm: [
{ type: "filterSelect", label: "来源库位", prop: "fromLocationCode", 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: "filterSelect", label: "目标库位", prop: "toLocationCode", 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: "select", label: "配送方式", prop: "enumLocationDeliveryType", options: "enumLocationDeliveryType", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editForm: [
{ type: "filterSelect", label: "来源库位", prop: "fromLocationCode", 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: "filterSelect", label: "目标库位", prop: "toLocationCode", 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: "select", label: "配送方式", prop: "enumLocationDeliveryType", options: "enumLocationDeliveryType", colSpan: 12 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
editRules: {
cerateRule: {
fromLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
toLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
enumLocationDeliveryType: [{ required: true, trigger: "change", message: "不可为空" }],
},
editRule: {
fromLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
toLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
enumLocationDeliveryType: [{ required: true, trigger: "change", message: "不可为空" }],
}
},
};
},
mounted () {
this.paging();
},
methods:{
//(warehouseCode)
FormSubmit(val) {
this.ref = val
this.Loading.newAndEdiLoading = true
switch (this.formReveal) {
case true:
postCreate(this.CreateFormData, this.URL).then(res => {
this.oldSkipCount = 1;
this.Loading.newAndEdiLoading = false
this.FormResult("success")
}).catch(err => {
this.Loading.newAndEdiLoading = false
this.FormResult("error")
})
break;
case false:
this.editFormData.warehouseCode = localStorage.getItem('warehouseCode')
postUpdate(this.editFormData, this.propsData.id, this.URL).then(res => {
this.propsData = res
this.Loading.newAndEdiLoading = false
this.FormResult("success")
}).catch(err => {
this.Loading.newAndEdiLoading = false
this.FormResult("error")
})
}
},
}
};
</script>
<style lang="scss" scoped>
@import "../../../styles/basicData.scss";
</style>
Loading…
Cancel
Save