fix_bc

src/Djcs3.js

@@ -55,7 +55,7 @@ export default function Djcs3({name, bh, rgde, jxde, clde, beizhu, beizhuFK, cli
           if (cell._cell.row.getData()['人材机编码'] == '31130104') {//
                return false;
           }
-          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {//
+          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {//安装费用
                return false;
           }
           return true;

src/Qingdan3.js

@@ -312,7 +312,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           if (cell._cell.row.getData()['人材机编码'].includes('10000F')) {
                return false;
           }
-          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
+          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {////安装费用
                return false;
           }
           if (cell._cell.row.getData()['bc'].includes('true')) {
@@ -333,7 +333,7 @@ export default function Qingdan3({name, bh, bt, rgde, jxde, clde, beizhu/*后台
           if (cell._cell.row.getData()['人材机编码'].includes('10000F')) {
                return false;
           }
-          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {
+          if (cell._cell.row.getData()['人材机编码'].includes('000FE')) {//安装费用
                return false;
           }
           if (cell._cell.row.getData()['bc'].includes('true')) {

src/Service.js

@@ -1524,8 +1524,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         for(let i = 1; i < data.length; i++) {
             data[i][11] = Number(data[i][10]) * Number(data[i][5]);
         }
-        if (data[0].length > 17)
-        data = data.filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
+        if (data[0].length > 18)
+        data = data.filter(x=>x[18]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
               
         let sum = 0;
         let rgf_sum = 0;
@@ -1730,7 +1730,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             
             data = de['dercj'];
             if (de['fuzhuEnable']) {
-                data = data.filter(x=>x[1] != 'S00001' && x[1] != 'JD0001');
+                data = data.filter(x=>x[1] != 'S00001' && x[1] != 'JD0001');//预拌砂浆额外配套
+                /*
                 for (let i = 1; i < data.length; i++) {
                     if (data[i][2].includes('（湿拌砂浆）')) {
                         let index = data[i][2].indexOf("（湿拌砂浆）");
@@ -1741,6 +1742,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                         data[i][2] = data[i][2].substring(0, index);
                     }
                 }
+                */
                 de['dercj'] = copy(data);
             }
         } else {////单项定额没有底稿，老数据没底搞，无法判断换部换，暂时统一认为不换
@@ -1766,18 +1768,18 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 let flip = [];
                 for(let i = 1; i < data.length; i++) {
                     
-                    if (data[i][17]=='true') {
-                        for (let j = 0; j < data[i][19].length; j++) {
-                            flip.push(data[i][19][j]);
+                    if (data[i][18]=='true') {
+                        for (let j = 0; j < data[i][20].length; j++) {
+                            flip.push(data[i][20][j]);
                         }
-                        data[i][17] = 'false';
+                        data[i][18] = 'false';
                     }
                    
                 }
                 for(let i = 1; i < data.length; i++) {
                     
                     if (flip.includes(data[i][16])) {
-                        data[i][17] = 'true';
+                        data[i][18] = 'true';
                     }
                    
                 }
@@ -1805,18 +1807,18 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 let flip = [];
                 for(let i = 1; i < data.length; i++) {
                     
-                    if (data[i][17]=='true') {
-                        for (let j = 0; j < data[i][19].length; j++) {
-                            flip.push(data[i][19][j]);
+                    if (data[i][18]=='true') {
+                        for (let j = 0; j < data[i][20].length; j++) {
+                            flip.push(data[i][20][j]);
                         }
-                        data[i][17] = 'false';
+                        data[i][18] = 'false';
                     }
                    
                 }
                 for(let i = 1; i < data.length; i++) {
                     
                     if (flip.includes(data[i][16])) {
-                        data[i][17] = 'true';
+                        data[i][18] = 'true';
                     }
                    
                 }
@@ -1841,18 +1843,18 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 let flip = [];
                 for(let i = 1; i < data.length; i++) {
                     
-                    if (data[i][17]=='true') {
-                        for (let j = 0; j < data[i][19].length; j++) {
-                            flip.push(data[i][19][j]);
+                    if (data[i][18]=='true') {
+                        for (let j = 0; j < data[i][20].length; j++) {
+                            flip.push(data[i][20][j]);
                         }
-                        data[i][17] = 'false';
+                        data[i][18] = 'false';
                     }
                    
                 }
                 for(let i = 1; i < data.length; i++) {
                     
                     if (flip.includes(data[i][16])) {
-                        data[i][17] = 'true';
+                        data[i][18] = 'true';
                     }
                    
                 }
@@ -1861,9 +1863,9 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             de['dercj'] = copy(data);
         }
 
-        if (de['dercj'][0].length > 17)
-        de['dercj'] = de['dercj'].filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16]]);
-        de['dercj'] = de['dercj'].filter(x=>!x[1].includes('10000F'))//补充
+        if (de['dercj'][0].length > 18)
+        de['dercj'] = de['dercj'].filter(x=>x[18]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], x[17]]);
+        de['dercj'] = de['dercj'].filter(x=>!x[1].includes('10000F') && x[17] != 'true');//补充
         de['dercj'] = de['dercj'].map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
         for(let i = 0; i < rcjbc.length; i++) {
             de['dercj'].push(['', rcjbc[i]['人材机编码'], rcjbc[i]['名称'], rcjbc[i]['规格型号'], rcjbc[i]['单位'], rcjbc[i]['单价'], rcjbc[i]['产地'], rcjbc[i]['供应厂商'], rcjbc[i]['人材机类别'], rcjbc[i]['甲供标志'], rcjbc[i]['含量'], '', rcjbc[i]['暂估价标志'],rcjbc[i]['主要材料标志'],rcjbc[i]['主材标志'],rcjbc[i]['设备标志'], '', 'true']);
@@ -2272,7 +2274,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     '综合人工工日': null,
                     '备注': null,
                     "dercj": dercj,
-                    'rcjdg': dercj.map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], 'false', [], []]),
+                    'rcjdg': dercj.map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], x[17], 'false', [], []]),
                     'key' :   newKey,
                     "fuzhuEnable": false,
                     'yuban': [],
