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

src/components/scenicSpot/ScenTicketOrder.vue

@@ -12,14 +12,8 @@
             <span>
                 <em>公司</em>
                 <el-select v-model="msg.rbBranchId" placeholder="请选择">
-                <el-option :key="-1" label="全部" :value="-1"></el-option>
-                    
-                <el-option
-                v-for="item in status"
-                :key="item.num"
-                :label="item.title"
-                :value="item.num">
-                </el-option>
+                   <el-option label="不限" :value="-1"></el-option>
+                  <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
             </el-select>
             </span>
             
@@ -28,13 +22,14 @@
             <span>
                 <em>业务员</em>
                 <el-select v-model="msg.enterID" placeholder="请选择">
-                <el-option
-                v-for="item in status"
-                :key="item.num"
-                :label="item.title"
-                :value="item.num">
-                </el-option>
-            </el-select>
+                  <el-option label="不限" :value="-1"></el-option>
+                  <el-option
+                    v-for="item in employeeList"
+                    :label="item.name"
+                    :value="item.empId"
+                    :key="item.empId"
+                  ></el-option>
+                  </el-select>
             </span>
             
         </li>
@@ -197,22 +192,47 @@ export default {
         enterID:-1,
 
       },
-      status: [
-        { title: "全部", num: 0 },
-        { title: "待付款", num: 3 },
-        { title: "正常", num: 1 },
-        { title: "取消", num: 2 }
-      ],
       dataList: [],
       loading: false,
       total: 0,
       currentPage: 1,
-      showID: -1
+      showID: -1,
+      companyList:[],
+      employeeList:[],
     };
   },
   components: {},
-  created() {},
+  created() {
+    this.getCompanyList();
+    this.getEmployee();
+  },
   methods: {
+    getEmployee() {
+      this.apipost(
+        "app_get_company_employee",
+        this.employeeMsg,
+        res => {
+          if (res.data.resultCode == 1) {
+            this.employeeList = res.data.data;
+          }
+        },
+        err => {}
+      );
+    },
+    getCompanyList() {
+				let userInfo = this.getLocalStorage();
+				let 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.companyList=res.data.data;
+					}
+				}, err => {})
+			},
     //   退款操作
     RefundPay(item) {
       let orderObj = {