Merge branch 'LAO_MO' into online

src/views/main/index.vue

@@ -45,7 +45,7 @@
             </div>
             <div class="info">
               <p class="sub">收入金额</p>
-              <p class='msg'>{{ dataInfo.incomeMap && dataInfo.incomeMap.total_num_ >= 0 ? dataInfo.incomeMap.total_num_  : '--' }}</p>
+              <p class='msg'>{{ dataInfo.incomeMap && dataInfo.incomeMap.total_num_ >= 0 ? dataInfo.incomeMap.total_num_ : '--' }}</p>
             </div>
           </div>
         </div>

src/views/teamBuild/components/teamBaseInfo.vue

@@ -681,7 +681,7 @@ export default {
     this.init();
   },
   mounted () {
-    // this.init();
+    this.init();
     // this.$forceUpdate()
     // 获取分部下的员工
   },

src/views/workBenchManager/classFeesIsOk.vue

@@ -167,17 +167,17 @@
           <el-table-column align="center"
                            prop="actualSalary"
                            label="应发课酬">
-            <template slot-scope="scope">{{scope.row.actualSalary + '元'}}</template>
+            <template slot-scope="scope">{{(scope.row.actualSalary) |moneyFormat }}元</template>
           </el-table-column>
           <el-table-column align="center"
                            prop="reduceSalary"
                            label="课酬扣款">
-            <template slot-scope="scope">{{scope.row.reduceSalary + '元'}}</template>
+            <template slot-scope="scope">{{(scope.row.reduceSalary)  | moneyFormat}}元</template>
           </el-table-column>
           <el-table-column align="center"
                            prop="finalSalary"
                            label="结算课酬">
-            <template slot-scope="scope">{{scope.row.finalSalary + '元'}}</template>
+            <template slot-scope="scope">{{(scope.row.finalSalary)  | moneyFormat}}元</template>
           </el-table-column>
           <el-table-column align="center"
                            prop