DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
86156
2026-01-29 19:16:02 +08:00
parent e6c6dbc3e7 36b6cc3c8d
commit a6a7a5226d
7 changed files with 234 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
klp-ui/src/views/wms/report/delivery.vue
View File

@@ -65,8 +65,8 @@
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="逻辑库位" align="center" prop="warehouseName" />
<el-table-column label="实际库区" align="center" prop="actualWarehouseName" />
<!-- <el-table-column label="逻辑库位" align="center" prop="warehouseName" /> -->
<!-- <el-table-column label="实际库区" align="center" prop="actualWarehouseName" /> -->
<el-table-column label="产品类型" align="center" width="250">
<template slot-scope="scope">
<ProductInfo v-if="scope.row.itemType == 'product'" :product="scope.row.product" />
@@ -75,17 +75,32 @@
</el-table-column>
<el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<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="status">
<!-- 0在库，1已出库 -->
<!-- <el-table-column label="出库状态" align="center" prop="status">
<template slot-scope="scope">
{{ scope.row.status === 0 ? '在库' : '已出库' }}
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="更新人" align="center" prop="updateByName" />
<el-table-column label="更新时间" align="center" prop="updateTime" />
<el-table-column label="车牌号" align="center" prop="bindLicensePlate" />
<el-table-column label="目标客户" align="center" prop="bindConsigneeUnit" />
<el-table-column label="发货单位" align="center" prop="bindSenderUnit" />
<el-table-column label="负责人" align="center" prop="bindPrincipal">
<template slot-scope="scope">
<el-popover trigger="hover" width="200">
<template slot="reference">
<span style="color: #409eff;">{{ scope.row.bindPrincipal }}</span>
</template>
<el-descriptions :column="2">
<el-descriptions-item label="负责人">{{ scope.row.bindPrincipal }}</el-descriptions-item>
<el-descriptions-item label="手机号">{{ scope.row.bindPrincipalPhone }}</el-descriptions-item>
</el-descriptions>
</el-popover>
</template>
</el-table-column>
</el-table>
</div>
</template>
@@ -148,6 +163,7 @@ export default {
itemSpecification: '',
itemMaterial: '',
itemManufacturer: '',
includeBindInfo: true,
},
loading: false,
}
@@ -177,8 +193,9 @@ export default {
},
// 导出
exportData() {
this.download('wms/materialCoil/export', {
this.download('wms/materialCoil/exportDelivery', {
coilIds: this.list.map(item => item.coilId).join(','),
// 传了status为1则会使用发货时间作为筛选条件查询，且导出后的excel会包含发货时间和发货人
status: 1
}, `materialCoil_${new Date().getTime()}.xlsx`)
},