Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialDocuments.vue

@@ -1338,9 +1338,6 @@
         </el-table>
 
       </div>
-      <div class="noData" v-show="noData">
-        {{$t('system.content_noData')}}
-      </div>
       <div v-if="!BOSSBtn && !BOSSBtn2">
         <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
           :current-page.sync="currentPage" layout="total,sizes,prev, pager, next, jumper" :page-size='msg.pageSize'

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2688,8 +2688,8 @@ export default {
         handler (val, oldVal) {
           if (this.$route.query.BranchId) {
             this.msg.OutBranchId = Number(this.$route.query.BranchId)
-            this.financeinfo_post_GetList()
           }
+          this.financeinfo_post_GetList()
         },
         deep: true,
         immediate: true