add

src/views/company/schedule/report.vue

@@ -17,7 +17,7 @@
      </el-form-item>
 
       <el-form-item label="所属档期" prop="scheduleId">
-            <el-select multiple style="width:205.4px" v-model="scheduleIdArr" placeholder="请选择档期" clearable size="small" >
+            <el-select filterable multiple style="width:205.4px" v-model="scheduleIdArr" placeholder="请选择档期" clearable size="small" >
                   <el-option
                       v-for="item in scheduleList"
                       :key="item.id"
@@ -323,11 +323,11 @@ export default {
         if(index==0){   //注册率=注册数/总进线
              value=(row["registerNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
-        else if(index==1){   //上线率=上线数/注册数
-             value=(row["onlineNum"]/row["registerNum"]*100.0).toFixed(3)+"%";
+        else if(index==1){   //上线率=上线数/总进线
+             value=(row["onlineNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
-        else if(index==2){   //完课率=完课数/注册数
-             value=(row["finishNum"]/row["registerNum"]*100.0).toFixed(3)+"%";
+        else if(index==2){   //完课率=完课数/总进线
+             value=(row["finishNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
         else if(index==3){   //目标完成率=累计业绩/目标业绩    
              if(row.targetMoney>0){

src/views/company/schedule/statistics.vue

@@ -30,7 +30,7 @@
       </el-form-item> -->
 
       <el-form-item label="所属档期" prop="scheduleId">
-            <el-select multiple="" style="width:205.4px" v-model="scheduleIdArr" placeholder="请选择档期" clearable size="small" >
+            <el-select filterable multiple style="width:205.4px" v-model="scheduleIdArr" placeholder="请选择档期" clearable size="small" >
                   <el-option
                       v-for="item in scheduleList"
                       :key="item.id"
@@ -100,7 +100,14 @@
     
       <!-- <el-table-column fixed label="所在部门"  width="100px" align="center" prop="deptName" /> -->
        <!-- <el-table-column label="员工姓名" align="center" prop="userNickName" /> -->
-       <el-table-column fixed label="团队总人数" width="90px" align="center" prop="cuCount" />
+
+      <el-table-column fixed label="团队总人数" width="90" align="center" prop="cuCount"   >
+          <template slot-scope="scope">
+            {{!scope.row.cuCount?0:scope.row.cuCount}}
+          </template>
+      </el-table-column>
+
+
        <el-table-column fixed label="接线人数" width="80px" align="center" prop="connectionNum" />
       <el-table-column fixed label="总进线"  width="60"  align="center" prop="totalNum" />
 
@@ -154,7 +161,7 @@
            </template>     
       </el-table-column>
 
-      <el-table-column   label="累计总业绩" width="90" align="center" prop="totalMoney"   >
+      <el-table-column fixed="right"   label="累计总业绩" width="90" align="center" prop="totalMoney"   >
             <template slot-scope="scope">
                {{!scope.row.totalMoney?0:(scope.row.totalMoney).toFixed(2)}}   
             </template>
@@ -177,12 +184,20 @@
               {{!scope.row.targetMoney?0:(scope.row.targetMoney).toFixed(2)}}
             </template>
       </el-table-column>
+
       <el-table-column fixed="right"  label="目标完成率"  width="90" align="center" prop="targetRate"   >
             <template slot-scope="scope">
                 {{ renderTotalVal(scope.row,3) }}
             </template>
       </el-table-column>
 
+
+      <el-table-column fixed="right"  label="ZROI"  width="90" align="center" prop="zroi"   >
+            <template slot-scope="scope">
+                {{ renderTotalVal(scope.row,6) }}
+            </template>
+      </el-table-column>
+
       <el-table-column fixed="right"  label="单线R值"  width="90" align="center" prop="targetRate"   >
            <template slot-scope="scope">
                {{ renderTotalVal(scope.row,5) }}
@@ -523,9 +538,6 @@ export default {
           this.queryParams.companyId=this.companyIdArr.toString();
       }
       this.loading = true;
-      if(!!this.queryParams.deptIdStr){
-           console.log("qxj params deptIdStr:"+this.queryParams.deptIdStr);
-      }
       listTcmStatisticsReport(this.addDateRange(this.queryParams,this.dateRange)).then(response => {
           this.tcmScheduleReportList = response.rows;
           this.total = response.total;
@@ -567,6 +579,15 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      this.queryParams.scheduleId="";
+      this.queryParams.companyId="";
+      if(this.scheduleIdArr.length>0){
+          this.queryParams.scheduleId=this.scheduleIdArr.toString();
+      }
+      if(this.companyIdArr.length>0){
+          this.queryParams.companyId=this.companyIdArr.toString();
+      }
+      this.queryParams=this.addDateRange(this.queryParams,this.dateRange);
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出中医报表统计数据项?', "警告", {
           confirmButtonText: "确定",
@@ -642,10 +663,10 @@ export default {
              value=(row["registerNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
         else if(index==1){   //上线率=上线数/注册数
-             value=(row["onlineNum"]/row["registerNum"]*100.0).toFixed(3)+"%";
+             value=(row["onlineNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
         else if(index==2){   //完课率=完课数/注册数
-             value=(row["finishNum"]/row["registerNum"]*100.0).toFixed(3)+"%";
+             value=(row["finishNum"]/row["totalNum"]*100.0).toFixed(3)+"%";
         }
         else if(index==3){   //目标完成率=累计业绩/目标业绩
             if(row.targetMoney>0){
@@ -654,12 +675,19 @@ export default {
                 value="0%";
             } 
         }
-        else if(index==4){   //人均业绩=总业绩/当期部门人数
-             value=(row["totalMoney"]/row["cuCount"]*1.0).toFixed(3);  
+        else if(index==4){   //人均业绩=总业绩/接线人数
+             value=(row["totalMoney"]/row["connectionNum"]*1.0).toFixed(3);  
         }
         else if(index==5){   //单线R值=累计业绩/总进线
              value=(row["targetMoney"]/row["totalNum"]*1.0).toFixed(3);  
         }
+        else if(index==6){   //zori=总业绩/总消耗
+            if(row.money>0){
+                value=(row.totalMoney/row.money*1.0).toFixed(3);  
+            }else{
+                value="0%";
+            } 
+        }
         return value;
     },