diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index eb0f3971..8df7af39 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -345,4 +345,15 @@ export function categoryWidthStatistics() { url: '/wms/materialCoil/statistics/categoryWidthStatistics', method: 'get', }) +} + +/** + * 钢卷被退货，发给客户的钢卷被退货 + */ +export function exportCoilWithAll(data) { + return request({ + url: '/wms/materialCoil/exportAll', + method: 'post', + data + }) } \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index 6e479183..d25dce86 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -51,6 +51,7 @@ 搜索 重置 + 导出 @@ -73,6 +74,9 @@ 批量打印标签 + + 按实际库区排序 + @@ -405,7 +409,8 @@ import { exportCoil, cancelExportCoil, checkCoilNo, - returnCoil + returnCoil, + exportCoilWithAll } from "@/api/wms/coil"; import { listBoundCoil } from "@/api/wms/deliveryWaybillDetail"; import WarehouseSelect from "@/components/KLPService/WarehouseSelect"; @@ -530,6 +535,14 @@ export default { showRelatedToOrder: { type: Boolean, default: false, + }, + showOrderBy: { + type: Boolean, + default: false, + }, + showNewExport: { + type: Boolean, + default: false, } }, data() { @@ -578,6 +591,7 @@ export default { itemIds: undefined, status: undefined, updateTime: undefined, + orderBy: false, ...this.querys, }, // 表单参数 @@ -917,12 +931,6 @@ export default { } }, handleAbnormal(row) { - // this.$router.push({ - // path: '/quality/detail', - // query: { - // coilId: row.coilId, - // } - // }) this.currentCoilId = row.coilId; this.abnormalOpen = true; }, @@ -1038,6 +1046,33 @@ export default { }).catch(error => { this.$modal.msgError("发货失败"); }); + }, + async handleNewExport(row) { + this.loading = true + let coilIds = '' + const query = { + ...this.queryParams, + selectType: 'product', + pageSize: 9999, + pageNum: 1, + } + if (this.showWaybill) { + const res = await listBoundCoil(query) + coilIds = res.rows.map(item => item.coilId).join(',') + this.loading = false + this.download('wms/deliveryWaybill/export', { + coilIds, + }, 'coil.xlsx') + } else { + const { rows: coils } = await listMaterialCoil(query) + coilIds = coils.map(item => item.coilId).join(',') + this.loading = false + this.download('wms/materialCoil/exportAll', { + coilIds, + }, 'coil.xlsx') + } + + }, handleCheck(row) { this.isCheck = true; @@ -1172,7 +1207,6 @@ export default { ...this.queryParams }, `materialCoil_${new Date().getTime()}.xlsx`) }, - /** 批量打印标签按钮 */ handleBatchPrintLabel() { if (!this.ids || this.ids.length === 0) { diff --git a/klp-ui/src/views/wms/coil/product.vue b/klp-ui/src/views/wms/coil/product.vue index 1a52b42a..aa7d2317 100644 --- a/klp-ui/src/views/wms/coil/product.vue +++ b/klp-ui/src/views/wms/coil/product.vue @@ -29,7 +29,8 @@ export default { showStatus: true, hideType: true, showLength: true, - canExportAll: true + canExportAll: true, + showOrderBy: true, } } } diff --git a/klp-ui/src/views/wms/coil/waybill.vue b/klp-ui/src/views/wms/coil/waybill.vue index fc67658a..21b3223f 100644 --- a/klp-ui/src/views/wms/coil/waybill.vue +++ b/klp-ui/src/views/wms/coil/waybill.vue @@ -2,6 +2,7 @@ @@ -27,6 +28,7 @@ export default { hideType: false, showExportTime: false, showWaybill: true, + showNewExport: true, } } } diff --git a/klp-ui/src/views/wms/delivery/canuse/index.vue b/klp-ui/src/views/wms/delivery/canuse/index.vue new file mode 100644 index 00000000..d8731031 --- /dev/null +++ b/klp-ui/src/views/wms/delivery/canuse/index.vue @@ -0,0 +1,38 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/delivery/waybill/index.vue b/klp-ui/src/views/wms/delivery/waybill/index.vue index 90362959..0999fb0d 100644 --- a/klp-ui/src/views/wms/delivery/waybill/index.vue +++ b/klp-ui/src/views/wms/delivery/waybill/index.vue @@ -43,13 +43,20 @@ - + + + + +