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

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -33,6 +33,14 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="出团公司：">
+              <el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
+                <el-option label="不限" :value="-2"></el-option>
+                <el-option v-for="item in BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row >
           <el-col :span="6" v-for="(month, index) in monthList" :key="index">
@@ -77,9 +85,11 @@ export default {
         Month: 0,
         Money: '',
         sharelist: [],
+        BranchId: -2,
       },
       data: [],
       DataList: [],
+      BranchList: [],
       MonthIndex: 0,
       pageSize: 18,
       pageIndex: 1,
@@ -339,6 +349,7 @@ export default {
     this.userId = userInfo.EmployeeId;
   },mounted(){
     this.getData()
+    this.getCompanyList()
   },methods:{
     togbu: function () {
       this.AALloading = true
@@ -475,7 +486,22 @@ export default {
           this.$message.error(res.data.message)
         }
       }, null)
+    },
+    //初始化公司
+    getCompanyList() {
+      let userInfo = this.getLocalStorage();
+      var RB_Group_id = userInfo.RB_Group_id;
+      let msg = {
+        Status: 0,
+        is_show: 0,
+        RB_Group_Id: RB_Group_id
+      };
+      this.apipost("admin_get_BranchGetList", msg, res => {
+          if (res.data.resultCode == 1) {
+            this.BranchList = res.data.data;
           }
+      }, err => {})
+    },
   }
 }
 </script>