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

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

@@ -116,8 +116,8 @@
           </table>
         </li>
         <li>
-          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
-          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none" />
+          <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" style="display:none;"/>
+          <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()"/>
         </li>
       </ul>
     </div>
@@ -227,7 +227,7 @@
         </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>
@@ -313,6 +313,20 @@
           }
         }, err => {});
       },
+      //是否确定
+      getIsSure(){
+        this.$confirm("是否确认航班信息?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+            this.getCheckInfo();
+        })
+        .catch(() => {
+          this.$message.info("已取消！");
+        });
+      },
       //确定
       getCheckInfo() {
         let FlightList = []

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/TravelManager/TravelList/RegistrationList.vue

@@ -1448,6 +1448,7 @@
       <div class="RL_rightBtn" v-if="isShow===true">
        <!--item.TCID,item.OutBranchId-->
         <input type="button" class="normalBtn" @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)"  value="团报" />
+        <input type="button" class="normalBtn" @click="getOrderInfo()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'"  style="display:none;"/>
         <input type="button" class="normalBtn" @click="SetOutNotice()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
         <input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0" class="normalBtn"
           value="重选领队" />
@@ -2225,6 +2226,74 @@
           <button class="hollowFixedBtn" @click="initTCMsg">{{$t('pub.cancelBtn')}}</button>
         </div>
       </el-dialog>
+
+
+      <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
+        <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
+          <tr>
+            <td colspan="6" 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>
+          </tr>
+          <tr v-for="item in flightList">
+            <td>{{item.Flight_number}}</td>
+            <td>{{item.TicketDepartureTime}}</td>
+            <td>{{item.TicketArrivalTime}}</td>
+            <td>{{item.FlightDate}}</td>
+            <td>{{item.dName}}</td>
+            <td>{{item.aName}}</td>
+          </tr>
+        </table>
+        <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;" v-if="combineTeamList.length>0">
+          <tr>
+            <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>
+          </tr>
+          <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>{{subItem.GoDepartTime}}</td>
+              <td>{{subItem.GoArriveTime}}</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>{{subItem.BackDepartTime}}</td>
+              <td>{{subItem.BackArriveTime}}</td>
+              <td>{{subItem.BackDepartAirportName}}</td>
+              <td>{{subItem.BackArrivalAirportName}}</td>
+            </tr>
+          </tbody>
+        </table>
+        <div slot="footer" class="dialog-footer">
+          <input type="button" class="normalBtn" @click="SetOutNotice()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
+          <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
+        </div>
+      </el-dialog>
+
   </div>
 </template>
 
@@ -2238,6 +2307,8 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
       Ysze:false,
       addMsg_form:{},
       IsUpdateOrderMoney:false,
+      outerVisible:false,
+      //弹窗
 
         OrderLoading:false,
         OrderLossMsg:{
@@ -2600,8 +2671,9 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
         subInfo:{
           CreateBy:'',
           OrderId:0
-        }
-
+        },
+        flightList:[],
+        combineTeamList:[],
       };
     },  
     components: {
@@ -3838,7 +3910,6 @@ submitYSZEForm(){
           },
           err => {}
         );
-
       },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
@@ -3873,10 +3944,38 @@ submitYSZEForm(){
               this.ConfigData.Config = res.data.data.config;
               this.SetNoticeMsg.OutNotice = res.data.data.config.OutNotice;
               this.ConfigData.Leader = res.data.data.leader;
+              console.log(this.ConfigData,'ConfigData');
             }
           }
         );
       },
+      //获取
+      getFlightInfo() {
+        let msg = {
+          ID: this.ConfigData.Config.AirTicketId
+        }
+        this.apipost("ticket_get_GetEntityExtend", msg, res => {
+          if (res.data.resultCode == 1) {
+            this.flightList = res.data.data.flightList;
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {});
+        this.outerVisible = true;
+      },
+      //获取联运团信息
+      getCombinTeam() {
+        let msg = {
+          AirTicketId: this.ConfigData.Config.AirTicketId
+        }
+        this.apipost("ticket_get_GetUnionFlightAllInfo", msg, res => {
+          if (res.data.resultCode == 1) {
+            this.combineTeamList = res.data.data;
+          } else {
+            this.Error(res.data.message);
+          }
+        }, err => {});
+      },
       //获取国家
       getCountry() {
         this.apipost(
@@ -4105,45 +4204,45 @@ submitYSZEForm(){
         }
       },
       //出团通知书
-      SetOutNotice() {
-        if (this.SetNoticeMsg.OutNotice == 0) {
-          this.SetNoticeMsg.OutNotice = 1;
-        } else if (this.SetNoticeMsg.OutNotice == 1) {
-          this.SetNoticeMsg.OutNotice = 0;
-        }
-        this.apipost('travel_post_SetOutNotice', this.SetNoticeMsg, res => {
-          if (res.data.resultCode === 1) {
-            this.getList();
-            this.getConfig();
-            this.Success(res.data.message);
-          } else {
-            this.Error(res.data.message);
-          }
-        }, err => {})
-      },
-      //新窗口打开
-      goScheduleUrl(id) {
-        let routeData = this.$router.resolve({
-          name: "leaderScheduleManager",
-          query: {
-            TCID: id,
-            blank: 'y'
-          }
+      getOrderInfo() {
+        this.$confirm("是否确认出团通知书?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+        .then(() => {
+            this.getFlightInfo();
+            this.getCombinTeam();
+        })
+        .catch(() => {
+          this.$message.info("已取消！");
         });
-        window.open(routeData.href, "_blank");
       },
-      //点击修改业务员
-      getSalerInfo(item){
-        this.subInfo.CreateBy = item.CreateBy;
-        this.subInfo.OrderId = item.OrderId;
-        this.showChangeSales = true;
+      SetOutNotice(){
+          if (this.SetNoticeMsg.OutNotice == 0) {
+            this.SetNoticeMsg.OutNotice = 1;
+          } else if (this.SetNoticeMsg.OutNotice == 1) {
+            this.SetNoticeMsg.OutNotice = 0;
+          }
+          this.apipost('travel_post_SetOutNotice', this.SetNoticeMsg, res => {
+              if (res.data.resultCode === 1) {
+                  this.getList();
+                  this.getConfig();
+                  this.Success(res.data.message);
+                  this.outerVisible=false;
+                } else {
+                  this.Error(res.data.message);
+                }
+              }, err => {
+
+              })
       },
       //关闭修改业务员
       closeSalseDiv(){
         this.showChangeSales=false;
       },
       //跳转到团报
-        goTeamBalance(id, OutBranchId) {
+      goTeamBalance(id, OutBranchId) {
         this.$router.push({
           name: "TeamBalancePayment",
           query: {

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/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',