From dd2828a621a18523bf2f2dd430532a47b706b399 Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Fri, 29 Aug 2025 17:39:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=87=E5=93=81?= =?UTF-8?q?=E5=A4=87=E4=BB=B6=E5=BA=93=E5=AD=98=E9=A2=84=E8=AD=A6=EF=BC=8C?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0=E7=94=A8=E4=BA=BA=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yangwl <1726150332@qq.com> --- src/views/device/sparePartsLedger/index.vue | 9 +++++++++ .../device/sparepartsInOutStorage/index.vue | 13 ++++++++++++- src/views/mes/reportWork/index.vue | 18 +++++++++++++++++- src/views/wms/product/index.vue | 11 ++++++++++- 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index 5c447f5..a4f02d3 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -160,6 +160,7 @@ @@ -910,6 +911,14 @@ export default { indexMethod(index) { return index + 1; }, + rowStyle({ row }) { + if (row.amount < row.safeStock) { + return { + backgroundColor: 'rgba(255, 0, 0, 0.1)', + color: '#ff0000' + } + } + }, /** 查询备品备件台账管理列表 */ getList() { this.loading = true; diff --git a/src/views/device/sparepartsInOutStorage/index.vue b/src/views/device/sparepartsInOutStorage/index.vue index 9102d34..12ada08 100644 --- a/src/views/device/sparepartsInOutStorage/index.vue +++ b/src/views/device/sparepartsInOutStorage/index.vue @@ -49,6 +49,17 @@ @keyup.enter.native="handleQuery" /> + + + + - @@ -426,6 +426,14 @@ v-model="item.remark" placeholder="请输入内容(300个字内)" maxlength=300 > + +
+

用人情况说明：

+ + +
+
@@ -1055,6 +1063,7 @@ export default { recordUser: null, status: null, remark: null, + useManRemark: null, workTime: null, machineCode: null, machineName: null, @@ -1211,6 +1220,7 @@ export default { let sr = this.selectRow[0]; if (sr.uploadStatus == "1") { this.$modal.msgError(`上报sap已完成,不能重复报工`); + this.loading = false; return; } @@ -1768,6 +1778,12 @@ export default { item.remark = remark; }); }, + //添加用人说明 + addUseManRemarkblur(table, useManRemark, index) { + table.forEach((item) => { + item.useManRemark = useManRemark; + }); + }, getRKSummaries(param) { const { columns, data } = param; const sums = []; diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue index 7779822..4037478 100644 --- a/src/views/wms/product/index.vue +++ b/src/views/wms/product/index.vue @@ -1023,7 +1023,16 @@ export default { /**选择产品进行工艺同步**/ handleSyncProductSAP() { const productCodes = this.productCodes; - return syncProductSAP(productCodes); + this.loading = true; + syncProductSAP(productCodes).then((response) => { + this.loading = false; + if(response.code == 200){ + this.$modal.msgSuccess(response.msg); + }else { + this.$modal.msgError(response.msg) + } + }); + // return syncProductSAP(productCodes); }, handleBoxTypeChange(selectedBoxType) { From f7320eaa464827ca4a29b5f4b49dce7fd8a91cde Mon Sep 17 00:00:00 2001 From: Yangwl <1726150332@qq.com> Date: Thu, 4 Sep 2025 16:30:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/device/sparePartsLedger/index.vue | 27 ++++++++++++- .../device/sparepartsInOutStorage/index.vue | 40 +++++++++++++++---- src/views/wms/equipment/index.vue | 10 +++++ 3 files changed, 69 insertions(+), 8 deletions(-) diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue index a4f02d3..154da55 100644 --- a/src/views/device/sparePartsLedger/index.vue +++ b/src/views/device/sparePartsLedger/index.vue @@ -44,6 +44,27 @@ style="width: 150px" /> + + + + + + + + @@ -232,10 +234,11 @@ @@ -374,6 +377,8 @@ export default { delFlag: null, factoryCode: null, }, + // 日期范围 + dateRange: [], // 表单参数 form: {}, // 表单校验 @@ -412,12 +417,32 @@ export default { /** 查询备品备件出入库列表 */ getList() { this.loading = true; - listSparepartsInOutStorage(this.queryParams).then((response) => { + listSparepartsInOutStorage(this.addDateRange(this.queryParams, this.dateRange)).then((response) => { this.sparepartsInOutStorageList = response.rows; this.total = response.total; this.loading = false; }); }, + getSummaries(param) { + const { columns, data } = param; + const sums = []; + + // 初始化所有列 + columns.forEach((column, index) => { + if (index === 1) { + sums[index] = '总数'; // 第一列显示固定文本 + } else if (column.property === 'amount') { + // 计算amount列合计 + const total = data.reduce((sum, item) => { + const val = Number(item.amount); + return sum + (isNaN(val) ? 0 : val); + }, 0); + sums[index] = total + ' 个'; + } + }); + + return sums; + }, // 取消按钮 cancel() { this.open = false; @@ -452,6 +477,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue index 026bec2..ac294e9 100644 --- a/src/views/wms/equipment/index.vue +++ b/src/views/wms/equipment/index.vue @@ -689,6 +689,14 @@ /> + + + + + @@ -1383,6 +1391,7 @@ export default { equipmentCategory: null, factoryWorkshop: null, sapAsset: null, + dh: null }, queryEquipmentHeadParams: { pageNum: 1, @@ -1609,6 +1618,7 @@ export default { sapName: null, factoryWorkshop: null, sapAsset: null, + dh: null, }; this.resetForm("form"); },