diff --git a/fe/PC/src/utils/index.js b/fe/PC/src/utils/index.js index c8fc7d57c..3acd355bb 100644 --- a/fe/PC/src/utils/index.js +++ b/fe/PC/src/utils/index.js @@ -585,6 +585,8 @@ export function initInterfaceType(res){ _item.interfaceType = '【TYRP】-【线边仓领料单】*【MES】-【发料单】' } else if (item.transType == 15 && item.transSubType == 1501) { _item.interfaceType = '【TYRP】-【线边仓领料单】*【MES】-【发料单】' + } else if (item.transType == 15 && item.transSubType == 1503) { + _item.interfaceType = '【TYRP】-【线边仓调拨单 / 领料单】' } else if (item.transType == 16) { _item.interfaceType = '【TYRP】-【线边仓退料单】' } else if (item.transType == 31 && item.transSubType == 3102) { @@ -599,6 +601,10 @@ export function initInterfaceType(res){ _item.interfaceType = '【TYRP】-【线边仓调拨单】' } else if (item.transType == 31 && item.transSubType == 3108) { _item.interfaceType = '【TYRP】-【线边仓调拨单】' + } else if (item.transType == 31 && item.transSubType == 3109) { + _item.interfaceType = '【TYRP】-【拆箱】' + } else if (item.transType == 31 && item.transSubType == 3110) { + _item.interfaceType = '【TYRP】-【合箱】' } else if (item.transType == 21) { _item.interfaceType = '【TYRP】-【缴库单】' } else if (item.transType == 23 && item.transSubType == 2301) { diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index bf4e12ec6..3bd1c7539 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -655,7 +655,7 @@ export const ProductionLine = [ // 生产线零件关系 export const ProductionLineItem = [ { label: _Names.itemCode, prop: "itemCode", type: "name" }, - { label: _Names.itemName, prop: "itemName" }, + // { label: _Names.itemName, prop: "itemName" }, { label: _Names.itemDesc1, prop: "itemDesc1" }, { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "生产线代码", prop: "prodLineCode" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 804983d98..a91c7a9d2 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -475,7 +475,7 @@ export const ProductionLine = [ // 生产线零件关系 export const ProductionLineItem = [ { label: _Names.itemCode, prop: "itemCode" }, - { label: _Names.itemName, prop: "itemName" }, + // { label: _Names.itemName, prop: "itemName" }, { label: _Names.itemDesc1, prop: "itemDesc1" }, { label: _Names.itemDesc2, prop: "itemDesc2" }, { label: "生产线代码", prop: "prodLineCode" }, diff --git a/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue b/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue index e1e0e5b73..8ecc64c5f 100644 --- a/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue +++ b/fe/PC/src/views/padManage/isPadForNotifyOutTaskBack.vue @@ -51,11 +51,15 @@ export default { notifyOutTaskBack4FW(this.taskBackFormData) .then(res=>{ this.loading = false - this.taskBackFormData={ - endPosition:"", - returnQty:"", + if(res.code == '0'){ + this.taskBackFormData={ + endPosition:"", + returnQty:"", + } + this.$successMsg("成功!") + }else{ + this.$errorMsg(res.message) } - this.$successMsg("成功!") }) .catch(err=>{ this.loading = false