From 803be164c53b3e1de6f9bb93b29ae53e42a6d4db Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Mar 2026 13:34:36 +0800
Subject: [PATCH] =?UTF-8?q?2026-03-10=20=E8=AE=A2=E5=8D=95=E4=BA=A7?=
=?UTF-8?q?=E5=87=BA=E6=A0=87=E7=AD=BE=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/inboundNotification.vue | 8 +--
.../searchSfdcRollsReport.vue | 57 +++++++++++++++++++
2 files changed, 61 insertions(+), 4 deletions(-)
diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue
index edbd3b7..a0cfcd3 100644
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/src/views/modules/qc/inboundNotification.vue
@@ -2245,10 +2245,10 @@
// 标签导入
labelImportModal (row) {
// 权限检查：与批量编辑按钮相同的权限控制
- if (this.currentRow.orderStatus !== '草稿' && this.currentRow.orderStatus !== '编辑中') {
- this.$message.warning('只有草稿或编辑中状态的单据才能导入标签！')
- return
- }
+ // if (this.currentRow.orderStatus !== '草稿' && this.currentRow.orderStatus !== '编辑中') {
+ // this.$message.warning('只有草稿或编辑中状态的单据才能导入标签！')
+ // return
+ // }
// 准备传递给组件的数据
let currentData = {
site: this.currentRow.site,
diff --git a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
index 43a5c35..9e68af2 100644
--- a/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
+++ b/src/views/modules/shopOrder/productionReport/searchSfdcRollsReport.vue
@@ -141,6 +141,14 @@
打印
属性变动
+
+ 卷数量：{{ summaryData.rollQty }}
+ 良品数：{{ summaryData.goodQty }}
+ 面损：{{ summaryData.surfaceLossQty }}
+ 性能不良：{{ summaryData.poorPerformanceQty }}
+ 不良数：{{ summaryData.defectQty }}
+ 总数：{{ summaryData.totalQty }}
+
@@ -539,6 +547,14 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
pageIndex: 1,
pageSize: 50,
totalPage: 0,
+ summaryData: {
+ rollQty: 0,
+ goodQty: 0,
+ surfaceLossQty: 0,
+ poorPerformanceQty: 0,
+ defectQty: 0,
+ totalQty: 0
+ },
// 标签打印相关
printDialogVisible: false,
printDialogData: {
@@ -1091,6 +1107,16 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
searchSfdcRollsReport(params).then(({data}) => {
this.dataList = data.rows || [];
this.totalPage = data.total || 0;
+ if (data.summary) {
+ this.summaryData = {
+ rollQty: data.summary.rollQty || 0,
+ goodQty: data.summary.goodQty || 0,
+ surfaceLossQty: data.summary.surfaceLossQty || 0,
+ poorPerformanceQty: data.summary.poorPerformanceQty || 0,
+ defectQty: data.summary.defectQty || 0,
+ totalQty: data.summary.totalQty || 0
+ };
+ }
this.dataListLoading = false;
}).catch(err => {
console.error('查询失败:', err);
@@ -1682,6 +1708,37 @@ import labelPrintTemplates from '@/mixins/labelPrintTemplates.js';
gap: 8px;
}
+/* 汇总数据栏 */
+.summary-bar {
+ margin-left: auto;
+ display: flex;
+ align-items: center;
+ gap: 16px;
+ background: #f2f6fa;
+ border: 1px solid #c8dff0;
+ border-radius: 6px;
+ padding: 5px 14px;
+ font-size: 13px;
+}
+
+.summary-item-inline {
+ display: flex;
+ align-items: center;
+ white-space: nowrap;
+}
+
+.summary-label-inline {
+ color: #5a7a8f;
+ font-weight: 500;
+ margin-right: 2px;
+}
+
+.summary-value-inline {
+ color: #3a7ba8;
+ font-weight: bold;
+ font-size: 13px;
+}
+
/* 展开时显示上边框 */
.search-card:not(.collapsed) .search-actions {
border-top: 1px solid #f0f0f0;