From 6fac4cbed12a84473e8eab217abacc221dedca9f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 28 七月 2025 14:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
index 3b18357..cc69b2c 100644
--- a/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/sd/order/OrderProcess.vue
@@ -41,7 +41,7 @@
mergeCells:[],
toolbarConfig: {
zoom: true,
- custom: true
+ /*custom: true*/
},
cellClassName ({ row, column,columnIndex}) {
if (columnIndex>10 && row.thisQuantity*1 === row.reportWorkQuantity[column.title]*1){
@@ -103,7 +103,6 @@
gridOptions.loading = true
request.post(`/report/processCardProgress/${props.orderId}`,column).then(async (res) => {
if (res.code == 200) {
-
gridOptions.columns = JSON.parse(JSON.stringify(columns))
gridOptions.columns.forEach(item =>{
item.filterMethod = filterChanged
--
Gitblit v1.8.0