Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/planeTicketOrder/index.vue

@@ -222,11 +222,19 @@
         :header-cell-style="getRowClass"
       >
       <el-table-column fixed prop="CreateTime" label="报名日期">
+        <template slot-scope="scope">
+            <div v-if="scope.row.OrderId === 0">
+              合计
+            </div>
+            <div v-else>
+              {{scope.row.CreateTime}}
+            </div>
+          </template>
       </el-table-column>
         <el-table-column fixed prop="EnterName" label="业务员">
           <template slot-scope="scope">
             <div v-if="scope.row.OrderId === 0">
-              合计
+              -
             </div>
             <div v-else>
               {{scope.row.EnterName}}
@@ -743,7 +751,7 @@ export default {
     },
     //改变状态背景颜色
     columenStyle({columnIndex}){
-      if(columnIndex == 7 ){
+      if(columnIndex == 8 ){
         return "background:#f0f5fb"
       }
     },
@@ -788,6 +796,6 @@ export default {
 }
 .Commission{
   cursor: pointer;
-  color: red;
+  color: #2961fe;
 }
 </style>