|
@@ -58,7 +58,7 @@
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import printView from './printView.vue'
|
|
|
import { STable, VSelect } from '@/components'
|
|
|
-import { shelfReplenishDetailList, shelfReplenishDetail, shelfReplenishPrintSign } from '@/api/shelfReplenish'
|
|
|
+import { shelfReplenishDetailList, shelfReplenishDetail } from '@/api/shelfReplenish'
|
|
|
export default {
|
|
|
name: 'PrintStickerModal',
|
|
|
components: { STable, VSelect, printView },
|
|
@@ -90,8 +90,8 @@ export default {
|
|
|
data = res.data
|
|
|
for (var i = 0; i < data.length; i++) {
|
|
|
data[i].no = i + 1
|
|
|
- data[i].maxQty = data[i].billState == 'FINISH' ? data[i].putQty : data[i].confirmQty
|
|
|
- data[i].printQty = data[i].billState == 'FINISH' ? data[i].putQty : data[i].confirmQty
|
|
|
+ data[i].maxQty = data[i].billState == 'FINISH' ? data[i].putQty : data[i].qty
|
|
|
+ data[i].printQty = data[i].billState == 'FINISH' ? data[i].putQty : data[i].qty
|
|
|
}
|
|
|
this.disabled = false
|
|
|
this.listData = data || []
|
|
@@ -114,14 +114,11 @@ export default {
|
|
|
const ret = [
|
|
|
{ title: '产品编码', dataIndex: 'product.code', width: '22%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '补货应发数量', dataIndex: 'qty', width: '13%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
- { title: '实发数量', dataIndex: 'confirmQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '补货数量', dataIndex: 'qty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
+ { title: '签收数量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '打印数量', scopedSlots: { customRender: 'printQty' }, width: '15%', align: 'center' },
|
|
|
{ title: '单位', dataIndex: 'product.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
]
|
|
|
- if (this.basicInfoData && this.basicInfoData.billState == 'FINISH') {
|
|
|
- ret.splice(4, 0, { title: '签收数量', dataIndex: 'putQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
|
|
|
- }
|
|
|
return ret
|
|
|
}
|
|
|
},
|