@@ -2301,11 +2303,11 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 //console.log(res);
                 let qd = this.cache_djcs.filter(x=>x['key'] == row)[0];
                 let dercj = [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
-                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", "key", "hidden", "parent", "children" ]];
+                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", "key", 'bc', "hidden", "parent", "children" ]];
                 for(let i = 0; i < res['rgde'].length; i++) {
                     dercj.push(['', res['rgde'][i]['CLBH'], res['rgde'][i]['CLMC'], '', res['rgde'][i]['JLDW'], 
                     res['rgde'][i]['YSJG'], '', '', '1', '', res['rgde'][i]['gr'], res['rgde'][i]['gf'],
-                    '', '', '', '', uuidv4(), "false", [], [] ]);
+                    '', '', '', '', uuidv4(), "false",'false', [], [] ]);
                 }
                 for(let i = 0; i < res['clde'].length; i++) {
                     let hit = false;
@@ -2320,7 +2322,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     if (hit) {
                         dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', uuidv4(), 'false', [], [] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [], [] ]);
                     } else {
                         if (res['clde'][i].hasOwnProperty('children')) {
                             let parent = uuidv4();
@@ -2331,16 +2333,16 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                                 children.push(id);
                                 dercj.push(['', child_data[j]['CLBH'], child_data[j]['CLMC'], '', child_data[j]['JLDW'], 
                     child_data[j]['YSJG'], '', '', '2', 'false', child_data[j]['SL'], child_data[j]['HJ'],
-                    '', '', '', '', id, 'false', [parent], [] ]);
+                    '', '', '', '', id, 'false','false', [parent], [] ]);
                             }
                             dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', parent, 'true', [], children ]);
+                    '', '', '', '', parent, 'true','false', [], children ]);
 
                         } else {
                         dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', uuidv4(), 'false', [], [] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [], [] ]);
                         }
                     }
                     
