|
@@ -105,6 +105,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
|
|
|
import { STable } from '@/components'
|
|
|
import recallModal from './recallModal.vue'
|
|
|
import getDate from '@/libs/getDate.js'
|
|
|
+import { toThousands } from '@/libs/tools.js'
|
|
|
import shelfList from '@/views/common/shelfList.vue'
|
|
|
import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel, shelfRecallStateCount } from '@/api/shelfRecall.js'
|
|
|
export default {
|
|
@@ -137,18 +138,18 @@ export default {
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
+ { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
{ title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
|
|
|
+ { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
|
+ { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
|
{ title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
|
|
|
],
|
|
|
innerColumns: [
|
|
|
{ title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
|
|
|
{ title: '产品编码', dataIndex: 'product.code', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'left', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
- { title: '实退数量', dataIndex: 'confirmQty', width: '15%', 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: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
|
+ { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text) : '--' } },
|
|
|
{ title: '单位', dataIndex: 'product.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
|
|
|
],
|
|
|
innerData: [],
|
|
@@ -205,13 +206,14 @@ export default {
|
|
|
// 获取各类型下的数量
|
|
|
getSumByType () {
|
|
|
const params = JSON.parse(JSON.stringify(this.queryParam))
|
|
|
+ params.billState = params.bizType == 'ALL' ? '' : params.bizType
|
|
|
delete params.bizType
|
|
|
shelfRecallStateCount(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.tabsList = [
|
|
|
{ code: 'ALL', name: '全部', countNum: 0 }, { code: 'WAIT_CONFIRM', name: '待退库', countNum: 0 }, { code: 'FINISH', name: '已完成', countNum: 0 }, { code: 'CANCEL', name: '已取消', countNum: 0 }
|
|
|
]
|
|
|
- this.queryParam.bizType = 'ALL'
|
|
|
+ // this.queryParam.bizType = 'ALL'
|
|
|
this.tabsList[1].countNum = res.data.WAIT_CONFIRM || 0
|
|
|
this.tabsList[2].countNum = res.data.FINISH || 0
|
|
|
this.tabsList[3].countNum = res.data.CANCEL || 0
|
|
@@ -258,7 +260,7 @@ export default {
|
|
|
},
|
|
|
resetData () {
|
|
|
this.$refs.rangeDate.resetDate(this.time)
|
|
|
- this.queryParam.bizType = this.currentType
|
|
|
+ this.queryParam.bizType = 'ALL'
|
|
|
this.queryParam = {
|
|
|
beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
|
|
|
endDate: getDate.getCurrMonthDays().endtime, // 结束时间
|