散卖机票订单

src/components/Ticketing/IndividualTicketOrder.vue

@@ -13,6 +13,35 @@
                 <em>订单号</em><el-input v-model='msg.AirOrderId' class='w150'></el-input>
             </span>
         </li>
+        <li>
+          <span>
+            <em>报名公司</em>
+            <el-select class="w200" v-model="msg.RB_Branch_Id" filterable :placeholder="$t('pub.pleaseSel')">
+               <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>
+          
+        </li>
+        <li>
+          <span>
+            <em>人员选择</em>
+          </span>
+          <el-select
+            class="w200"
+            v-model="msg.EnterID"
+            filterable
+            :placeholder="$t('pub.pleaseSel')"
+          >
+            <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>
+        </li>
         <li>
             <span>
                 <em>状态</em>
@@ -195,10 +224,42 @@ export default {
       loading:false, 
       total:0, 
       currentPage: 1, 
+      companyList:[],
+      employeeList:[],
     };
   },
   components: {},
+  created(){
+    this.getEmployee();
+    this.getCompanyList();
+  },
   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 => {})
+			},
     goUrl: function (name, path, id ) {
       this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
     },
@@ -218,7 +279,7 @@ export default {
         res => {
           this.loading=false;
           if (res.data.resultCode == 1) {
-                console.log(res);
+                // console.log(res);
                 this.total = res.data.data.count;
                 this.dataList = res.data.data.pageData;
           } else {

src/components/Ticketing/IndividualTicketOrderDetails.vue

@@ -4,14 +4,16 @@
     <!-- 信息 -->
     <div class="AirModel">
         <el-row>
-            <el-col :span="8">
+            <el-col :span="7">
                 <p>{{AirModel.AirlineName}}</p>                
                 <p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p>
             </el-col>
-            <el-col :span="15">
+            <el-col :span="17">
                 <p v-for="item in AirModel.flightList" :key="item.Flight_number">
                     <span class="air">{{item.Flight_number}} </span>
-                    <span>{{item.FlightDate}} {{item.Departure_time}}{{item.DepartureName}} - {{item.AIATA}}{{item.ArrivalCityName}}</span>
+                    <span>{{item.FlightDate}} {{item.Departure_time}}({{item.DIATA}}){{item.DepartureName}} 
+                      <span v-if="item.StopoverName">-({{item.StopoverIATA}}){{item.StopoverName}}</span> 
+                      <span v-if="item.ArrivalCityName">- ({{item.AIATA}}){{item.ArrivalCityName}}</span></span>
                 </p>
             </el-col>
         </el-row>
@@ -298,7 +300,7 @@ export default {
         "ticket_get_GetScatteringOrderForAirTicketList",
         this.msg,
         res => {
-          console.log(res);
+          // console.log(res);
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.total = res.data.data.count;
@@ -328,7 +330,7 @@ export default {
 }
 .AirModel {
   font-size: 14px;
-  width: 500px;
+  width: 560px;
   margin-bottom: 15px;
   font-weight: 400;
   padding: 6px;

src/components/commonPage/payURL.vue

@@ -132,17 +132,17 @@
 				} else if (this.value === '3') {
 					this.visible=false
 					let orderObj = {
-						OrderID:obj.orderId,
-						OrderSource:8,
+						OrderID:obj.orderId,//订单号
+						OrderSource:8,//12
 						Obj: {},
-						SourceID:obj.ID,
+						SourceID:obj.ID,//机票id
 						TCIDList: TCIDARR
 					}
 					this.$router.push({
 						name: 'ChoiceAddFinancialDocuments',
 						query:{
 							"Type":2,
-							"companyID":obj.outBranchId,
+							"companyID":obj.outBranchId,//公司id
 							"path": "",
 							'blank':'y',
 							'orderObj':JSON.stringify(orderObj)

src/plug/index.js

@@ -116,6 +116,7 @@ export default {
       let domainUrl = '';
       let locationName = window.location.hostname;
       domainUrl = "http://192.168.2.214:8082"; //214主域名
+      // domainUrl = "http://192.168.2.16:8083";
       if (locationName.indexOf('oytour')!==-1) {
         domainUrl = "http://webapi.viitto.com";
      }

src/router/config.js

@@ -1866,6 +1866,15 @@ export default {
                 title: '机票订单'
               },
             },
+            { // 销售 散卖机票订单
+              path: '/BulkAirTicketOrders',
+              name: 'BulkAirTicketOrders',
+              component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
+              meta: {
+                title: '散卖机票订单'
+              },
+            },
+            
             { // 销售 报名统计
               path: '/enrollTotal',
               name: 'enrollTotal',