Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/standard_interface/export/anhui_chizhou.js

@@ -289,11 +289,12 @@ INTERFACE_EXPORT = (() => {
                     {name: "单位", value: AItem.data.unit},
                     {name: "数量", value: AItem.data.quantity, type: TYPE.DECIMAL}
                 ];
-
+               // debugger;
                 let dj = 0, hj = 0;
-                if ((isBidSubmission || isControl) || (AItem.data.specialProvisional == '专业工程')){
+                // if ((isBidSubmission || isControl) || (AItem.data.specialProvisional == '专业工程')){
+                if (isBidSubmission || isControl) {
                     hj = CheckNull(AItem.data.feesIndex && AItem.data.feesIndex.common ? AItem.data.feesIndex.common.tenderTotalFee : 0);
-                    dj = hj;
+                    dj = CheckNull(AItem.data.feesIndex && AItem.data.feesIndex.common ? AItem.data.feesIndex.common.tenderUnitFee : 0);
                 }
                 attrs.push({name: "单价", value: dj}, {name: "合价", value: hj});
                 attrs.push({name: "备注", value: isBidInvitation ? '' : AItem.data.remark});
@@ -334,12 +335,29 @@ INTERFACE_EXPORT = (() => {
                         {name: "税金", value: getFee(AItem.data.fees, 'tax.tenderTotalFee'), type: TYPE.DECIMAL}
                     );
                 }
+                else{
+                    attrs.push(
+                      {name: "人工费", value: 0},
+                      {name: "主材费", value: 0},
+                      {name: "辅材费", value: 0},
+                      {name: "机械使用费", value: 0},
+                      {name: "设备费", value: 0},
+                      {name: "措施费1", value: 0},
+                      {name: "措施费2", value: 0},
+                      {name: "企业管理费", value: 0},
+                      {name: "规费", value: 0},
+                      {name: "利润", value: 0},
+                      {name: "税金", value: 0}
+                    );
+                }
 
                 vBillNode = new CreateNode('工程量清单明细', attrs);
                 AXMLParent.children.push(vBillNode);
 
+              if (isBidSubmission || isControl) {
                 if (calcTools.isLeafBill(AItem))
-                    addRations(AItem, vBillNode)
+                  addRations(AItem, vBillNode)
+              };
             }
             addBillNode();
 
@@ -494,7 +512,7 @@ INTERFACE_EXPORT = (() => {
             let attrs0 = [
                 { name: '序号', value: Num },
                 { name: '标段名称', value: Bid.name },
-                { name: '金额', value: projectData.summaryInfo[Bid.ID].totalCost }
+                { name: '金额', value: isBidInvitation ? 0 : projectData.summaryInfo[Bid.ID].totalCost }
             ];
 
             const attrs1 = [{ name: '唯一标识-Guid', value: Bid._id }];           // 公路标段工程