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

src/components/SalesModule/SalesFinancialDetail.vue

@@ -432,7 +432,7 @@ export default {
     },
   }, mounted() {
     this.userId = this.getLocalStorage().EmployeeId;
-    let obj = JSON.parse(this.$route.query.item)
+    let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
     this.item = obj
     this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
     this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM

src/components/Ticketing/IndividualTicketOrder.vue

@@ -46,6 +46,7 @@
       <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
         <tr class="title_tr">
           <th>单号</th>
+          <th>机票编码</th>
           <th>客户信息</th>
           <th>客人数量</th>
           <th>单价</th>
@@ -63,35 +64,38 @@
         </tr>
         <tbody v-for="(item,index) in dataList" :key="index">
         <tr>
-          <td>{{item.AirProductId}} </td>
+          <td>{{item.Id}} </td>
+          <td>{{item.Id}} </td><!-- 机票编码 -->
+          
           <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
             <!-- <p class="fz12">123456</p> -->
           </td>
-          <td>{{item.GuestNum}}</td>
+          <td>{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</td>
           <td class="fz12">{{item.TC_Price}}</td>
           <td class="fz12">{{item.Unit_Price}}</td>
-          <td style="color:#FF9C00">{{item.PreferPrice}}</td>
-          <td style="color:#FF9C00">{{item.Income}}</td>
+          <td style="color:#E95252">{{item.PreferPrice}}</td>
+          <td style="color:#E95252">{{item.Income}}</td>
           <td>{{item.Refund}}</td>
           <td>{{item.PlatformTax}}</td>
           <td>
-              <el-tag v-if="item.Status==1" type="success">正常</el-tag>
-              <el-tag v-if="item.Status==2">取消</el-tag>
+              <span v-if="item.Status==1">正常</span>
+              <span v-if="item.Status==2">取消</span>
+              <span v-if="item.Status==3">待付款</span>
+              
           </td>
         </tr>
         <tr style="height:20px">
           <td colspan="15" class="RL_Order" style="height:20px">
             <span class="RL-remarkTitle">名单:</span>
             <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
-                <span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
-                <el-popover
+              
+              <el-popover
             placement="right"
             width="1000"
             trigger="click">
             <el-table :data="item.GuestList">
-                <el-table-column property="Id" label="订单ID"></el-table-column>
+                <el-table-column property="Id" label="排号"></el-table-column>
                 <el-table-column property="Name" label="姓名"></el-table-column>
-                <el-table-column property="EName" label="英文姓名"></el-table-column>
                 <el-table-column property="Sex" label="性别">
                      <template slot-scope="scope">
                          <span v-if="scope.row.Sex=='1'">男</span>
@@ -112,11 +116,11 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <span style="float:right" class="RL-remarkTitle" slot="reference">
-                <i style="font-size:12px;color:#e95252" class="iconfont icon-gengduo"></i>
+            <span slot="reference">
+              <span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
             </span>
-            
-            </el-popover>
+          </el-popover>
+
             </span>
             <span class="RL-redType RL-remarkCon" v-else>
                 <span>暂无名单</span>
@@ -158,6 +162,7 @@
 </template>
 
 <script>
+import moment from 'moment'
 export default {
   data() {
     return {
@@ -166,11 +171,11 @@ export default {
         pageSize: 10,
         AirTicketId: 0,
         AirOrderId: 0,
-        Status: 1,
-        StartTime: "",
+        Status: 0,
+        StartTime: moment().format("YYYY-MM-DD"),
         EndTime: ""
       },
-      status: [{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
+      status: [{ title: "全部", num: 0 },{ title: "待付款", num: 3 },{ title: "正常", num: 1 }, { title: "取消", num: 2 }],
       dataList:[],   
       loading:false, 
       total:0, 
@@ -221,7 +226,7 @@ export default {
 <style scoped>
  @import "../../assets/css/newTravelManager.css";
 .title_tr th{
-    width:10%;
+    width:9%;
 }
   .color_red_order {
     color: #e95252 !important;
@@ -301,7 +306,7 @@ export default {
   }
 
   .groupTourOrderSearchTable tr td {
-    padding: 10px;
+    padding: 8px;
     border-top: 1px solid #cccccc;
     border-left: 1px solid #cccccc;
   }

src/components/Ticketing/individualTicket.vue

@@ -507,7 +507,7 @@
           TicketType: 2, //定金类型(1定，2定等)
           LineId: 0, //线路编号
           IsPayOrder:0,
-          FlyState: 1,
+          FlyState: 0,
           CreateBy: 0, //操作人
         },
         //员工列表

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -317,10 +317,11 @@
 
         basicData.TeamType=this.PostConfig.TeamType;
 
-        basicData.DayNum = this.PostDaysTrip.DayNum;
-        basicData.NightNum = this.PostDaysTrip.NightNum;
-        basicData.StartCityId = this.PostDaysTrip.StartCityId;
-        basicData.ReturnArriveCityId = this.PostDaysTrip.ReturnArriveCityId;
+        basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum!="")?this.PostDaysTrip.DayNum:0;
+        basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum!="")?this.PostDaysTrip.NightNum:0;
+        basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId!="")?this.PostDaysTrip.StartCityId:0;  
+        basicData.ReturnArriveCityId = (this.PostDaysTrip && this.PostDaysTrip.ReturnArriveCityId!="")?this.PostDaysTrip.ReturnArriveCityId:0;
+
         basicData.SelfpayingList=this.PostConfig.SelfpayingList;
         basicData.ShopList=this.PostConfig.ShopList;
 

src/plug/index.js

@@ -116,6 +116,7 @@ export default {
       let domainUrl = '';
       let locationName = window.location.hostname;
       domainUrl = "http://127.0.0.1"; //214主域名
+      // domainUrl = "http://192.168.2.16:8083";
       if (locationName.indexOf('oytour')!==-1) {
         domainUrl = "https://reborn.oytour.com";
       }else if (locationName.indexOf('viitto')!==-1) {
@@ -290,6 +291,80 @@ export default {
             }
           }, faildCall)
       },
+
+
+      Vue.prototype.JueryPost=function (cmd, msg, successCall, faildCall) {
+        if (msg == null || msg == "") {
+          msg = {}
+        }
+        var apiurl = this.domainManager().PostUrl;
+        var timestamp = (new Date()).valueOf();
+        this.apiurl = apiurl;
+        if (this.$route.path.toLowerCase() == "/signature") {
+          this.$router.push({
+            path: '/signature'
+          })
+        } else {
+          if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
+            this.$router.push({
+              path: '/login'
+            })
+          }
+        }
+        var token = "";
+        var key = "";
+        if (this.getLocalStorage() != null) {
+          token = this.getLocalStorage().token;
+          key = this.getLocalStorage().SecretKey;
+        }
+        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+        var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+        var postData = {
+          "msg": msg,
+          "cmd": cmd,
+          "timestamp": timestamp,
+          "token": token,
+          "sign": md5Str
+        }
+
+        $.ajax({
+          url: apiurl,
+          type: "POST",
+          data:  msg,
+          datatype: "jsonP",
+          success: function (res) {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
+              this.$router.push({
+                path: '/login'
+              });
+            } else if (res.resultCode == 10005) {
+              this.$router.go(-1);
+            } else {
+              successCall(res);
+            }
+          },
+          faildCall
+        });
+
+        this.$http.post(apiurl, postData, {
+            headers: {
+              'Content-Type': 'application/json',
+              'Referer-Viitto': this.$route.path
+            }
+          })
+          .then(res => {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
+              this.$router.push({
+                path: '/login'
+              });
+            } else if (res.resultCode == 10005) {
+              this.$router.go(-1);
+            } else {
+              successCall(res);
+            }
+          }, faildCall)
+      },
+
       Vue.prototype.apiJavaPost = function(cmd, msg, successCall, faildCall) {
         if (msg == null || msg == "") {
             msg = {}