@@ -2348,13 +2350,13 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 for(let i = 0; i < res['jxde'].length; i++) {
                     dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'], 
                     res['jxde'][i]['tbdj'], '', '', '3', '', res['jxde'][i]['sl'], res['jxde'][i]['hj'],
-                    '', '', '', '',uuidv4(), 'false', [], [] ]);
+                    '', '', '', '',uuidv4(), 'false','false', [], [] ]);
                 }
                 let newKey = uuidv4();
                 if (!qd.hasOwnProperty('_children')) {
                     qd["_children"] = [];
                 }
-                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
+                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], x[17]]);
                 qd["_children"].push({
                     '操作': '',
                     '序号': null,
@@ -2415,11 +2417,11 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 }
                 let qd = this.cache.filter(x=>x['key'] == row)[0];
                 let dercj = [["ID", "人材机编码", "名称", "规格型号", "单位", "单价", "产地", 
-                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key', 'hidden', 'parent', 'children' ]];
+                "供应厂商", "人材机类别", "甲供标志", "含量", "合价", "暂估价标志", "主要材料标志", "主材标志", "设备标志", 'key', 'bc', 'hidden', 'parent', 'children' ]];
                 for(let i = 0; i < res['rgde'].length; i++) {
                     dercj.push(['', res['rgde'][i]['CLBH'], res['rgde'][i]['CLMC'], '', res['rgde'][i]['JLDW'], 
                     res['rgde'][i]['YSJG'], '', '', '1', '', res['rgde'][i]['gr'], res['rgde'][i]['gf'],
-                    '', '', '', '', uuidv4(), 'false', [],[] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [],[] ]);
                 }
                 for(let i = 0; i < res['clde'].length; i++) {
                     let hit = false;
@@ -2434,7 +2436,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                     if (hit) {
                         dercj.push(['', res['clde'][i]['CLBH'], res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     jg, '', '', '2', 'true', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', uuidv4(), 'false', [], [] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [], [] ]);
                     } else {
                         if (res['clde'][i].hasOwnProperty('children') && res['clde'][i]['CLMC'].includes('砂浆')) {
                             let parent = uuidv4();
@@ -2445,16 +2447,16 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                                 children.push(id);
                                 dercj.push(['', child_data[j]['CLBH'], child_data[j]['CLMC'], '', child_data[j]['JLDW'], 
                     child_data[j]['YSJG'], '', '', '2', 'false', child_data[j]['SL'], child_data[j]['HJ'],
-                    '', '', '', '', id, 'false', [parent], [] ]);
+                    '', '', '', '', id, 'false','false', [parent], [] ]);
                             }
                             dercj.push(['', res['clde'][i]['CLBH'].toString(), res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', parent, 'true', [], children ]);
+                    '', '', '', '', parent, 'true','false', [], children ]);
 
                         } else {
                             dercj.push(['', res['clde'][i]['CLBH'].toString(), res['clde'][i]['CLMC'], '', res['clde'][i]['JLDW'], 
                     res['clde'][i]['YSJG'], '', '', '2', 'false', res['clde'][i]['SL'], res['clde'][i]['HJ'],
-                    '', '', '', '', uuidv4(), 'false', [], [] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [], [] ]);
                         }
                         
                     }
@@ -2463,13 +2465,13 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                 for(let i = 0; i < res['jxde'].length; i++) {
                     dercj.push(['', res['jxde'][i]['jxbh'], res['jxde'][i]['jxmc'], '', res['jxde'][i]['DW'], 
                     res['jxde'][i]['tbdj'], '', '', '3', '', res['jxde'][i]['sl'], res['jxde'][i]['hj'],
-                    '', '', '', '', uuidv4(), 'false', [], [] ]);
+                    '', '', '', '', uuidv4(), 'false','false', [], [] ]);
                 }
                 let newKey = uuidv4();
                 if (!qd.hasOwnProperty('_children')) {
                     qd["_children"] = [];
                 }
-                let newdercj = copy(dercj).filter(x=>x[17]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], '']);
+                let newdercj = copy(dercj).filter(x=>x[18]!='true').map(x=>[x[0], x[1], x[2], x[3], x[4], x[5], x[6], x[7], x[8], x[9], x[10], x[11], x[12], x[13], x[14], x[15], x[16], x[17]]);
                 qd["_children"].push({
                     '操作': '',
                     '序号': null,