From 916feae1b63b1494d39db9be62646e9986736361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com>
Date: Tue, 9 Sep 2025 16:05:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=8A=80=E6=9C=AF=E5=87=86?=
 =?UTF-8?q?=E5=A4=87=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=202.=E8=A7=A3=E5=86=B3=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cxtj/JSZB.vue        |  2 +-
 src/views/cxtj/技术准备.js | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/cxtj/JSZB.vue b/src/views/cxtj/JSZB.vue
index 12335b5..3cbffbd 100644
--- a/src/views/cxtj/JSZB.vue
+++ b/src/views/cxtj/JSZB.vue
@@ -17,7 +17,7 @@
 import init from "@/views/cxtj/index";
 
 export default {
-  name:'CXTJ',
+  name:'CXTJ_JSZB',
   data(){
     return{
       formData:{
diff --git a/src/views/cxtj/技术准备.js b/src/views/cxtj/技术准备.js
index e47ed78..0e52bc3 100644
--- a/src/views/cxtj/技术准备.js
+++ b/src/views/cxtj/技术准备.js
@@ -59,29 +59,30 @@ const 技术准备=()=>{
         let _data=data[item.pl+'_'+item.fd]
         if (_data){
           if (item.option3==='X'){
-            _data.小组数量++
-            _data.小组重量 += parseFloat(item.weight||0)
+            _data.小组数量+=1
+            _data.小组重量+= parseFloat(item.weight||0)
           }
           if (item.option3!=='X'){
-            _data.大组数量++
-            _data.大组重量 += parseFloat(item.weight||0)
+            _data.大组数量+=1
+            _data.大组重量+= parseFloat(item.weight||0)
           }
         }else{
           _data={}
           if (item.option3==='X'){
             _data.小组数量=1
-            _data.小组重量 = parseFloat(item.weight||0)
+            _data.小组重量=parseFloat(item.weight||0)
             _data.大组数量=0
             _data.大组重量 = 0
           }
           if (item.option3!=='X'){
             _data.小组数量=0
-            _data.小组重量 = 0
+            _data.小组重量=0
             _data.大组数量=1
-            _data.大组重量 = parseFloat(item.weight||0)
+            _data.大组重量=parseFloat(item.weight||0)
           }
           data[item.pl+'_'+item.fd]=_data
         }
+        console.log(_data)
       })
       return Object.keys(data).map(key=>{
         const item=data[key]
@@ -298,7 +299,10 @@ const 技术准备=()=>{
       { field: 'feature', title: '特征', width: 120 },
       { field: 'flow', title: '流向', width: 120 },
       { field: 'nextLevel', title: '下级', width: 120 },
-      { field: 'nestingInfo', title: '套料图信息', width: 150 },
+      { field: 'nestingInfo', title: '套料图信息', width: 150,
+        filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
+        filterRender: { name: 'FilterCombination', },
+      },
       { field: 'location', title: '场地', width: 120 },
       { field: 'project', title: 'PROJECT', width: 120 },
       { field: 'block', title: 'BLOCK', width: 120 },