|
|
@ -8,7 +8,7 @@ |
|
|
:searchForm="searchForm" |
|
|
:searchForm="searchForm" |
|
|
:headerButton="headerButton" |
|
|
:headerButton="headerButton" |
|
|
:padMainColumn="padMainColumn" |
|
|
:padMainColumn="padMainColumn" |
|
|
:padDeatilColumn="padDeatilColumn" |
|
|
:padDeatilColumn="padDeatilColumn_list" |
|
|
:listRowButton="listRowButton" |
|
|
:listRowButton="listRowButton" |
|
|
:padListLoading="padListLoading" |
|
|
:padListLoading="padListLoading" |
|
|
:padListPager="padListPager" |
|
|
:padListPager="padListPager" |
|
|
@ -20,6 +20,8 @@ |
|
|
@headerButtonClick="headerButtonClick" |
|
|
@headerButtonClick="headerButtonClick" |
|
|
@headerSearchHandle="headerSearchHandle" |
|
|
@headerSearchHandle="headerSearchHandle" |
|
|
@resetSearchHandle="resetSearchHandle" |
|
|
@resetSearchHandle="resetSearchHandle" |
|
|
|
|
|
:mainColumnNum="4" |
|
|
|
|
|
:detailColumnNum="4" |
|
|
:padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]" |
|
|
:padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]" |
|
|
></padListPage> |
|
|
></padListPage> |
|
|
<!-- :mainIsShowDetail="true" --> |
|
|
<!-- :mainIsShowDetail="true" --> |
|
|
@ -39,6 +41,7 @@ |
|
|
:searchData="compeletFormData" |
|
|
:searchData="compeletFormData" |
|
|
:searchForm="compeletForm" |
|
|
:searchForm="compeletForm" |
|
|
:rules="compeletRule" |
|
|
:rules="compeletRule" |
|
|
|
|
|
@changeInput="compeletChangeInput" |
|
|
></currenForm> |
|
|
></currenForm> |
|
|
<curren-descriptions |
|
|
<curren-descriptions |
|
|
v-if="compeletHandleVisible" |
|
|
v-if="compeletHandleVisible" |
|
|
@ -96,7 +99,7 @@ import { padListPageMixins } from "@/mixins/padListPageMixins" |
|
|
import padListPage from "./components/padListPage/index" |
|
|
import padListPage from "./components/padListPage/index" |
|
|
import currenForm from "@/components/currenForm" |
|
|
import currenForm from "@/components/currenForm" |
|
|
import currenDescriptions from "@/components/currenDescriptions" |
|
|
import currenDescriptions from "@/components/currenDescriptions" |
|
|
import { getInventoryByPackingCode } from '@/api/wms-api' |
|
|
import { getInventoryByPackingCode,getPageList } from '@/api/wms-api' |
|
|
import { transferLibJobHandel } from '@/api/wms-job' |
|
|
import { transferLibJobHandel } from '@/api/wms-job' |
|
|
import { inventoryBalanceRecommendList } from '@/api/wms-pad' |
|
|
import { inventoryBalanceRecommendList } from '@/api/wms-pad' |
|
|
import { filterSelectMixins } from '@/mixins/filter-Select' |
|
|
import { filterSelectMixins } from '@/mixins/filter-Select' |
|
|
@ -162,21 +165,31 @@ export default { |
|
|
// { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true }, |
|
|
// { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true }, |
|
|
{ label: "传入申请单号", prop: "callRequestNumber" }, |
|
|
{ label: "传入申请单号", prop: "callRequestNumber" }, |
|
|
{ label: "传入任务单号", prop: "callJobNumber" }, |
|
|
{ label: "传入任务单号", prop: "callJobNumber" }, |
|
|
{ label: "任务描述", prop: 'jobDescription' }, |
|
|
// { label: "任务描述", prop: 'jobDescription' }, |
|
|
{ label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, |
|
|
// { label: "使用在途库", prop: 'useOnTheWayLocation', type: "filter", filters: "whetherOrNot" }, |
|
|
{ label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, |
|
|
// { label: "已确认", prop: 'confirmed',type: "filter", filters: "whetherOrNot" }, |
|
|
{ label: "确认时间", prop: 'confirmTime' }, |
|
|
// { label: "确认时间", prop: 'confirmTime' }, |
|
|
{ label: "备注", prop: "remark" }, |
|
|
// { label: "备注", prop: "remark" }, |
|
|
{ label: "操作员", prop: "worker" }, |
|
|
// { label: "操作员", prop: "worker" }, |
|
|
{ label: "承接用户", prop: "acceptUserName" }, |
|
|
// { label: "承接用户", prop: "acceptUserName" }, |
|
|
{ label: "承接时间", prop: 'acceptTime', type: "dateTime" }, |
|
|
// { label: "承接时间", prop: 'acceptTime', type: "dateTime" }, |
|
|
{ label: "完成者用户名", prop: 'completeUserName' }, |
|
|
// { label: "完成者用户名", prop: 'completeUserName' }, |
|
|
{ label: "完成时间", prop: "completeTime", type: "dateTime" }, |
|
|
// { label: "完成时间", prop: "completeTime", type: "dateTime" }, |
|
|
{ label: "创建时间", prop: 'creationTime', type: "dateTime" }, |
|
|
// { label: "创建时间", prop: 'creationTime', type: "dateTime" }, |
|
|
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, |
|
|
// { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, |
|
|
// { label: "回调服务名称", prop: "callServerName" }, |
|
|
// { label: "回调服务名称", prop: "callServerName" }, |
|
|
// { label: "回调业务类型", prop: "callBusinessType" }, |
|
|
// { label: "回调业务类型", prop: "callBusinessType" }, |
|
|
], |
|
|
], |
|
|
|
|
|
padDeatilColumn_list:[ |
|
|
|
|
|
{ label: _Names.itemCode, prop: "itemCode"}, |
|
|
|
|
|
{ label: _Names.itemName, prop: "itemName" }, |
|
|
|
|
|
{ label: _Names.itemDesc1, prop: "itemDesc1" }, |
|
|
|
|
|
{ label: _Names.itemDesc2, prop: "itemDesc2" }, |
|
|
|
|
|
{ label: "推荐来源数量", prop: 'recommendFromQty' }, |
|
|
|
|
|
{ label: "推荐目标箱标签", prop: 'recommendToPackingCode' }, |
|
|
|
|
|
{ label: "推荐来源库位", prop: 'recommendFromLocationCode' }, |
|
|
|
|
|
{ label: "推荐目标库位", prop: 'recommendToLocationCode' }, |
|
|
|
|
|
], |
|
|
padDeatilColumn:[ |
|
|
padDeatilColumn:[ |
|
|
{ label: _Names.itemCode, prop: "itemCode"}, |
|
|
{ label: _Names.itemCode, prop: "itemCode"}, |
|
|
{ label: _Names.itemName, prop: "itemName" }, |
|
|
{ label: _Names.itemName, prop: "itemName" }, |
|
|
@ -236,8 +249,8 @@ export default { |
|
|
}, |
|
|
}, |
|
|
compeletForm: [ |
|
|
compeletForm: [ |
|
|
{ type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, }, |
|
|
{ type: "input", label: "箱码", prop: 'packingCode', colSpan: 12, }, |
|
|
{ type: "input", label: "来源库位", prop: 'fromLocationCode', colSpan: 12, }, |
|
|
{ type: "input", disabled:true, label: "来源库位", prop: 'fromLocationCode', colSpan: 12, }, |
|
|
{ type: "input", label: "目标库位", prop: 'toLocationCode', colSpan: 12, }, |
|
|
{ type: "input", disabled:true, label: "目标库位", prop: 'toLocationCode', colSpan: 12, }, |
|
|
// filterSelect示例： |
|
|
// filterSelect示例： |
|
|
// { type: "filterSelect", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", |
|
|
// { type: "filterSelect", label: "目标库位", prop: "toLocationCode", optionsLabel: "name", optionsValue: "code", |
|
|
// focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},colSpan: 12 |
|
|
// focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},colSpan: 12 |
|
|
@ -280,13 +293,56 @@ export default { |
|
|
{ label: "到货时间", prop: "arriveDate", type: "dateTime" }, |
|
|
{ label: "到货时间", prop: "arriveDate", type: "dateTime" }, |
|
|
{ label: "过期时间", prop: "expireDate", type: "dateTime" }, |
|
|
{ label: "过期时间", prop: "expireDate", type: "dateTime" }, |
|
|
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, |
|
|
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, |
|
|
] |
|
|
], |
|
|
|
|
|
canCompeletHandle:false,//是否可以执行完成库移，取决于箱码是否符合标准 |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
mounted(){ |
|
|
mounted(){ |
|
|
this.initPage() |
|
|
this.initPage() |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
// 完成库移箱码更改事件 |
|
|
|
|
|
compeletChangeInput(prop, val){ |
|
|
|
|
|
if(prop == 'packingCode'){ |
|
|
|
|
|
this.compeletFormData.fromLocationCode = "" |
|
|
|
|
|
this.compeletFormData.toLocationCode = "" |
|
|
|
|
|
if(val == ""){ |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
let _data = { |
|
|
|
|
|
Sorting: "", |
|
|
|
|
|
SkipCount: 0, |
|
|
|
|
|
MaxResultCount: 1000, |
|
|
|
|
|
condition: {filters: [ |
|
|
|
|
|
{ |
|
|
|
|
|
logic: 'And', |
|
|
|
|
|
column: "packingCode", |
|
|
|
|
|
action: "==", |
|
|
|
|
|
value: val |
|
|
|
|
|
} |
|
|
|
|
|
]}, |
|
|
|
|
|
} |
|
|
|
|
|
this.compeletLoading = true |
|
|
|
|
|
this.canCompeletHandle = false |
|
|
|
|
|
getPageList(_data, 'wms/inventory/inventory-balance') |
|
|
|
|
|
.then(res => { |
|
|
|
|
|
this.compeletLoading = false |
|
|
|
|
|
if(!res.items || res.items.length <= 0){ |
|
|
|
|
|
return this.$errorMsg("当前箱码无库存信息，请更改箱码") |
|
|
|
|
|
} |
|
|
|
|
|
let _inventory = res.items[0] |
|
|
|
|
|
if(_inventory.locationCode != this.currentRowData.details[0].recommendFromLocationCode){ |
|
|
|
|
|
return this.$errorMsg("当前箱码的库位与推荐来源库位不符，请更改箱码") |
|
|
|
|
|
} |
|
|
|
|
|
this.canCompeletHandle = true |
|
|
|
|
|
this.compeletFormData.fromLocationCode = _inventory.locationCode |
|
|
|
|
|
this.compeletFormData.toLocationCode = this.currentRowData.details[0].recommendToLocationCode |
|
|
|
|
|
}).catch(err => { |
|
|
|
|
|
this.compeletLoading = false |
|
|
|
|
|
this.$errorMsg("获取库存失败") |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
// 头部其他按钮点击事件 |
|
|
// 头部其他按钮点击事件 |
|
|
headerButtonClick(item,index){ |
|
|
headerButtonClick(item,index){ |
|
|
if(item.name == 'showCanHandle'){ |
|
|
if(item.name == 'showCanHandle'){ |
|
|
@ -358,6 +414,10 @@ export default { |
|
|
}, |
|
|
}, |
|
|
// 完成库移-确定 |
|
|
// 完成库移-确定 |
|
|
compeletHandleSure(val){ |
|
|
compeletHandleSure(val){ |
|
|
|
|
|
if(!this.canCompeletHandle){ |
|
|
|
|
|
this.$errorMsg("当前箱码不符合移库标准，请检查") |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
let _form = this.$refs.compeletHandleForm_Ref.$refs.form |
|
|
let _form = this.$refs.compeletHandleForm_Ref.$refs.form |
|
|
_form.validate((valid) => { |
|
|
_form.validate((valid) => { |
|
|
if (valid) { |
|
|
if (valid) { |
|
|
|
