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

src/components/Buying/CommondityOrderList.vue

@@ -11,32 +11,36 @@
       <ul class="user_time_picker">
         <li>
           <span>
-            <em>姓名</em>
+            <em>旅客名称</em>
             <el-input v-model="msg.AccountName" @keyup.enter.native="getList"></el-input>
           </span>
         </li>
         <li>
           <span>
-            <em>护照号</em>
-            <el-input v-model="msg.PassportNo" @keyup.enter.native="getList"></el-input>
-          </span>
-        </li>
-        <li>
-          <span>
-            <em>账户</em>
-            <el-input v-model="msg.LoginAccount" @keyup.enter.native="getList"></el-input>
+            <em>同行</em>
+            <el-select class="w150" v-model="msg.CustomerId" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue">
+              </el-option>
+              <el-option v-for="item in CustomerList" :label="item.CustomerName" :value="item.CustomerId"
+                :key="item.CustomerId"></el-option>
+            </el-select>
           </span>
         </li>
         <li>
           <span>
-            <em>手机号码</em>
-            <el-input v-model="msg.MobilePhone" @keyup.enter.native="getList"></el-input>
+            <em>销售</em>
+            <el-select class="w150" v-model="msg.SaleId" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue">
+              </el-option>
+              <el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
+                :key="item.EmployeeId"></el-option>
+            </el-select>
           </span>
         </li>
         <li>
           <span>
-            <em>{{$t('admin.admin_status')}}</em>
-            <el-select filterable v-model="msg.AccountStatus">
+            <em>订单状态</em>
+            <el-select filterable v-model="msg.COrderState">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
               <el-option label="正常" :value="0"></el-option>
               <el-option label="禁用" :value="1"></el-option>
@@ -121,6 +125,10 @@
       return {
         //查询参数
         msg: {
+          AccountName:"",//旅客名称
+          CustomerId: 0, //同行编号
+          SaleId: 0, //销售编号
+          COrderState:-1,//订单状态
           pageIndex: 1,
           pageSize: 10,
           total: 0,
@@ -131,10 +139,18 @@
         editMsg: {
           Id: 0,
           AccountStatus: 0,
-        }
+        },
+        //下拉框默认值
+        SelectDefaultValue: 0,
+        //员工列表
+        EmployeeList: [],
+        //客户列表
+        CustomerList: [],
       };
     },
     mounted() {
+      this.getEmployeeList();
+      this.getCustomerList();
       this.getList();
     },
     filters: {},
@@ -143,6 +159,41 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        let userInfo = this.getLocalStorage()
+        let msg = {
+          GroupId: userInfo.RB_Group_id,
+          BranchId: '-1',
+          DepartmentId: '-1',
+          PostId: '-1',
+          IsLeave: '0'
+        }
+        this.apipost(
+          'admin_get_EmployeeGetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
+      //所有客户信息
+      getCustomerList() {
+        let msg = {
+          CustomerName: "",
+        }
+        this.apipost(
+          'app_customer_GetAllListByGroupId', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.CustomerList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
       //获取数据
       getList() {
         this.loading = true;
@@ -150,7 +201,6 @@
           this.loading = false;
           if (res.data.resultCode === 1) {
             this.dataList = res.data.data.pageData;
-            console.log("this.dataList", this.dataList);
             this.msg.total = res.data.data.count;
           } else {
             this.Error(res.data.message);