From 240738c2d6812bb03c015ea5d6ec763143493271 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 23 Jan 2026 13:59:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=83=BD=E8=80=97=E8=A1=A5=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../powerUse/Energystatistics/index.vue | 89 +++++++++++++++---- 1 file changed, 74 insertions(+), 15 deletions(-) diff --git a/src/views/energy/powerUse/Energystatistics/index.vue b/src/views/energy/powerUse/Energystatistics/index.vue index e3b2e3e..9707a0b 100644 --- a/src/views/energy/powerUse/Energystatistics/index.vue +++ b/src/views/energy/powerUse/Energystatistics/index.vue @@ -95,6 +95,16 @@ >导出 + + 补录 +
合计电量:
@@ -253,6 +263,36 @@ 取 消
+ + + + + +
将文件拖到此处，或点击上传
+
+ 仅允许导入xls、xlsx格式文件。 + 下载模板 + +
+ +
+ 确 定 + 取 消 +
+ +
@@ -321,21 +361,6 @@ export default { children: "children", label: "lable", }, - // 用户导入参数 - upload: { - // 是否显示弹出层（用户导入） - open: false, - // 弹出层标题（用户导入） - title: "", - // 是否禁用上传 - isUploading: false, - // 是否更新已经存在的用户数据 - updateSupport: 0, - // 设置上传的请求头部 - headers: { Authorization: "Bearer " + getToken() }, - // 上传的地址 - url: process.env.VUE_APP_BASE_API + "/system/user/importData", - }, // 查询参数 queryParams: { pageNum: NaN, @@ -409,6 +434,19 @@ export default { }, // 合计电量 number: "", + upload: { + // 是否显示弹出层 + open: false, + // 弹出层标题 + title: "", + // 是否禁用上传 + isUploading: false, + // 设置上传的请求头部 + headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()}, + // 上传的地址 + importUrl: process.env.VUE_APP_BASE_API + "/energy/report/analysis/energyImport", + templateUrl:"" + } }; }, watch: { @@ -635,6 +673,27 @@ export default { handleExport() { handleExport("bootstrap-table", "能耗统计", true); }, + + // 导入-下载模板 + importTemplate() { + this.download('/energy/report/analysis/energyTemplate', {}, `能耗补录模版_${new Date().getTime()}.xlsx`) + }, + + // 导入-文件上传中处理 + handleFileUploadProgress(event, file, fileList) { + this.upload.isUploading = true; + }, + // 导入-文件上传成功处理 + handleFileSuccess(response, file, fileList) { + this.upload.open = false; + this.upload.isUploading = false; + this.$refs.upload.clearFiles(); + this.$alert("
" + response.msg + "
", "导入结果", {dangerouslyUseHTMLString: true}); + this.getList(); + }, + submitImport(){ + this.$refs.upload.submit(); + } }, }; From 9ce92ddd3172b8a627c4936df2ce959f76d73be0 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 23 Jan 2026 14:00:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=99=BD=E5=9D=AF=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/kanban/quality.js | 9 +++++++++ src/views/kanban/quality/kanban1.vue | 8 ++++---- src/views/quality/report/bpDefectItem/index.vue | 5 +++-- src/views/quality/report/bpDefectItemPC/index.vue | 6 +++--- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/api/kanban/quality.js b/src/api/kanban/quality.js index ab18d16..209d499 100644 --- a/src/api/kanban/quality.js +++ b/src/api/kanban/quality.js @@ -104,3 +104,12 @@ export function getMonthOfYearContrast(data) { data: data }); } + +// 白坯每月不合格数量 +export function getBpMonthNoOk(data) { + return request({ + url: '/quality/qcInterface/getBpMonthNoOk', + method: 'get', + data: data + }); +} diff --git a/src/views/kanban/quality/kanban1.vue b/src/views/kanban/quality/kanban1.vue index 7e65e58..13ebfc2 100644 --- a/src/views/kanban/quality/kanban1.vue +++ b/src/views/kanban/quality/kanban1.vue @@ -211,7 +211,7 @@
-
本年各月产品不合格数量对比
+
本年各月白坯不合格数量对比
{ if (response) { diff --git a/src/views/quality/report/bpDefectItem/index.vue b/src/views/quality/report/bpDefectItem/index.vue index f30406e..437ecb3 100644 --- a/src/views/quality/report/bpDefectItem/index.vue +++ b/src/views/quality/report/bpDefectItem/index.vue @@ -34,7 +34,7 @@ -

{{form.column080090}} 年 {{form.column090100}} 月 份 白 坯 不 良 排 列 图

+

{{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}} 白 坯 不 良 排 列 图

 @@ -57,7 +57,6 @@ - @@ -68,6 +67,7 @@ import {getDefectItemTitle,getDefectItemData,getDefectItemLine} from "@/api/quality/qcTable"; import moment from 'moment'; import * as echarts from "echarts"; +import {parseTime} from "../../../../utils/ruoyi"; export default { name: "BpDefectItem", data() { @@ -142,6 +142,7 @@ export default { this.getList(); }, methods: { + parseTime, /**获取默认查询时间段**/ getDate() { let start = this.Fungetdate (0); diff --git a/src/views/quality/report/bpDefectItemPC/index.vue b/src/views/quality/report/bpDefectItemPC/index.vue index 29943b4..285fc05 100644 --- a/src/views/quality/report/bpDefectItemPC/index.vue +++ b/src/views/quality/report/bpDefectItemPC/index.vue @@ -34,7 +34,7 @@ -

{{queryParams.yearMonthDate}} 黑蚊香白坯性能不良排列图

+

{{ parseTime(queryParams.yearMonthDate,'{y}-{m}')}} 黑蚊香白坯性能不良排列图

 @@ -53,11 +53,10 @@ - + - @@ -182,6 +181,7 @@ export default { //获取Table数据 getDefectItemDataPC(this.queryParams).then(response => { this.itemProList = response; + this.itemProList.push("其他") this.getTbody(); this.loading = false; }); From 73a4a6732e76a1912a0d1a253739684515eb181a Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 23 Jan 2026 14:47:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=85=E6=9D=90=E9=A2=86=E6=96=99?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=AC=E5=82=A8=E8=BF=87=E8=B4=A6=E5=92=8C?= =?UTF-8?q?=E5=8F=8D=E5=86=B2=E8=BF=87=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/outorderfc.js | 16 ++++ src/views/mes/prepare/index.vue | 2 +- src/views/wms/outorderzs/index.vue | 125 ++++++++++++++++++++++++++++- 3 files changed, 139 insertions(+), 4 deletions(-) diff --git a/src/api/wms/outorderfc.js b/src/api/wms/outorderfc.js index a1db855..04d6279 100644 --- a/src/api/wms/outorderfc.js +++ b/src/api/wms/outorderfc.js @@ -248,3 +248,19 @@ export function batchSapTl(data) { data: data }); } + +export function submitTransferPosting(data) { + return request({ + url: '/wms/outorder/submitTransferPosting', + method: 'post', + data: data + }); +} + +export function submitReversePosting(data) { + return request({ + url: '/wms/outorder/submitReversePosting', + method: 'post', + data: data + }); +} diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 9ddaa19..732cfb3 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -731,7 +731,7 @@ export default { this.refreshNewWorkerTable = true // 立即将refreshProTable设置为true，显示表格 this.newWorkerLoading = false // 设置加载状态为false，表示加载完成 - this.generateBarcode(this.printData.productDate); //条码 根据打印日期生成 + this.generateBarcode("ZC_"+this.printData.productDate); //条码 根据打印日期生成 }) }, } diff --git a/src/views/wms/outorderzs/index.vue b/src/views/wms/outorderzs/index.vue index 06f1bff..a896b8c 100644 --- a/src/views/wms/outorderzs/index.vue +++ b/src/views/wms/outorderzs/index.vue @@ -40,9 +40,16 @@ 导出 + + 转储过账 + + + 反冲过账 + @@ -168,7 +175,40 @@ 取 消
-
+ + + + + + + + + + + + + + + + + + +
+ 确 定 + 取 消 +
+ + + + + +