wansfa 1 år sedan
förälder
incheckning
05f13db7c1

+ 6 - 6
src/views/company/tcmScheduleReport/add.vue

@@ -10,7 +10,7 @@
             </div>
       </div>
       
-     <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+     <el-form ref="form" :model="form" :rules="rules" label-width="90px" style="margin-bottom:50px">
        <el-form-item label="所属档期" prop="scheduleId">
             <el-select disabled style="width: 500px" v-model="form.scheduleId" placeholder="请选择档期" clearable size="small" >
                   <el-option
@@ -25,7 +25,7 @@
         <el-row>
             <el-col :span="12">
                     <el-form-item label="总进线" label-width="90px" prop="totalNum">  
-                    <el-input :disabled="form.id>0" v-model="form.totalNum"  onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))" type="number" placeholder="请输入总进线" />  
+                       <el-input :disabled="form.id>0" v-model="form.totalNum"  onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))" type="number" placeholder="请输入总进线" />  
                     </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -73,12 +73,12 @@
          <el-row v-for="(item, index) in roundArr" :key="index">
               <el-col :span="7">
                     <el-form-item :label="item+'业绩'"  label-width="90px" :prop="'round'+(index+1)+'Money'">  
-                        <el-input-number :disabled="scheduleItem.status==0" v-model="form['round'+(index+1)+'Money']" :step="10" :precision="2"  :min="0.00" :placeholder="'请输入'+item+'业绩'" />
+                        <el-input-number  v-model="form['round'+(index+1)+'Money']" :step="10" :precision="2"  :min="0.00" :placeholder="'请输入'+item+'业绩'" />
                     </el-form-item>
               </el-col>
                <el-col :span="7">
                     <el-form-item :label="item+'单数'"  label-width="90px" :prop="'round'+(index+1)+'Order'">
-                        <el-input-number :disabled="scheduleItem.status==0" v-model="form['round'+(index+1)+'Order']" :min="0"  :max="form.totalNum" :step="1" :placeholder="'请输入'+item+'单数'"/>
+                        <el-input-number  v-model="form['round'+(index+1)+'Order']" :min="0"  :max="form.totalNum" :step="1" :placeholder="'请输入'+item+'单数'"/>
                     </el-form-item>
               </el-col>  
 
@@ -792,8 +792,8 @@ export default {
 </script>
 
 <style lang="scss" scoped> 
-.app-main{
-  background: #ffffff;
+ .app-main{
+   background-color: #fff !important;
 }
 .app-container{
   margin: 0;

+ 5 - 0
src/views/company/tcmScheduleReport/companyReport.vue

@@ -102,6 +102,11 @@
                 {{ renderTotalVal(scope.row,3) }}
            </template>
     </el-table-column>
+    <el-table-column  label="更新时间" align="center" prop="updateTime" width="100">
+            <template slot-scope="scope">
+               <span>{{ parseTime(scope.row.updateTime) }}</span>
+            </template>
+      </el-table-column>
     <!-- <el-table-column  label="创建时间" align="center" prop="createTime" width="100">
             <template slot-scope="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>

+ 12 - 6
src/views/company/tcmScheduleReport/index.vue

@@ -103,7 +103,7 @@
           v-hasPermi="['company:tcmScheduleReport:export']"
         >导出</el-button>
       </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+	    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="tcmScheduleReportList" @selection-change="handleSelectionChange">
@@ -124,14 +124,14 @@
           {{(scope.row.registerNum/scope.row.totalNum*100.0).toFixed(3)+"%"}}
         </template>
     </el-table-column>
-     <el-table-column  label="上线率" align="center" prop="onlineRate"   >
+     <el-table-column  label="进线上线率" align="center" prop="onlineRate"   >
         <template slot-scope="scope">
-          {{(scope.row.onlineNum/scope.row.registerNum*100.0).toFixed(3)+"%"}}
+          {{(scope.row.onlineNum/scope.row.totalNum*100.0).toFixed(3)+"%"}}
         </template>
     </el-table-column>
-     <el-table-column  label="完课率" align="center" prop="finishRate"   >
+     <el-table-column  label="进线完课率" align="center" prop="finishRate"   >
         <template slot-scope="scope">
-         {{(scope.row.finishNum/scope.row.registerNum*100.0).toFixed(3)+"%"}}
+         {{(scope.row.finishNum/scope.row.totalNum*100.0).toFixed(3)+"%"}}
         </template>
     </el-table-column>
      <el-table-column  label="累计总业绩" width="90" align="center" prop="totalMoney"   >
@@ -154,12 +154,18 @@
            {{ scope.row.targetMoney>0?(scope.row.totalMoney/scope.row.targetMoney*100.0).toFixed(3)+"%":"0%"}}
         </template>
     </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
 
+     <el-table-column label="更新时间" align="center" prop="updateTime" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime) }}</span>
+        </template>
+      </el-table-column>
+
 <!-- 
       <el-table-column label="一轮业绩" align="center" prop="round1Money" />
       <el-table-column label="一轮单数" align="center" prop="round1Order" />

+ 2 - 2
src/views/company/tcmScheduleReport/statisticsReport.vue

@@ -138,9 +138,9 @@
                 {{ renderTotalVal(scope.row,3) }}
            </template>
     </el-table-column>
-    <el-table-column  label="创建时间" align="center" prop="createTime" width="100">
+    <el-table-column  label="更新时间" align="center" prop="updateTime" width="100">
             <template slot-scope="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
+               <span>{{ parseTime(scope.row.updateTime) }}</span>
             </template>
       </el-table-column>