build

src/components/newEarningReport/company.vue

@@ -179,9 +179,10 @@
             </el-table-column>
 
             <el-table-column label="实际毛利率" align="center" width="85px">
+              <!-- isSubProp(scope.row) ? unit2TenThousand(calcAmountRealRate()) + ''  : -->
               <template slot-scope="scope">
                 {{ costField 
-                  ?  isSubProp(scope.row) ? calcAmountRealRate()  : unit2TenThousand(scope.row.gross_sale_completion_rate) + "%" 
+                  ?   unit2TenThousand(scope.row.gross_sale_completion_rate) + "%" 
                   : '***' 
                 }}
               </template>
@@ -458,7 +459,7 @@ export default {
               gross_completion, //当月毛利完成 = 月营收 - 月成本
               completion_rate: total_tips=== '-' ? '-' : multiplication(division(prev_msale_total, total_tips), 100).toFixed(2), // 当月应收完成率
               gross_completion_rate:  cost_tips === '-' ? '-' : Number(cost_tips) === 0 ? 0 : multiplication(division(gross_completion, cost_tips) || 0, 100).toFixed(2), // 当月毛利完成率
-              gross_sale_completion_rate:Number(gross_completion) <= 0 ? 0 : Number(multiplication(Number(division(gross_completion, prev_msale_total)).toFixed(2), 100)).toFixed(2), // 本月毛利率 =  当月毛利完成 / 当月营业收入
+              gross_sale_completion_rate:Number(gross_completion) == 0 ? 0 : Number(multiplication(Number(division(gross_completion, prev_msale_total)).toFixed(2), 100)).toFixed(2), // 本月毛利率 =  当月毛利完成 / 当月营业收入
             }
           ]
         })
@@ -469,7 +470,8 @@ export default {
       return sourceData
     },
     isSubProp(row){
-      return row.companyName === '北京元隆雅图文化传播股份有限公司'
+      return false
+      // return row.companyName === '北京元隆雅图文化传播股份有限公司'
     },
     async requestData() {
       let platformlist = await this.getData()