From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 9efb42f..8202ab4 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -122,6 +122,7 @@
if (inputVal == '') {
inputVal = null
}
+ gridOptions.loading = true
let date = new Date(endTime); // 灏嗘棩鏈熷瓧绗︿覆杞负 Date 瀵硅薄
// 浣跨敤 setDate 鏂规硶鍔犱竴澶�
date.setDate(date.getDate() + 1);
@@ -132,6 +133,7 @@
//total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
@@ -140,7 +142,7 @@
//鐐瑰嚮鏌ヨ
const getWorkOrder = () => {
-
+ gridOptions.loading = true
let startTime = form.date1[0]
let endTime = form.date1[1]
let selectProcesses = value.value
@@ -165,6 +167,7 @@
//total.value = res.data.footSum
produceList = deepClone(res.data.data)
xGrid.value.reloadData(produceList)
+ gridOptions.loading = false
} else {
ElMessage.warning(res.msg)
}
@@ -285,6 +288,11 @@
{field: 'child_height', width: 120, title: t('order.height'),filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
+ {field: 'thickness',filters: [{data: ''}],
+ slots: {filter: 'num1_filter'},
+ filterMethod: filterChanged,
+ width: 90, title: t('order.totalThickness')},
+
{field: 'quantity', width: 120, title: t('order.quantity'),filters: [{data: ''}],
slots: {filter: 'num1_filter'},
filterMethod: filterChanged},
@@ -361,7 +369,7 @@
ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
return
}
-
+ gridOptions.loading = true
const date1 = new Date(date[0]);
const date2 = new Date(date[1]);
const timeDiff = Math.abs(date2.getTime() - date1.getTime());
@@ -387,6 +395,7 @@
elink.click()
URL.revokeObjectURL(elink.href) // 閲婃斁URL 瀵硅薄
document.body.removeChild(elink)
+ gridOptions.loading = false
} else { // IE10+涓嬭浇
navigator.msSaveBlob(blob, fileName)
}
--
Gitblit v1.8.0