Commit 375c9135 authored by jingnan's avatar jingnan 👀

打印标签相关代码修改

parent c18a3b0d
...@@ -70,6 +70,14 @@ export default { ...@@ -70,6 +70,14 @@ export default {
value: { value: {
type: [Number, String, Object], type: [Number, String, Object],
default: () => '' default: () => ''
},
formAttrs: {
type: Object,
default: () => {}
},
scope: {
type: Object,
default: () => {}
} }
}, },
data() { data() {
...@@ -189,7 +197,8 @@ export default { ...@@ -189,7 +197,8 @@ export default {
this.$api.searchApi('ExtDxProductWorkUnit', querys).then(res => { this.$api.searchApi('ExtDxProductWorkUnit', querys).then(res => {
this.options = res.items.content.map(row => { this.options = res.items.content.map(row => {
return { return {
value: row.id, // 批量移库打印标签需要使用到code
value: this.scope && this.scope.column && this.scope.column.property === 'currExtWorkUnitId' ? `${row.id}/${row.extcode}` : row.id,
label: row.extcode label: row.extcode
} }
}) })
...@@ -214,14 +223,16 @@ export default { ...@@ -214,14 +223,16 @@ export default {
if (querys.pageNumber === 1) { if (querys.pageNumber === 1) {
options = arr.map(row => { options = arr.map(row => {
return { return {
value: row.id, // 批量移库打印标签需要使用到code
value: this.scope && this.scope.column && this.scope.column.property === 'currExtWorkUnitId' ? `${row.id}/${row.extcode}` : row.id,
label: row.extcode label: row.extcode
} }
}) })
} else { } else {
options = [...this.options, ...arr.map(row => { options = [...this.options, ...arr.map(row => {
return { return {
value: row.id, // 批量移库打印标签需要使用到code
value: this.scope && this.scope.column && this.scope.column.property === 'currExtWorkUnitId' ? `${row.id}/${row.extcode}` : row.id,
label: row.extcode label: row.extcode
} }
})] })]
......
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
return { return {
inventoryId: item.id, inventoryId: item.id,
extWorkCenterId: extWorkCenterId, extWorkCenterId: extWorkCenterId,
extWorkUnitId: item.currExtWorkUnitId, extWorkUnitId: item.currExtWorkUnitId && item.currExtWorkUnitId.split('/') && Number(item.currExtWorkUnitId.split('/')[0]),
outsideAmount: item.currOutsideAmount, outsideAmount: item.currOutsideAmount,
disposeDes: item.currDisposeDes || '' disposeDes: item.currDisposeDes || ''
} }
...@@ -69,6 +69,7 @@ export default { ...@@ -69,6 +69,7 @@ export default {
} }
const reponse = await post('InventoryRequest/moveApplication/createMoveStorage', params) const reponse = await post('InventoryRequest/moveApplication/createMoveStorage', params)
this.$utils.showMessageSuccess(reponse.items) this.$utils.showMessageSuccess(reponse.items)
this.$bus.$emit('refreshMoveWarehouse')
this.$emit('cancel') this.$emit('cancel')
}, },
cancelEvent() { cancelEvent() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment