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 },