diff --git a/klp-ui/src/components/FileUpload/index.vue b/klp-ui/src/components/FileUpload/index.vue index a597bc2b..63d2375a 100644 --- a/klp-ui/src/components/FileUpload/index.vue +++ b/klp-ui/src/components/FileUpload/index.vue @@ -61,7 +61,7 @@ export default { // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { type: Array, - default: () => ["doc", "xls", "ppt", "txt", "pdf", 'png', 'jpg', 'jpeg', 'bmp', 'webp'], + default: () => ["doc", "xls", "xlsx", "ppt", "txt", "pdf", 'png', 'jpg', 'jpeg', 'bmp', 'webp'], }, // 是否显示提示 isShowTip: { diff --git a/klp-ui/src/views/wms/receive/components/Printer.vue b/klp-ui/src/views/wms/receive/components/Printer.vue new file mode 100644 index 00000000..ae301956 --- /dev/null +++ b/klp-ui/src/views/wms/receive/components/Printer.vue @@ -0,0 +1,627 @@ + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/receive/detail/index.vue b/klp-ui/src/views/wms/receive/detail/index.vue index 45a1d67f..2e8e06ff 100644 --- a/klp-ui/src/views/wms/receive/detail/index.vue +++ b/klp-ui/src/views/wms/receive/detail/index.vue @@ -34,7 +34,8 @@ 刷新 导入 - 导出 + 打印 + @@ -129,6 +130,10 @@ 取消 + + + + @@ -140,6 +145,8 @@ import MemoInput from "@/components/MemoInput"; import ImportGuide from "@/views/wms/receive/components/ImportGuide.vue"; import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect"; import CoilNo from "@/components/KLPService/Renderer/CoilNo.vue"; +import Printer from "../components/Printer.vue"; + export default { name: "DeliveryWaybill", @@ -147,7 +154,8 @@ export default { MemoInput, ImportGuide, ActualWarehouseSelect, - CoilNo + CoilNo, + Printer }, data() { return { @@ -226,6 +234,8 @@ export default { remark: null, }, coilInfo: {}, + + printDialogVisible: false, }; }, created() { @@ -279,6 +289,10 @@ export default { }; this.resetForm("form"); }, + // 打印按钮操作 + handlePrint() { + this.printDialogVisible = true; + }, /** 搜索按钮操作 */ handleQuery() { this.queryParams.pageNum = 1;