廖井涛
2024-07-13 edbfcaa60af4f8826af11618608706ab368a0fa6
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
3个文件已修改
9 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/report/ScheduleProductionSchedule.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
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 />
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);
    }