diff --git a/src/api/collect/IoDestroy.js b/src/api/collect/IoDestroy.js index 050f2d57..716603a8 100644 --- a/src/api/collect/IoDestroy.js +++ b/src/api/collect/IoDestroy.js @@ -33,3 +33,11 @@ export function destroyOut(query) { data: query }); } + +export function destroyOutByCode(query) { + return axios({ + url: "/udiwms/collect/fifo/desOrder/destroyOutByCode", + method: "post", + data: query + }); +} diff --git a/src/views/collect/IoSplitFifoCodePanel.vue b/src/views/collect/IoSplitFifoCodePanel.vue index 86c17fe1..e4ba9955 100644 --- a/src/views/collect/IoSplitFifoCodePanel.vue +++ b/src/views/collect/IoSplitFifoCodePanel.vue @@ -455,6 +455,7 @@ > @@ -540,6 +541,7 @@ export default { addInvRemindSetDialogVisible: false, destroyOutDialogVisible: false, prescribeData: {}, + destroyType: 1,//1 产品损耗 2.根据code损耗 } }, @@ -686,11 +688,18 @@ export default { //损耗出库 destroyOut(_this,row){ _this.prescribeData = row + _this.destroyType = 1 _this.destroyOutDialogVisible = true; }, closeDialog(){ this.destroyOutDialogVisible = false this.getList() + this.detailClick(this,this.prescribeData) + }, + destroyOutByCode(_this,row){ + _this.prescribeData = row + _this.destroyType = 2 + _this.destroyOutDialogVisible = true; } }, diff --git a/src/views/collect/destroyOutDialog.vue b/src/views/collect/destroyOutDialog.vue index b0da5b31..0fc73d57 100644 --- a/src/views/collect/destroyOutDialog.vue +++ b/src/views/collect/destroyOutDialog.vue @@ -9,16 +9,22 @@ - {{ prescribeData.cpmctymc }} + + {{prescribeData.code}} + + {{ prescribeData.cpmctymc }} {{ prescribeData.nameCode }} {{ prescribeData.ggxh }} {{ prescribeData.batchNo }} {{ prescribeData.measname }} - {{ prescribeData.reCount }} + + {{prescribeData.reCount}} + + {{ produceDate }} {{ expireDate }} {{ prescribeData.manufactory }} - {{ prescribeData.supName }} + {{ prescribeData.ybbm }} @@ -52,7 +58,7 @@