fix azfy

src/Service.js

@@ -1212,7 +1212,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         qd['管理费'] = 0;
         qd['利润'] = 0;
         for(let i = 0; i < qd["_children"].length; i++) {
-            if (qd["_children"][i]['清单编码'].includes("-F"))continue;
+            if (qd["_children"][i]['azfytag'].length > 0)continue;
             qd['综合单价'] += Number(qd['_children'][i]['数量']) * Number(qd['_children'][i]['综合单价']);
             qd['合价'] += Number(qd['_children'][i]['合价']);
             qd['人工费'] += Number(qd['_children'][i]['数量']) * Number(qd['_children'][i]['人工费']);
@@ -1228,7 +1228,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         console.log(qd["_children"].length);
         for(let i = 0; i < qd["_children"].length; i++) {
             console.log(i);
-            if (qd["_children"][i]['清单编码'].includes("-F")){
+            if (qd["_children"][i]['azfytag'].length > 0){
                 let tag = qd["_children"][i]['azfytag'];
                 if (tag[0] == '人工费') {
                    let current_rgf = qd['人工费'];
@@ -1250,7 +1250,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                    }
                    
                    qd["_children"][i]['综合单价'] = qd["_children"][i]['人工费'] + qd["_children"][i]['材料费'] + qd["_children"][i]['机械费'] + qd["_children"][i]['管理费'] +  qd["_children"][i]['利润'];
-                   qd["_children"][i]['合价'] = qd["_children"][i]['综合单价'] * Number(qd["_children"][i]['数量']);
+                   qd["_children"][i]['合价'] = qd["_children"][i]['综合单价'] * Number(qd["_children"][i]['数量']) * Number(qd['数量']);
                    let dercj = qd["_children"][i]['dercj'];
                    for (let j = 1; j < dercj.length; j++) {
                        dercj[j][11] = Number(qd['_children'][i]['综合单价']) * Number(dercj[j][10]) / Number(100);
@@ -1276,7 +1276,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
                    }
                    
                    qd["_children"][i]['综合单价'] = qd["_children"][i]['人工费'] + qd["_children"][i]['材料费'] + qd["_children"][i]['机械费'] + qd["_children"][i]['管理费'] +  qd["_children"][i]['利润'];
-                   qd["_children"][i]['合价'] = qd["_children"][i]['综合单价'] * Number(qd["_children"][i]['数量']);
+                   qd["_children"][i]['合价'] = qd["_children"][i]['综合单价'] * Number(qd["_children"][i]['数量']) * Number(qd["数量"]);
                    let dercj = qd["_children"][i]['dercj'];
                    for (let j = 1; j < dercj.length; j++) {
                        dercj[j][11] = Number(qd['_children'][i]['综合单价']) * Number(dercj[j][10]) / Number(100);
@@ -1746,23 +1746,26 @@ async generateQingdanTuijian(name, bh, bt, bm) {
 
             
             data = de['dercj'];
+            if (de['fuzhuEnable']) {
+                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("（湿拌砂浆）");
+                        data[i][2] = data[i][2].substring(0, index);
+                    }
+                    if (data[i][2].includes('（干拌（混）砂浆）')) {
+                        let index = data[i][2].indexOf("（干拌（混）砂浆）");
+                        data[i][2] = data[i][2].substring(0, index);
+                    }
+                }
+                de['dercj'] = copy(data);
+            }
         } else {////单项定额没有底稿，老数据没底搞，无法判断换部换，暂时统一认为不换
             //强行改含量
             de['dercj'] = copy(data);
             data = de['dercj'];
         }
-        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("（湿拌砂浆）");
-                data[i][2] = data[i][2].substring(0, index);
-            }
-            if (data[i][2].includes('（干拌（混）砂浆）')) {
-                let index = data[i][2].indexOf("（干拌（混）砂浆）");
-                data[i][2] = data[i][2].substring(0, index);
-            }
-        }
-        de['dercj'] = copy(data);
+        
 
         if (de.hasOwnProperty("rcjdg") && de['fuzhuEnable'] && yuban.length > 0) {//没强行改过含量
             if (yuban.includes('1')) {
@@ -1820,6 +1823,8 @@ async generateQingdanTuijian(name, bh, bt, bm) {
             }
             de['dercj'] = copy(data);
         }
+
+
         de['dercj'] = de['dercj'].filter(x=>x[1] != '410000F')//补充
         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]['设备标志']]);
@@ -1836,7 +1841,7 @@ async generateQingdanTuijian(name, bh, bt, bm) {
         let clf_sum = 0;
         let zcf_sum = 0;
         for(let i = 1; i < data.length; i++) {
-            if (data[i][1].includes('000FE'))continue;
+            if (data[i][1].includes('000FE') && data[i][4] == '%')continue;
             sum += Number(data[i][11]);//11-> hejia
             if (Number(data[i][8]) == 1) {
                 rgf_sum += Number(data[i][11]);