|
|
|
@ -15,12 +15,12 @@ |
|
|
|
:getPadList="getPadList" |
|
|
|
:intSearchFilters="intSearchFilters" |
|
|
|
:padListParams="padListParams" |
|
|
|
:showDetailBtn="true" |
|
|
|
:mainIsShowDetail="true" |
|
|
|
@listRowButtonClick="listRowButtonClick" |
|
|
|
@headerButtonClick="headerButtonClick" |
|
|
|
@headerSearchHandle="headerSearchHandle" |
|
|
|
@resetSearchHandle="resetSearchHandle" |
|
|
|
:padMainStaColumn="[{prop:'number'},{prop:'jobStatus',filters:'jobStatus'}]" |
|
|
|
></padListPage> |
|
|
|
<!-- :mainIsShowDetail="true" --> |
|
|
|
<!-- 完成库移弹窗 --> |
|
|
|
@ -58,21 +58,30 @@ |
|
|
|
</el-dialog> |
|
|
|
<!-- 查看余额 --> |
|
|
|
<el-dialog |
|
|
|
class="showInventoryPop" |
|
|
|
title="查看余额" |
|
|
|
:visible="showInventoryVisible" |
|
|
|
top="5vh" |
|
|
|
width="90%"> |
|
|
|
<div v-loading="showInventoryLoading" style="height:calc(100vh - 280px);overflow:auto"> |
|
|
|
<curren-descriptions |
|
|
|
<div v-loading="showInventoryLoading" style="height:calc(100vh - 220px);overflow:auto"> |
|
|
|
<div |
|
|
|
class="showInventoryRow" |
|
|
|
v-for="(item,index) in inventoryTableData" |
|
|
|
:key="index" |
|
|
|
:column="3" |
|
|
|
:key="index"> |
|
|
|
<div class="commonRowTitle"> |
|
|
|
<el-tag size="mini" effect="dark">{{index + 1}}</el-tag> |
|
|
|
<div>{{item[inventoryColumn[6].prop]}}</div> |
|
|
|
</div> |
|
|
|
<curren-descriptions |
|
|
|
:column="2" |
|
|
|
:border="true" |
|
|
|
:direction="'horizontal'" |
|
|
|
:tabsDesTions="inventoryColumn" |
|
|
|
:propsData="currentRowData.details[0]" |
|
|
|
:propsData="item" |
|
|
|
style="width:100%;padding-top:20px" |
|
|
|
:labelStyle="{'width':'200px'}" |
|
|
|
></curren-descriptions> |
|
|
|
</div> |
|
|
|
<el-empty v-if="(!inventoryTableData || inventoryTableData.length <= 0) && !showInventoryLoading" description="暂无数据"></el-empty> |
|
|
|
</div> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
@ -89,7 +98,7 @@ import currenForm from "@/components/currenForm" |
|
|
|
import currenDescriptions from "@/components/currenDescriptions" |
|
|
|
import { getInventoryByPackingCode } from '@/api/wms-api' |
|
|
|
import { transferLibJobHandel } from '@/api/wms-job' |
|
|
|
import { inventoryBalanceUsableList } from '@/api/wms-pad' |
|
|
|
import { inventoryBalanceRecommendList } from '@/api/wms-pad' |
|
|
|
import { filterSelectMixins } from '@/mixins/filter-Select' |
|
|
|
|
|
|
|
export default { |
|
|
|
@ -127,8 +136,8 @@ export default { |
|
|
|
requestNumber:"", |
|
|
|
}, |
|
|
|
searchForm:[ |
|
|
|
{label:'任务单号',prop:'number',type:'input'}, |
|
|
|
{label:'申请单号',prop:'requestNumber',type:'input'}, |
|
|
|
{label:'传入申请单号',prop:'callRequestNumber',type:'input',width:'140px'}, |
|
|
|
{label:'传入任务单号',prop:'callJobNumber',type:'input',width:'140px'}, |
|
|
|
], |
|
|
|
showFilterSta:false, |
|
|
|
headerButton:[ |
|
|
|
@ -140,7 +149,7 @@ export default { |
|
|
|
}, |
|
|
|
{ |
|
|
|
type: 'danger', |
|
|
|
label: '重置数据状态[当前待执行]', |
|
|
|
label: '重置[待执行]数据', |
|
|
|
name: "showAllData", |
|
|
|
hide: () => { return this.hideButton(false) }, |
|
|
|
}, |
|
|
|
@ -148,7 +157,7 @@ export default { |
|
|
|
padMainColumn:[ |
|
|
|
{ label:'任务单号',prop:'number'}, |
|
|
|
{ label:'申请单号',prop:'requestNumber'}, |
|
|
|
{ label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true }, |
|
|
|
// { label: "状态", prop: "jobStatus",type: "tagFilter", filters: "jobStatus",titleBack:true }, |
|
|
|
{ label: "传入申请单号", prop: "callRequestNumber" }, |
|
|
|
{ label: "传入任务单号", prop: "callJobNumber" }, |
|
|
|
{ label: "任务描述", prop: 'jobDescription' }, |
|
|
|
@ -211,7 +220,7 @@ export default { |
|
|
|
}, |
|
|
|
{ |
|
|
|
type: 'primary', |
|
|
|
label: '查看余额', |
|
|
|
label: '查看库存余额', |
|
|
|
name: "showInventory", |
|
|
|
}, |
|
|
|
], |
|
|
|
@ -244,12 +253,31 @@ export default { |
|
|
|
showInventoryLoading:false, |
|
|
|
inventoryTableData:[], |
|
|
|
inventoryColumn:[ |
|
|
|
{ label: "物品代码", prop: "itemCode"}, |
|
|
|
{ label: "物品代码", prop: "itemCode" }, |
|
|
|
{ label: "物品名称", prop: "itemName" }, |
|
|
|
{ label: "物品描述1", prop: "itemDesc1" }, |
|
|
|
{ label: "物品描述2", prop: "itemDesc2" }, |
|
|
|
{ label: "请求数量", prop: 'requestQty' }, |
|
|
|
{ label: "请求ERP库位", prop: 'requestLocationErpCode' }, |
|
|
|
{ label: "计量单位", prop: "uom" }, |
|
|
|
{ label: '数量', prop: "qty" }, |
|
|
|
{ label: "箱码", prop: 'packingCode' }, |
|
|
|
{ label: "批次", prop: 'lot' }, |
|
|
|
{ label: "供应商批次", prop: "supplierBatch" }, |
|
|
|
{ label: "标包数量", prop: "stdPackQty" }, |
|
|
|
{ label: "库位", prop: 'locationCode' }, |
|
|
|
{ label: "ERP储位", prop: "locationErpCode" }, |
|
|
|
{ label: "库位组", prop: 'locationGroup' }, |
|
|
|
{ label: "标准成本单价", prop: "stdCostPrice" }, |
|
|
|
{ label: "标准成本金额", prop: "stdCost" }, |
|
|
|
{ label: "备注", prop: 'remark' }, |
|
|
|
{ label: "序号", prop: 'serialNumber' }, |
|
|
|
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" }, |
|
|
|
{ label: "库区", prop: 'locationArea' }, |
|
|
|
{ label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, |
|
|
|
{ label: "入库时间", prop: 'putInTime', type:"dateTime" }, |
|
|
|
{ label: "生产时间", prop: "produceDate", type: "dateTime" }, |
|
|
|
{ label: "到货时间", prop: "arriveDate", type: "dateTime" }, |
|
|
|
{ label: "过期时间", prop: "expireDate", type: "dateTime" }, |
|
|
|
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, |
|
|
|
] |
|
|
|
} |
|
|
|
}, |
|
|
|
@ -260,6 +288,17 @@ export default { |
|
|
|
// 头部其他按钮点击事件 |
|
|
|
headerButtonClick(item,index){ |
|
|
|
if(item.name == 'showCanHandle'){ |
|
|
|
this.showCanHandleFunc() |
|
|
|
} |
|
|
|
else if(item.name == 'showAllData'){ |
|
|
|
this.showFilterSta = false |
|
|
|
document.getElementById("padListCard").scrollTop = 0 |
|
|
|
this.clearSearchHandle(true) |
|
|
|
this.getPadList(); |
|
|
|
} |
|
|
|
}, |
|
|
|
// 筛选可执行功能 |
|
|
|
showCanHandleFunc(){ |
|
|
|
this.showFilterSta = true |
|
|
|
let _filters = [{ |
|
|
|
logic:"And", |
|
|
|
@ -271,13 +310,6 @@ export default { |
|
|
|
document.getElementById("padListCard").scrollTop = 0 |
|
|
|
this.clearSearchHandle() |
|
|
|
this.getPadList(); |
|
|
|
} |
|
|
|
else if(item.name == 'showAllData'){ |
|
|
|
this.showFilterSta = false |
|
|
|
document.getElementById("padListCard").scrollTop = 0 |
|
|
|
this.clearSearchHandle(true) |
|
|
|
this.getPadList(); |
|
|
|
} |
|
|
|
}, |
|
|
|
// 当前行按钮点击事件 |
|
|
|
listRowButtonClick(row,item){ |
|
|
|
@ -288,10 +320,10 @@ export default { |
|
|
|
itemCode:row.details[0].itemCode, |
|
|
|
qty:9999999999, |
|
|
|
statuses:'OK', |
|
|
|
isPackingCode:true |
|
|
|
locationTypes:'RAW' |
|
|
|
} |
|
|
|
this.showInventoryLoading = true |
|
|
|
inventoryBalanceUsableList(_params) |
|
|
|
inventoryBalanceRecommendList(_params) |
|
|
|
.then(res=>{ |
|
|
|
this.inventoryTableData = res |
|
|
|
this.showInventoryLoading = false |
|
|
|
@ -345,11 +377,15 @@ export default { |
|
|
|
transferLibJobHandel(this.currentRowData.id, _data).then(res => { |
|
|
|
this.compeletLoading = false |
|
|
|
this.$successMsg("完成库移成功！") |
|
|
|
this.initPage() |
|
|
|
if(this.showFilterSta){ |
|
|
|
this.showCanHandleFunc() |
|
|
|
} |
|
|
|
else{ |
|
|
|
this.getPadList() |
|
|
|
} |
|
|
|
this.compeletHandleClose() |
|
|
|
}).catch(err => { |
|
|
|
this.compeletLoading = false |
|
|
|
this.$errorMsg("完成库移失败！") |
|
|
|
}) |
|
|
|
}).catch(err => { |
|
|
|
this.compeletLoading = false |
|
|
|
@ -369,4 +405,15 @@ export default { |
|
|
|
</script> |
|
|
|
<style lang="scss" scoped> |
|
|
|
@import "@/styles/padMain.scss"; |
|
|
|
.showInventoryPop{ |
|
|
|
::v-deep .el-dialog__body{ |
|
|
|
padding:0 15px !important; |
|
|
|
} |
|
|
|
.showInventoryRow{ |
|
|
|
margin-bottom: 20px; |
|
|
|
.el-descriptions{ |
|
|
|
padding: 0 !important; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
</style> |
