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

src/App.vue

@@ -108,7 +108,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_0whkhalyx8tm.css";
+  @import "//at.alicdn.com/t/font_635492_p33f7rq158p.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/FinancialModule/ReportForm/YearReport.vue

@@ -696,8 +696,10 @@ export default {
       if (this.msg.QStartDate == "") this.msg.QStartDatetartDate = "2019-01-01";
       this.apipost('financestatistics_post_GetYearReportList', this.msg, res=>{
         if (res.data.resultCode == 1) {
+          // console.log(res);
           let allDataList = res.data.data
           this.DataList = res.data.data.list
+          //  console.log("this.DataList111",this.DataList);
           this.columns = [
             // 团队编号、团号 点击跳转团控列表
             {
@@ -780,7 +782,7 @@ export default {
               componentName: "fontColor2"
             },
           ]
-          console.log(this.DataList);
+         
           this.loading = false;
           this.$message.success(res.data.message)
         } else {this.loading = false;

src/components/SalesModule/planeTicketInquiry.vue

@@ -63,6 +63,7 @@
   border-left: 0;
   /* overflow: hidden; */
   position: relative;
+  padding-top:10px;
 }
 .PlaneTicket ._ol_list > li:hover {
   box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
@@ -232,7 +233,7 @@
   /* width: 245px; */
   height: 60px;
   background-color: #f9f9f9;
-  margin-top: 9px;
+  /* margin-top: 9px; */
   padding-right: 10px;
 }
 .TK_SeatList > ul > li:nth-child(1) {
@@ -942,7 +943,7 @@
 .vmiddle {
   display: flex;
   align-items: Center;
-  height: 78px;
+  /* height: 78px; */
 }
 .Plan_Query .el-button--primary {
   background-color: #fff !important;
@@ -998,7 +999,7 @@
 /*航班详情*/
 .PlaneTicket .FlightDivDetails {
   width: 100%;
-  height: 65px;
+  /* height: 65px; */
   overflow: auto;
 }
 .PlaneTicket ._flightList {

src/components/SalesVisa/OrderSplitting.vue

@@ -117,8 +117,10 @@ export default {
   methods:{
     // 订单拆分
     OrderSplit(){
+      this.loading = true;
       this.orderSplitInfo.GuestIdStr=this.checkList;
       this.apipost('dmc_post_SetGuestSplitVisaInfo',this.orderSplitInfo,res=>{
+        this.loading = false;
             if(res.data.resultCode==1){
                 this.$message.success(res.data.message)
                 this.getData()

src/components/SalesVisa/VisaProductOrder.vue

@@ -188,7 +188,7 @@
 			<tr>
 				<td colspan="12" class="RL_Order" style="height:40px;">
 				<span class="VO-remarkTitle">名单:</span>
-				<span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0">
+				<span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0" style="cursor:pointer">
 					<span v-for="(childItem) in item.GuestList" style="margin-right:10px;" @click="goUrl2('VisapassengerList',item.Id,'旅客名单')">{{childItem.userName}}</span>
 				</span>
 				<span class="VO-redType VO-remarkCon" v-else>

src/components/Ticketing/PassengerList.vue

 <style>
   .PT_teamTable {
-  width: 800px;
+  width: 100%;
   background-color: #fff;
   border-collapse: collapse;
 }
@@ -29,7 +29,7 @@
   line-height: 3 !important;
 }
 .passgenrDialog{
-    width:900px;
+    width:1000px;
 }
 .PgflightDiv{
   font-size: 12px;
@@ -116,8 +116,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" style="display:none" />
-          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" />
+          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" style="display:none;"/>
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()"/>
         </li>
       </ul>
     </div>
@@ -180,31 +180,14 @@
           <td>{{item.aName}}</td>
         </tr>
       </table>
-      <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;">
+      <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;" v-if="combineTeamList.length>0">
         <tr>
-          <td colspan="16" style="text-align:left;font-weight:bold;padding-left:5px">联运航班信息</td>
-        </tr>
-        <tr>
-          <th rowspan="2">
-            团号
-          </th>
-          <th rowspan="2">
-            公司/城市
-          </th>
-          <th colspan="6">
-             去程
-          </th>
-          <th colspan="6">
-             回程
-          </th>
+          <td colspan="9" style="text-align:left;font-weight:bold;padding-left:5px">联运航班信息</td>
         </tr>
         <tr>
-          <th>日期</th>
-          <th>航班号</th>
-          <th>出发时间</th>
-          <th>到达时间</th>
-          <th>起飞机场</th>
-          <th>到达机场</th>
+          <th>团号</th>
+          <th>公司/城市</th>
+          <th>航段</th>
           <th>日期</th>
           <th>航班号</th>
           <th>出发时间</th>
@@ -212,9 +195,11 @@
           <th>起飞机场</th>
           <th>到达机场</th>
         </tr>
-          <tr v-for="subItem in combineTeamList">
-            <td>{{subItem.TCNUM}}({{subItem.TCID}})</td>
-            <td>{{subItem.UnionBranchName}}({{subItem.UnionCityName}})</td>
+        <tbody v-for="subItem in combineTeamList">
+          <tr>
+            <td rowspan="2">{{subItem.TCNUM}}({{subItem.TCID}})</td>
+            <td rowspan="2">{{subItem.UnionBranchName}}({{subItem.UnionCityName}})</td>
+            <td width="50">去程</td>
             <td>{{subItem.GoFlightDateStr}}</td>
             <td>{{subItem.GoFlight_number}}</td>
             <td>
@@ -225,6 +210,9 @@
             </td>
             <td>{{subItem.GoDepartAirportName}}</td>
             <td>{{subItem.GoArrivalAirportName}}</td>
+          </tr>
+          <tr>
+            <td width="50">回程</td>
             <td>{{subItem.BackFlightDateStr}}</td>
             <td>{{subItem.BackFlight_number}}</td>
             <td>
@@ -236,9 +224,10 @@
             <td>{{subItem.BackDepartAirportName}}</td>
             <td>{{subItem.BackArrivalAirportName}}</td>
           </tr>
+        </tbody>
       </table>
       <div slot="footer" class="dialog-footer">
-        <button class="normalBtn" type="primary" @click="getCheckInfo()">确认航班信息</button> &nbsp;
+        <button class="normalBtn" type="primary" @click="getIsSure()">确认航班信息</button> &nbsp;
         <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
@@ -319,12 +308,25 @@
         this.apipost("ticket_get_GetUnionFlightAllInfo", msg, res => {
           if (res.data.resultCode == 1) {
             this.combineTeamList = res.data.data;
-            console.log(this.combineTeamList, '联运信息');
           } else {
             this.Error(res.data.message);
           }
         }, err => {});
       },
+      //是否确定
+      getIsSure(){
+        this.$confirm("是否确认航班信息?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+            this.getCheckInfo();
+        })
+        .catch(() => {
+          this.$message.info("已取消！");
+        });
+      },
       //确定
       getCheckInfo() {
         let FlightList = []
@@ -336,12 +338,20 @@
           }
           FlightList.push(obj);
         })
-        var unionFlightList=[];
-
+        var unionFlightList = [];
+        this.combineTeamList.forEach(item => {
+          unionFlightList.push({
+            Id: item.Id,
+            GoDepartTime: item.GoDepartTime,
+            GoArriveTime: item.GoArriveTime,
+            BackDepartTime: item.BackDepartTime,
+            BackArriveTime: item.BackArriveTime
+          });
+        });
         let msg = {
           AirTicketId: this.$route.query.id,
           FlightList: FlightList,
-          UnionFlightList:unionFlightList
+          UnionFlightList: unionFlightList
         }
         this.apipost("ticket_post_SetFlightChildConfirm", msg, res => {
           if (res.data.resultCode == 1) {

src/components/Ticketing/flightManagement.vue

@@ -341,6 +341,22 @@
 <script>
   export default {
     data() {
+      let validateFlightNum = (rule, value, callback) => {
+          var reg = /^[a-zA-Z]+$/;
+          var reg2 = /^[0-9]+$/;
+          var reg3 = /^[0-9a-zA-Z]*$/g;
+          if (value === "") {
+            callback(new Error("请输入航班号"));
+          } else if (!reg3.test(value)) {
+            callback(new Error("请输入数字或字母"));
+          } else if (!reg.test(value.slice(0,1))) {
+            callback(new Error("首字母必须为字母"));
+          } else if(!reg2.test(value.charAt(value.length - 1))){
+            callback(new Error("尾数必须为数字"));
+          } else {
+            callback();
+          }
+      }
       return {
         checked: false,
         outerVisible: false,
@@ -406,9 +422,8 @@
             trigger: "change"
           }],
           Flight_number: [{
-            required: true,
-            message: "请输入航班号",
-            trigger: "blur"
+            validator: validateFlightNum,
+            trigger: "blur",
           }],
           Type: [{
             required: true,
@@ -830,14 +845,14 @@
             tab: "航班有效期维护"
           }
         })
-      }
+      },
     },
     mounted() {
       this.getSeasonTypeList()
       this.getList();
       this.getAirlineList();
       this.getDepartureCityList();
-    }
+    },
   };
 
 </script>

src/components/VisaCenter/visaList2.vue

@@ -153,7 +153,7 @@
                 <div class="_br _pr30 _pl30 _font12 ta_l _vlc_info w305">
                     <div class="_mr_20">
                         <p class="_OrderRemarks" style="width: 130px;"><span>{{$t('visa.v_tuanhao')}}</span> 
-                            <el-tooltip class="item" effect="dark" :content="item.OrderId" placement="top-start" popper-class="max-w250">
+                            <el-tooltip class="item" effect="dark" :content="`${item.OrderId}`" placement="top-start" popper-class="max-w250">
                                 <i class="iconfont"> {{item.OrderId}}</i>
                             </el-tooltip> 
                         </p>

src/components/activity/CouponDetail.vue

+<style>
+
+</style>
+<template>
+  <div class="flexOne page-CouponDetail">
+    <div class="query-box">
+      <ul class="user_time_picker">
+        <li>
+          <span>
+            <em>状态</em>
+            <el-select filterable v-model="msg.useState">
+              <el-option label="未使用" value="1"></el-option>
+              <el-option label="已使用" value="2"></el-option>
+              <el-option label="已作废" value="3"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input
+            type="button"
+            class="hollowFixedBtn"
+            value="查询"
+            @click="resetPageIndex(),getList()"
+          >
+        </li>
+      </ul>
+    </div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
+      <tr>
+        <th>获得途径</th>
+        <th>获得渠道</th>
+        
+        <th>使用状态</th>
+        <th>订单号</th>
+        <th>订单类型</th>
+        <th>使用日期</th>
+        <th>类型</th>
+        <th>用户</th>
+        <th>获得日期</th>
+        <!-- <th>操作</th> -->
+      </tr>
+      <tr v-for="(item,index) in DataList" v-loading="loading">
+        <td>
+          <span v-if="item.accessType == 1">抽奖</span>
+        </td>
+        <td>{{item.acessName}}</td>
+        <td>
+          <span v-if="item.useState == 1" style="color: green">未使用</span>
+          <span v-if="item.useState == 2" style="color: gary">已使用</span>
+          <span v-if="item.useState == 3" style="color: red">已作废</span>
+        </td>
+        <td>
+          <span v-if="item.orderId === 0">暂无</span>
+          <span v-else>{{item.orderId}}</span>
+        </td>
+        <td>
+          <span v-if="item.orderType === 0">暂无</span>
+          <span v-else>
+            <span v-if="item.orderType == 1">团队</span>
+            <span v-if="item.orderType == 2">签证</span>
+            <span v-if="item.orderType == 3">机票</span>
+          </span>
+        </td>
+        <td>{{item.useDate ? item.useDate : '未使用'}}</td>
+        <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
+        <td>{{item.userPlatform}}：{{item.userName}}</td>
+        <td>{{item.acessDate}}</td>
+        <!-- <td>
+          <el-tooltip class="item" effect="dark" content="修改用户信息" placement="top">
+            <el-button
+              type="primary"
+              icon="el-icon-edit"
+              circle
+              @click="outerVisible=true,dialogTitle='修改用户信息',updateData(item),getCompany()"
+            ></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除优惠券" placement="top">
+                <el-button
+                v-if="item.couponStatus !== 3"
+                type="danger"
+                icon="iconfont icon-img_delete_small"
+                circle
+                @click="deleteItem(item)"
+                ></el-button>
+            </el-tooltip>
+        </td> -->
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="DataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>没有找到你需要的数据</p>
+    </div>
+    <el-pagination
+      background
+      @current-change="handleCurrentChange"
+      v-if="DataList.length>0"
+      :current-page.sync="currentPage"
+      layout="total,prev, pager, next, jumper"
+      :page-size="msg.pageSize"
+      :total="total"
+    ></el-pagination>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+      DataList: [],
+      msg: {
+        pageIndex: 1,
+        pageSize: 15,
+        couponId: '',
+        useState: '',
+      },
+      currentPage: 1,
+      total: 0,
+    };
+  },
+  created(){
+    this.msg.couponId = this.$route.query.couponId
+    this.msg.useState = this.$route.query.useState
+  },
+  mounted() {
+    let userInfo = this.getLocalStorage();
+    this.getList();
+  },
+  methods: {
+    getList() {
+      //获取数据
+      this.loading = true
+      this.apiJavaPost("/api/sell/coupon/getCouponAllotList", this.msg, res => {
+        console.log(res);
+        if (res.data.resultCode === 1) {
+          // this.currentPage = res.data.data.pageCount
+          this.total = res.data.data.count
+          this.DataList = res.data.data.pageData
+        } else {
+          this.$message.error(res.data.message)
+        }
+        this.loading = false
+      }, null);
+    },
+    handleCurrentChange(val) {
+      this.msg.pageIndex = val;
+      this.getList();
+    },
+    resetPageIndex() {
+      this.msg.pageIndex = 1;
+      this.currentPage = 1;
+    },
+  }
+};
+</script>
\ No newline at end of file

src/components/activity/LuckyDraw.vue

@@ -165,7 +165,14 @@
                 @click="goUrl(item)"
                 ></el-button>
             </el-tooltip>
-
+            <el-tooltip class="item" effect="dark" content="删除活动" placement="top">
+                <el-button
+                type="danger"
+                icon="iconfont icon-img_delete_small"
+                circle
+                @click="deleteItem(item)"
+                ></el-button>
+            </el-tooltip>
           </td>
       </tr>
     </table>
@@ -480,6 +487,28 @@ export default {
       this.addMsg.lotteryRules = item.lotteryRules,
       this.addMsg.image = item.image
     },
+    // 删除抽奖
+    deleteItem: function (item) {
+      this.$confirm('确定删除“'+ item.lotteryName +'”活动？删除后不可恢复！', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+      }).then(() => {
+          this.apiJavaPost("/api/sell/lottery/updateLotteryStatus", {lotteryId: item.id, status: 3,}, res => {
+            if (res.data.resultCode === 1) {
+              this.Success(res.data.message);
+              this.getList(); 
+            } else {
+              this.Error(res.data.message)
+            }
+          }, null);
+      }).catch(() => {
+          this.$message({
+              type: 'info',
+              message: '已取消'
+          });
+      });
+    },
     //跳转至获取抽奖奖项信息列表
     goUrl(item){
       this.$router.push({

src/components/index.vue

@@ -104,7 +104,7 @@
                       <i class="iconfont icon-menu-shezhi"></i>
                       设置
                     </el-dropdown-item> -->
-                    <el-dropdown-item class="clearfix _dropdown_other" @click.native="exit">
+                    <el-dropdown-item class="clearfix _dropdown_other" @click. ="exit">
                       <i class="iconfont icon-menu-tuichu"></i>
                       退出
                     </el-dropdown-item>
@@ -118,7 +118,18 @@
 							<!--<i class="iconfont icon-imessage_top"  @click="togglebox($event)"></i>-->
 						</li>
 			    		<li><i class="iconfont icon-help_top"></i></li>
-			    		<li><i class="iconfont icon-language_top"></i></li>
+			    		<li>
+                <el-dropdown trigger="click">
+                  <span class="el-dropdown-link">
+                    <i v-if="language=='zh-CN'" class="iconfont icon-language_top"></i>
+                    <i v-if="language=='Japanese'" class="iconfont icon-icon-riyu"></i>
+                  </span>
+                  <el-dropdown-menu  class="changelanguage" slot="dropdown">
+                    <el-dropdown-item @click.native="ChangeLan('Japanese')">日语 <i v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
+                    <el-dropdown-item @click.native="ChangeLan('zh-CN')">简体中文 <i v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </li>
 			    	</ul>
 			    </div>
 			</div>
@@ -774,6 +785,7 @@ export default {
   },
   data() {
     return {
+      language:'zh-CN',
       douTimer:null,
       defaultHeadImg:
         'this.src="' + require("../assets/img/default_head_img.jpg") + '"',
@@ -1313,6 +1325,10 @@ export default {
     }
   },
   methods: {
+    ChangeLan(str){
+      this.language=str;
+      this.$i18n.locale = str;
+    },
     settingSys: function () {
       this.MsgBus.$emit('settingOpen')
     },
@@ -3170,6 +3186,26 @@ export default {
 @import "../assets/css/main.less";
 @import "../assets/css/cssReset.css";
 @import "../assets/css/message.css";
+.changelanguage{
+  width:124px;
+}
+.changelanguage .el-dropdown-menu__item .icon-duigou{
+  color:#000000;
+  position: absolute;
+  right: 10px;
+  font-size: 14px;
+}
+.changelanguage .el-dropdown-menu__item{
+  padding:0;
+  padding-left:15px;
+  font-size: 14px;
+  position: relative;
+  color:#333333;
+}
+.changelanguage .el-dropdown-menu__item:hover{
+  background: #D9D9D9;
+  color:#333333;
+}
 ._dropdown.el-dropdown-menu {
   padding: 0;
   background-color: #1f2533 !important;

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -1021,7 +1021,8 @@
         let msg = {
           QFlightDateStart: this.QFlightDateStart,
           QFlightDateEnd: this.QFlightDateEnd,
-          CreateBy: createBy
+          CreateBy: createBy,
+          AirTicketId:this.priceData.AirTicketId
         };
 
         let that = this;

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -1103,7 +1103,8 @@
         return;
         let msg = {
           QFlightDateStart: date,
-          CreateBy: this.PostConfig.CreateBy?this.PostConfig.CreateBy:this.userID
+          CreateBy: this.PostConfig.CreateBy?this.PostConfig.CreateBy:this.userID,
+          AirTicketId:this.priceData.AirTicketId
         };
         let that = this;
         this.apipost(

src/main.js

@@ -142,7 +142,8 @@ const i18n = new VueI18n({
   messages: {
     'zh-CN': require('./assets/common/lang/zh'),   // 中文语言包
     'en-US': require('./assets/common/lang/en'),    // 英文语言包
-    'zh-TW': require('./assets/common/lang/zh-tw')    // 台湾语言包
+    'zh-TW': require('./assets/common/lang/zh-tw'),    // 台湾语言包
+    'Japanese' : require('./assets/common/lang/jp')    // 日本语言包
   }
 })
 

src/router/config.js

@@ -2403,6 +2403,14 @@ export default {
               meta: {
                 title: '年度营收报表'
               },
+            },
+            { //财务 报表 团队营收统计
+              path: '/MonthReport',
+              name: 'MonthReport',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/MonthReport'], resolve),
+              meta: {
+                title: '团队营收统计'
+              },
             }, {
               path: '/JumpReport',
               name: 'JumpReport',
@@ -2801,6 +2809,14 @@ export default {
                 title: '优惠券列表'
               }
             },
+            {
+              path: '/CouponDetail',
+              name: 'CouponDetail',
+              component: resolve => require(['@/components/activity/CouponDetail'], resolve),
+              meta: {
+                title: '优惠券发放列表'
+              }
+            },
             {
               path: '/LuckyDraw',
               name: 'LuckyDraw',