feat(报表): 调整发货报表列显示并新增导出功能参数
在发货报表视图中注释掉不使用的列,并新增发货车牌号、目标客户和负责人列 为导出功能添加includeBindInfo参数和修改导出接口路径
This commit is contained in:
@@ -65,8 +65,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" />
|
<el-table-column label="创建时间" align="center" prop="createTime" />
|
||||||
<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
|
<!-- <el-table-column label="逻辑库位" align="center" prop="warehouseName" /> -->
|
||||||
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
|
<!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
|
||||||
<el-table-column label="产品类型" align="center" width="250">
|
<el-table-column label="产品类型" align="center" width="250">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
|
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
|
||||||
@@ -75,17 +75,19 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
|
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
|
||||||
<el-table-column label="长度 (米)" align="center" prop="length" />
|
<el-table-column label="长度 (米)" align="center" prop="length" />
|
||||||
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
|
<!-- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip /> -->
|
||||||
<el-table-column label="发货时间" align="center" prop="exportTime" />
|
<el-table-column label="发货时间" align="center" prop="exportTime" />
|
||||||
<el-table-column label="出库状态" align="center" prop="status">
|
<!-- <el-table-column label="出库状态" align="center" prop="status">
|
||||||
<!-- 0在库,1已出库 -->
|
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ scope.row.status === 0 ? '在库' : '已出库' }}
|
{{ scope.row.status === 0 ? '在库' : '已出库' }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
|
|
||||||
<el-table-column label="更新人" align="center" prop="updateByName" />
|
<el-table-column label="更新人" align="center" prop="updateByName" />
|
||||||
<el-table-column label="更新时间" align="center" prop="updateTime" />
|
<el-table-column label="更新时间" align="center" prop="updateTime" />
|
||||||
|
<el-table-column label="发货车牌号" align="center" prop="netWeight" />
|
||||||
|
<el-table-column label="目标客户" align="center" prop="netWeight" />
|
||||||
|
<el-table-column label="负责人" align="center" prop="netWeight" />
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -148,6 +150,7 @@ export default {
|
|||||||
itemSpecification: '',
|
itemSpecification: '',
|
||||||
itemMaterial: '',
|
itemMaterial: '',
|
||||||
itemManufacturer: '',
|
itemManufacturer: '',
|
||||||
|
includeBindInfo: true,
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
}
|
}
|
||||||
@@ -177,8 +180,9 @@ export default {
|
|||||||
},
|
},
|
||||||
// 导出
|
// 导出
|
||||||
exportData() {
|
exportData() {
|
||||||
this.download('wms/materialCoil/export', {
|
this.download('wms/materialCoil/exportDelivery', {
|
||||||
coilIds: this.list.map(item => item.coilId).join(','),
|
coilIds: this.list.map(item => item.coilId).join(','),
|
||||||
|
// 传了status为1则会使用发货时间作为筛选条件查询,且导出后的excel会包含发货时间和发货人
|
||||||
status: 1
|
status: 1
|
||||||
}, `materialCoil_${new Date().getTime()}.xlsx`)
|
}, `materialCoil_${new Date().getTime()}.xlsx`)
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user