From edbfcaa60af4f8826af11618608706ab368a0fa6 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期六, 13 七月 2024 10:21:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue | 4 +++-
north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue | 3 ++-
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
index 61eca89..f76be23 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue
@@ -81,6 +81,7 @@
produceList = produceList.value.concat(deepClone(res.data.data))
xGrid.value.reloadData(produceList)
gridOptions.loading = false
+ form.processes=value.value
} else {
ElMessage.warning(res.msg)
}
@@ -332,7 +333,7 @@
<vxe-button style="margin-right: 0.5rem"
@click="exportExcel('/report/exportScheduleReport',
t('report.productionScheduling'),
- form.date1)">
+ form)">
{{ t('basicData.export') }}
</vxe-button>
</template>
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
index 9f4dea1..ab7c03b 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue
@@ -594,7 +594,9 @@
v-model="dialogTableVisible"
@close="closeDialog"
destroy-on-close
- style="width: 75%;height:75% "
+ style="width: 90%;height:90%;margin-top: 3vh "
+ :close-on-click-modal="false"
+ :close-on-press-escape="false"
>
<template #header="{ close, titleId, titleClass }">
<el-button v-print="printContent" @click="printingNumber" :icon="Printer" circle />
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
index 5b06d79..d1ebdee 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java
@@ -423,7 +423,7 @@
}
public List exportScheduleReportSv(Map<String, Object> dates) {
- List<LocalDate> date= (List<LocalDate>) dates.get("date");
+ List<LocalDate> date= (List<LocalDate>) dates.get("date1");
String process= (String) dates.get("processes");
return reportMapper.exportScheduleReportMp(date,process);
}
--
Gitblit v1.8.0