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

src/assets/common/lang/zh.js

@@ -1742,7 +1742,8 @@ export const visaT = {
   sfshanchubd:'是否删除绑定?',
   qxzzzdqzlx:'请选择正确的签证类型！',
   qxzxybddry:"请选择需要绑定的人员",
-  v_Othervisas:'其他'
+  v_Othervisas: '其他',
+  dxzhanghu: '对象账户'
 }
 import invoicesManager from './H/h-invoicesManager'
 export const ios = invoicesManager
\ No newline at end of file

src/components/Complaints/ComplaintsDetail.vue

@@ -593,7 +593,7 @@
       },
       //设置财务单据
       setFinance (compensation) {
-        let id = [11];
+        let id = [11, 16];
         //TODO跳转到财务单据
         if (compensation.FinanceID === 0) {
           var TCArr = [this.PriceInfo.TCID]

src/components/FinancialModule/FinancialDocuments.vue

@@ -821,7 +821,6 @@ export default {
         let userInfo=this.getLocalStorage();
         let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
         this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
-        this.userMenuCode = true;
         this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id;    //集团ID
         this.ActionMenuCode=userInfo.ActionMenuCode;
         this.DepartIDs = userInfo.RB_Department_Id;

src/components/FinancialModule/FinancialDocumentsDetail.vue

@@ -366,7 +366,7 @@
                 <my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
                 <my-GZ-Bill v-else-if="GetDetail.Type===7" :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-GZ-Bill>
                 <div class="_explain">
-                    <p>附加说明：</p>
+                    <p>附加说明：  <span class="fr" v-if="GetDetail.ComplainID > 0" @click="goUrl('ComplaintsDetail', GetDetail.ComplainID)"> <span style="color:#000">投诉单号：</span>  <span class="cursorpointer text-decoration">{{GetDetail.ComplainID}}</span></span> </p>
                     <table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;margin-top:15px;" width="100%" v-if="GetDetail.TCIDAndTCNUMList.length>0">
                         <tr v-for="(o,ox) in GetDetail.TCIDAndTCNUMList" class="_fujiashuoming_tr">
                             <td :colspan="4" v-if="GetDetail.Is_Merge===1">单据号：{{o.FinanceId}}</td>

src/components/FinancialModule/FinancialSubmodule/BillModule.vue

@@ -109,8 +109,8 @@
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}} （{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber}}</span>
                 </p>
-                <p v-if="GetDetail.Type==2 || GetDetail.Type==6" style="max-width: 500px">
-                    <span>{{$t('fnc.fkzhanghu')}}：</span>
+                <p v-if="(GetDetail.Type==2 || GetDetail.Type==6) && GetDetail.IsPublic !== 3" style="max-width: 500px">
+                    <span>{{$t('visaT.dxzhanghu')}}：</span>
                     <span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>
                     <span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:$t('fnc.no')}}</span>
                 </p>

src/components/FinancialModule/JumpReport.vue

@@ -722,6 +722,7 @@ export default {
                 QEndDate:'',
                 QStartDate:'',
                 UpdateBy:'',
+                IsFormEasyReport:1,
               Sort:'2',
               EmployeeId:'',
             },
@@ -867,6 +868,7 @@ export default {
         this.DepartIDs = userInfo.RB_Department_Id;
         this.userId = userInfo.EmployeeId;
         this.msg.EmployeeId= userInfo.EmployeeId;
+        this.msg.IsFormEasyReport=1;
         this.financeinfo_post_GetList();
         this.financeinfo_post_GetCostTypeList();
         this.FinancialFlowTemplate_post_GetList();
@@ -951,6 +953,7 @@ export default {
                 })
                 console.log(this.msg.CostTypeIDs)
             }
+            this.msg.IsFormEasyReport=1;
             this.loading= true;
             this.apipost('Financial_post_GetALLPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -104,6 +104,14 @@
                                 </el-date-picker>
                             </el-form-item>
                     </el-col>
+                    <el-col :span="4" :gutter="35">
+                        <el-form-item label="费用类型">
+                            <el-select  filterable  v-model='msg.CostTypeID' >
+                              <el-option :value="0" label="不限"></el-option>
+                              <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
 			<ul>
@@ -330,6 +338,7 @@ export default {
                 pageIndex:1,
                 pageSize:5,
                 ClientID:'',
+                CostTypeID:0,
                 sTradeDate:'',
                 eTradeDate:'',
                 QStartDate:'',
@@ -348,6 +357,7 @@ export default {
             productionDate:[],
             productionDateByTC:[],
             ClientAccountList:[],
+            GetCostTypeList:[],
             loading:false,
             date:'',
             accType:'',
@@ -829,12 +839,22 @@ export default {
       //   this.listAllMoney = this.listAllMoney + x.allMoney
       // })
     },
+    financeinfo_post_GetCostTypeList(){  // 费用类型
+            this.apipost('financeinfo_post_GetCostTypeList',{Name:'',type:0,DepartIDs:this.DepartIDs},res=>{
+                if(res.data.resultCode==1){
+                    this.GetCostTypeList = res.data.data;
+                }else{
+
+                }
+            },err=>{})
+    },
     },mounted(){
         let userInfo=this.getLocalStorage();
         this.getAccountTypeList();
         this.AccountType_post_GetList();
         this.BankAccount_post_GetAccountType();
         this.financeinfo_post_GetClientAccountList();
+        this.financeinfo_post_GetCostTypeList();
     }
 }
 </script>
\ No newline at end of file

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -803,9 +803,9 @@ export default {
                     if(wechat==null&&zhifu==null&&barcode==""){
                           return;  
                     }
-                    if(zhifu==null&&wechat!=null&&wechat.length>20){
+                    if(zhifu==null&&wechat!=null&&wechat.length>0&&wechat[wechat.length-1].length>20){
                         this.setCode = wechat[wechat.length-1].replace('商户单号','');
-                    }else if(wechat==null&&zhifu!=null&&zhifu.length>20){
+                    }else if(wechat==null&&zhifu!=null&&zhifu.length>0&&zhifu[zhifu.length-1].length>20){
                         this.setCode = zhifu[zhifu.length-1].replace('商家可扫码退款或查询交易','');
                     }else if(barcode!=""){
                         this.setCode=barcode;

src/components/Hotel/roomReservationsDetails.vue

@@ -471,7 +471,14 @@
               {
                  y.UnitPrice=0;
               }
-              y.HotelDiscount = parseInt(y.HotelDiscount);
+              if(y.HotelDiscount)
+              {
+                y.HotelDiscount = parseInt(y.HotelDiscount);
+              }else
+              {
+                y.HotelDiscount =0;
+              }
+             
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
@@ -497,7 +504,13 @@
             subItem.OrderDetailsList.forEach(y => {
               y.HouseTypeCount = parseFloat(y.HouseTypeCount);
               y.UnitPrice = parseInt(y.UnitPrice);
-              y.HotelDiscount = parseInt(y.HotelDiscount);
+             if(y.HotelDiscount)
+              {
+                y.HotelDiscount = parseInt(y.HotelDiscount);
+              }else
+              {
+                y.HotelDiscount =0;
+              }
               if (y.BookNum == "") {
                 y.BookNum = 0;
               }
@@ -540,9 +553,8 @@
       this.TCNUM = this.$route.query.TCNUM;
       this.flightTotal = this.$route.query.flightTotal;
       this.GuestNum = this.$route.query.GuestNum;
-      let width = window.innerWidth - 50
-      let height = window.innerHeight - 65 -55
-      console.log(height)
+      let width = window.innerWidth - 50;
+      let height = window.innerHeight - 65 -55;
       this.boxHeight = height;
       this.offsetwidth = width
       this.getList();

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -808,48 +808,11 @@
 						   <el-input v-model='addMsg.OldPeopleNum'   @keyup.native="checkInteger(addMsg,'OldPeopleNum')"  @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
 						</el-form-item>
 					</el-col>
-					<!-- <el-col :span="4">
-						<el-form-item label="单地接数量" prop="AirticketNum">
-						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
-						</el-form-item>
-					</el-col> -->
+
 				</el-row>
-				<!-- <el-row :gutter="20">
-					<el-col :span="4">
-						<el-form-item label="单房数量" prop="SingleRoomNum">
-						   <el-input v-model='addMsg.SingleRoomNum'   @keyup.native="checkInteger(addMsg,'SingleRoomNum')"   @input='yzBigBed2();getTotalPrice()'></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item label="大床房" prop="BigRoomNum">
-						   <el-input v-model='addMsg.BigRoomNum'   @keyup.native="checkInteger(addMsg,'BigRoomNum')"   @input='yzBigBed();getTotalPrice()'></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item label="三人房" prop="TripleRoomNum">
-						   <el-input v-model='addMsg.TripleRoomNum'  @keyup.native="checkInteger(addMsg,'TripleRoomNum')"    @input='yzBigBed1();getTotalPrice()'></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item label="签证数量" prop="VisaNum">
-						   <el-input v-model='addMsg.VisaNum'  @keyup.native="checkInteger(addMsg,'VisaNum')"    @input='yzVisaNum();getTotalPrice()'></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						<el-form-item label="保险数量" prop="SaleNum">
-						   <el-input v-model='addMsg.SafeNum'  @keyup.native="checkInteger(addMsg,'SafeNum')"    @input='yzSafeNum();getTotalPrice()'></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="4">
-						&nbsp;
-					</el-col>
-				</el-row> -->
+
 				<el-row :gutter="20">
-						<!-- <el-col :span="4">
-							<el-form-item label="预计用房" prop="PredictRoomNum">
-							   <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
-							</el-form-item>
-						</el-col> -->
+
 						<el-col :span="4">
 							<el-form-item label="应收总额" prop="PreferPrice">
 							   <el-input v-model='addMsg.PreferPrice'  :disabled="!IsUpdateOrderMoney"></el-input>
@@ -1189,7 +1152,10 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
-						&nbsp;
+						  <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
+              <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
+                @input='getTotalPrice()'></el-input>
+            </el-form-item>
 					</el-col>
 				</el-row>
 				<el-row :gutter="20">
@@ -2358,6 +2324,7 @@ export default {
         Remarks: "",
         VisaNum: "0",
         SafeNum: "0",
+        RefuseVisaNum:'0',
         AirticketNum: "0",
         ScenicRefundArr: [],
         GoCityTime: "",
@@ -3063,6 +3030,7 @@ submitYSZEForm(){
             this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
             this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
             this.addMsg.BabyNum = x.BabyNum.toString();
+            this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
 
             // this.addMsg_form.OrderId=x.OrderId;
             // this.addMsg_form.OpSetLossMoney=x.OpSetLossMoney;//收损金额
@@ -3714,6 +3682,7 @@ submitYSZEForm(){
       this.addMsg.MinOrderPrice = "";
       this.addMsg.VisaNum = "0";
       this.addMsg.SafeNum = "0";
+      this.addMsg.RefuseVisaNum='0';
       this.addMsg.AirticketNum = "0";
       this.addMsg.ScenicRefundArr = [];
       this.ScenicRefundMoney = 0;

src/components/SalesModule/productQuery.vue

@@ -144,6 +144,17 @@
 	.PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;}
 	.PQ_detail tr{background: #fff;text-align: center; height: 40px;}
 	.PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;}
+  .TC_HotelPop >div{
+    overflow: auto;
+    max-height:350px;
+  }
+  .TC_HotelPop table td{
+    padding:5px 0;
+    text-align: center;
+  }
+  .TC_HotelPop table th{
+    text-align: center;
+  }
 </style>
 <template>
   <div class="flexOne">
@@ -159,7 +170,7 @@
         <el-row :gutter="20">
           <el-col :span="4">
             <el-form-item label="客户类型" prop="CustomerType">
-              <el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice();getDdlyList();getKhmdList();getTotalPrice()'>
+              <el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice(),resetSelect();getDdlyList();getKhmdList();getTotalPrice()'>
                 <el-option v-for="item in khlxList" :label='item.Name' :value='item.Id' :key='item.Id'>
                 </el-option>
               </el-select>
@@ -771,6 +782,51 @@
                   <span slot="reference" class="price">查看价格明细</span>
                 </el-popover>
               </p>
+
+
+              <!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
+                  <el-popover width="600" trigger="click" popper-class="TC_HotelPop">
+                    <div>
+                      <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
+                        <tr>
+                          <th width="100">日期</th>
+                          <th style="border-right:1px solid #E5E5E5">酒店情况</th>
+                          <th width="100" style="border-right:1px solid #E5E5E5">占房时间</th>
+                        </tr>
+                        <tr v-for="subItem in item.HotelOrderListReports">
+                          <td width="100">
+                            {{subItem.UseDay}}
+                          </td>
+                          <td style="text-align:left;padding:3px 10px;">
+                            <template v-if="subItem.SubList">
+                              <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
+                                {{subItem.SubList[0].HotelName}}
+                                <a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
+                                【<a
+                                  style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
+                                  {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
+                              <template v-else v-for="childItem in subItem.SubList">
+                                <div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
+                              </template>
+                            </template>
+                          </td>
+                          <td>
+                            <template v-if="subItem.SubList">
+                              <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
+                                  {{subItem.SubList[0].CreateDateStr}}
+                                </div>
+                              <template v-else v-for="childItem in subItem.SubList">
+                                <div></div>
+                              </template>
+                            </template> 
+                          </td>
+                        </tr>
+                      </table>
+                    </div>
+                    <span slot="reference" class="price">酒店信息</span>
+                  </el-popover>
+              </p> -->
+
             </div>
             <div class="d5">
               <p><i class="iconfont icon-tuanwei"></i>团位信息</p>
@@ -1497,21 +1553,24 @@
           }
         }, err => {})
       },
+      resetSelect(){
+        if (this.addMsg.CustomerType == 1) {
+          this.addMsg.CustomerId = ''
+        }
+        if (this.addMsg.CustomerType == 2) {
+          this.addMsg.CustomerId = ''
+        }
+      },
       getTypePrice() {
         this.addMsg.ContactName = ''
         this.addMsg.ContactMobile = ''
-        console.log('this.addMsg.CustomerType', this.addMsg.CustomerType)
         if (this.addMsg.CustomerType == 1) {
           this.addMsg.TC_Price = this.addObj.B2BMemberPrice
           this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
-          this.addMsg.CustomerId = ''
-
         }
         if (this.addMsg.CustomerType == 2) {
           this.addMsg.TC_Price = this.addObj.B2BPrice
           this.addMsg.Unit_Price = this.addObj.B2BPrice;
-          this.addMsg.CustomerId = ''
-
         }
         if (this.addMsg.CustomerType == 3) {
           this.addMsg.TC_Price = this.addObj.B2CMemberPrice
@@ -1990,9 +2049,9 @@
             for (let i = 0; i < res.data.data.pageData.length; i++) {
               res.data.data.pageData[i]['wxImage'] = ''
             }
-            this.list = res.data.data.pageData
+            this.list = res.data.data.pageData;
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
       },
@@ -2010,7 +2069,7 @@
           if (res.data.resultCode == 1) {
             this.tripDetails = res.data.data.FlightList
           } else {
-            this.$message.error(res.data.message)
+            this.Error(res.data.message)
           }
         }, err => {})
 

src/components/ShoppingStore/ShoppingReimbursement.vue

@@ -43,11 +43,6 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; ">
       <table border="0" cellspacing="1" cellpadding="0" class="ShoppingTable"
         style="border: 1px solid rgb(230, 230, 230);min-width: 1600px" v-loading="loading">
-        <!-- <tr>
-          <th colspan="2">公司通用信息</th>
-          <th colspan="6">导游操作</th>
-          <th colspan="9">地接OP</th>
-        </tr> -->
         <tr>
           <th width="115">序号</th>
           <th width="100">出发地</th>

src/components/Ticketing/flightPerformance.vue

+<style>
+  .fpTable th {
+    border-bottom: 1px solid #d1d1d1;
+    border-right: 1px solid #d1d1d1;
+  }
+
+</style>
+
+<template>
+  <div class="flexOne">
+    <div class="query-box">
+      <ul>
+        <li>
+          <span>
+            <em>操作人</em>
+            <el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="0"></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>月份</em>
+            <el-date-picker v-model='msg.QMonth' value-format="yyyy-MM" type="month"></el-date-picker>
+          </span>
+        </li>
+        <li>
+          <input type="button" class="hollowFixedBtn" @click="getList()" :value="$t('pub.searchBtn')" />
+          <input type="button" class="hollowFixedBtn" @click="DownLoad()" value="导出" />
+        </li>
+      </ul>
+    </div>
+    <table class="singeRowTable fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th>团期</th>
+        <th>出团公司</th>
+        <th>线路</th>
+        <th>人数</th>
+        <th>操作人员</th>
+      </tr>
+      <tr v-for="item in dataList">
+        <td> <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'>
+            ({{item.TCID}}){{item.TCNUM}} </a></td>
+        <td>{{item.OutBranchName}}</td>
+        <td>{{item.LineName}}</td>
+        <td>{{item.TicketNum}}</td>
+        <td>{{item.CreateByName}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        msg: {
+          LineId: 0, //线路编号
+          OutBranchId: -1, //出团公司
+          AirLineID: 0, //航空公司编号
+          CreateBy: 0, //操作人
+          QMonth: '', //月份
+        },
+        loading: false,
+        dataList: [],
+        //航空公司下拉
+        airlineList: [],
+        //操作人下拉
+        EmployeeList: [],
+      }
+    },
+    mounted() {
+      let date = new Date(),
+        y = date.getFullYear(),
+        m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+      this.msg.QMonth = y + '-' + m;
+      this.initAirlines();
+      this.getEmployeeList();
+      this.getList()
+    },
+    methods: {
+      //页面跳转
+      goUrlT(path, obj, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            "id": obj,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
+      //获取列表数据
+      getList() {
+        this.loading = true;
+        this.apipost("AirTicket_get_GetTicketPerformance", this.msg, res => {
+          this.loading = false;
+          if (res.data.resultCode == 1) {
+            this.dataList = res.data.data;
+          }
+        });
+      },
+      //初始化航空公司下拉
+      initAirlines() {
+        this.apipost(
+          "airline_post_GetList", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.airlineList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
+      //根据当前员工所在部门获取该部门及子部门员工信息
+      getEmployeeList() {
+        this.apipost(
+          "admin_get_GetEmployeeByUserDepartmentId", {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.EmployeeList = res.data.data;
+            }
+          },
+          err => {}
+        );
+      },
+      //下载业绩数据
+      DownLoad() {
+        this.loading = true;
+        var fileName = "机票业绩下载" + this.msg.QMonth + ".xls";
+        this.GetLocalFile("AirTicket_get_DownLoadGetTicketPerformance", this.msg, fileName,
+          res => {
+            this.loading = false;
+          });
+      }
+    }
+  }
+
+</script>

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1280,6 +1280,12 @@
               <el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
                 @input='getTotalPrice()'></el-input>
             </el-form-item>
+          </el-col>
+           <el-col :span="4">
+            <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
+              <el-input v-model='addMsg.RefuseVisaNum' @keyup.native="checkInteger(addMsg,'RefuseVisaNum')"
+                @input='getTotalPrice()'></el-input>
+            </el-form-item>
           </el-col>
           <el-col :span="4">
             &nbsp;
@@ -2761,6 +2767,7 @@
           CommissionShareMoney: "0",
           //订单归属【HK新加，报名清单页面修改使用】
           CreateBy: 0,
+          RefuseVisaNum:0,//拒签人数
         },
         //行程下载使用
         travelControlTripLayerShow: false,
@@ -3100,6 +3107,7 @@
               this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
               this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
               this.addMsg.BabyNum = x.BabyNum.toString();
+              this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
               this.OpSetLossPeople = x.OpSetLossPeople;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -81,17 +81,21 @@
   .TC_Content .avatar-uploader-icon {
     height: auto;
   }
-  .TC_HotelPop >div{
+
+  .TC_HotelPop>div {
     overflow: auto;
-    max-height:350px;
+    max-height: 350px;
   }
-  .TC_HotelPop table td{
-    padding:5px 0;
+
+  .TC_HotelPop table td {
+    padding: 5px 0;
     text-align: center;
   }
-  .TC_HotelPop table th{
+
+  .TC_HotelPop table th {
     text-align: center;
   }
+
 </style>
 <template>
   <div class="TC_Content">
@@ -144,11 +148,11 @@
                 @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
             </span>
           </li>
-          <li style="display:none;">
+          <li>
             <span>
               <em>{{$t('hotel.hotel_SerialNumber')}}</em>
               <el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150"
-                @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
+                :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
             </span>
           </li>
           <li>
@@ -552,11 +556,11 @@
                   <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
                     <el-popover width="600" trigger="click" popper-class="TC_HotelPop">
                       <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
-                          <tr>
-                            <th width="100">日期</th>
-                            <th style="border-right:1px solid #E5E5E5">酒店情况</th>
-                            <th style="border-right:1px solid #E5E5E5">占房时间</th>
-                          </tr>
+                        <tr>
+                          <th width="100">日期</th>
+                          <th style="border-right:1px solid #E5E5E5">酒店情况</th>
+                          <th style="border-right:1px solid #E5E5E5">占房时间</th>
+                        </tr>
                       </table>
                       <div>
                         <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
@@ -569,8 +573,7 @@
                                 <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
                                   {{subItem.SubList[0].HotelName}}
                                   <a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
-                                  【<a
-                                    style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
+                                  【<a style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
                                     {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
                                 <template v-else v-for="childItem in subItem.SubList">
                                   <div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
@@ -580,12 +583,12 @@
                             <td>
                               <template v-if="subItem.SubList">
                                 <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
-                                   {{subItem.SubList[0].CreateDateStr}}
-                                 </div>
+                                  {{subItem.SubList[0].CreateDateStr}}
+                                </div>
                                 <template v-else v-for="childItem in subItem.SubList">
                                   <div></div>
                                 </template>
-                              </template> 
+                              </template>
                             </td>
                           </tr>
                         </table>
@@ -627,8 +630,13 @@
                   </p>
                   <p>
                     <span>{{$t('leader.leader_Leader')}}</span>
-                    <span v-if="item.LeaderName==null" class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
-                    <span v-else class="TCL-greenType">{{item.LeaderName}}</span>
+                    <span v-if="item.LeaderName" class="TCL-greenType">{{item.LeaderName}}</span>
+                    <span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
+                  </p>
+                  <p>
+                    <span>导游</span>
+                    <span v-if="item.GuideName" class="TCL-greenType">{{item.GuideName}}</span>
+                    <span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
                   </p>
                 </div>
               </div>
@@ -647,9 +655,27 @@
                   <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
                   <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
                   <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
-                  <div class="TC_SeatList">{{$t('Operation.Op_bindNum')}}：<span
-                      style="color:red">{{item.BindNum}}</span></div>
-                  <div class="TC_SeatList">机票数量：<span style="color:red">{{item.TicketNum}}</span></div>
+                  <div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList">
+                    <el-popover width="340" trigger="click" popper-class="TC_customerInfo">
+                      <table width="340" border="0" cellspacing="0" cellpadding="0">
+                        <tr>
+                          <th width="70">绑定数量</th>
+                          <th width="70">机票数量</th>
+                          <th width="70">价格</th>
+                          <th width="130">PNR</th>
+                        </tr>
+                        <tr v-for="subItem in item.TicketList">
+                          <td>{{subItem.BindNum}}</td>
+                          <td>{{subItem.TicketNum}}</td>
+                          <td>{{subItem.TicketPrice}}</td>
+                          <td>{{subItem.PNR}}</td>
+                        </tr>
+                      </table>
+                      <span slot="reference" title="点击查看详情" class="price"
+                        style="cursor:pointer;color:red;text-decoration: underline;">总机位数: {{item.TicketNum}}</span>
+                    </el-popover>
+                  </div>
+                  <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div>
                 </div>
               </div>
               <div class="el-col" style="width:200px;">
@@ -701,7 +727,7 @@
                     {{item.GroupVisaNum}}
                   </p>
                   <p>
-                    <span>出票状态：</span> 
+                    <span>出票状态：</span>
                     <span class="fz16 fbold">
                       <el-tooltip class="item" effect="dark" content="全部出票" placement="top">
                         <span style="color: #4BCA81;" v-if="item.MakeInvoice==1">√</span>
@@ -1000,7 +1026,7 @@
           RateOn: '-1',
           TeamType: 0, //一般常规团
           IsShowUnion: -1,
-          TCID: '0',
+          TCID: '',
           HotelId: 0, //酒店编号
           HotelUseTime: "", //酒店使用时间
         },
@@ -1176,12 +1202,18 @@
         if (msg.DayNum == '') {
           msg.DayNum = -1
         }
-        this.queryCommonData.loading = true
+        if (msg.TCID == "") {
+          msg.TCID = 0;
+        }
+        this.queryCommonData.loading = true;
         this.apipost(
           'travel_get_GetTravelPrciePageList',
           msg,
           res => {
-            this.queryCommonData.loading = false
+            this.queryCommonData.loading = false;
+            if (this.queryMsg.TCID == "0") {
+              this.queryMsg.TCID = "";
+            }
             if (res.data.resultCode == 1) {
               this.queryCommonData.dataList = res.data.data.pageData;
               this.queryMsg.total = res.data.data.count

src/components/administrative/Announcement.vue

@@ -89,7 +89,12 @@
 		<el-dialog custom-class='w800' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
 			            <div v-if='layerType==1'>
 			            	<p style="text-align: right; padding: 5px 0;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
-			            	<pre style="letter-spacing: 1px; font-size: 14px; color: #333;">{{detailMessage.Content}}</pre>
+										<div v-html="detailMessage.Content">
+
+										</div>
+			            	<!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;">
+											{{detailMessage.Content}}
+										</pre> -->
 			            	<p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
 			            	<p style="height: 28px; padding: 0 10px; line-height: 28px;" v-for="item in downLoadList" class="AnnFileListPMeta">
 			            		<i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>
@@ -107,9 +112,11 @@
 								</tr>
 								<tr>
 								<td>
-									<el-form-item  :label="$t('adm.adm_content')" prop="Content">
+									<quill-editor  :options="editorOption"  v-model="addMsg.Content"></quill-editor>
+									<!-- <el-form-item  :label="$t('adm.adm_content')" prop="Content">
+										
 						                 <el-input class='w600 ann_textarea' type="textarea" v-model="addMsg.Content" :placeholder="$t('pub.pleaseImport')"></el-input>
-						                </el-form-item>	
+						                </el-form-item>	 -->
 									</td>
 								</tr>
 								<tr>
@@ -156,6 +163,19 @@
 	export default {
 		data() {
 			return {
+				editorOption: {
+					modules:{
+						toolbar:[
+							['bold', 'italic', 'underline', 'strike', 'image'],        // toggled buttons
+							[{ 'header': [1, 2, 3, 4, 5, 6, false] }],
+							[{ 'color': [] }, {'background': [] }],
+							[{ 'font': [] }],
+							[{ 'align': [] }],
+							[{ 'size': ['small', false, 'large', 'huge'] }],
+							[{ 'list': 'ordered'}, { 'list': 'bullet' }]
+						]
+					}
+				},
 				uploadList:[],
 				layerType:'',
 				loading:true,

src/components/busManagement/busHandBook.vue

@@ -20,6 +20,12 @@
     padding-left: 20px;
   }
 
+  .comTextdisClick {
+    background-color: #d1d1d1;
+    color: #fff;
+    border: 1px solid #d1d1d1;
+  }
+
 </style>
 <template>
   <div>
@@ -102,8 +108,9 @@
       <tfoot>
         <tr>
           <td colspan="6">
-            <input type="button" class="normalBtn" @click="SaveData()" value="保存" />
-            <input type="button" class="normalBtn" @click="DownLoadFile()" value="下载" />
+            <input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="SaveData()" value="保存" />
+            <input type="button" class="normalBtn" :class="{'comTextdisClick':isSave}" @click="DownLoadFile()"
+              value="下载" />
           </td>
         </tr>
       </tfoot>
@@ -128,20 +135,25 @@
           Remarks: "",
           Details_Extends: []
         },
+        isSave: false,
         TCIDS: ""
       }
     },
     methods: {
       DownLoadFile(item) {
-        let msg = {
-          TCIDS: this.TCIDS
-        };
-        this.loading = true;
-        var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
-        this.GetLocalFile("bus_get_DownLoadBusConfig", msg,fileName,
-          res => {
-            this.loading = false;
-          });
+        if (!this.isSave) {
+          this.isSave = true;
+          let msg = {
+            TCIDS: this.TCIDS
+          };
+          this.loading = true;
+          var fileName = "バス手配依頼書" + this.DataObj.TeamNum + ".xls";
+          this.GetLocalFile("bus_get_DownLoadBusConfig", msg, fileName,
+            res => {
+              this.loading = false;
+              this.isSave = false;
+            });
+        }
       },
       GetData() {
         this.loading = true;
@@ -151,22 +163,25 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.DataObj = res.data.data;
-
           } else {
             this.Error(res.data.message);
           }
         }, err => {})
       },
       SaveData() {
-        this.DataObj.TCIDS = this.TCIDS;
-        this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
-          if (res.data.resultCode == 1) {
-            this.Success("操作成功");
-            this.GetData();
-          } else {
-            this.Error(res.data.message);
-          }
-        }, err => {})
+        if (!this.isSave) {
+          this.isSave = true;
+          this.DataObj.TCIDS = this.TCIDS;
+          this.apipost('bus_Post_SaveBusDownLoadData', this.DataObj, res => {
+            if (res.data.resultCode == 1) {
+              this.Success("操作成功");
+              this.GetData();
+            } else {
+              this.Error(res.data.message);
+            }
+            this.isSave = false;
+          }, err => {})
+        }
       }
     },
     mounted() {

src/components/index.vue

@@ -829,7 +829,10 @@
     <el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center :before-close="closeChangeMachie">
       <div>
         <p style="text-align: right; padding: 5px 0;font-size: 12px;">{{detailMessage.EmName}}&nbsp;&nbsp;&nbsp;&nbsp;{{detailMessage.UpdateTime}}</p>
-        <pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre>
+        <div v-html="detailMessage.Content">
+
+        </div>
+        <!-- <pre style="letter-spacing: 1px; font-size: 14px; color: #333;line-height: 30px;">{{detailMessage.Content}}</pre> -->
         <p style="padding:0 10px; margin: 10px 0; background: #f1f1f1;">{{$t('adm.adm_fujian')}}：</p>
         <p style="height: 28px; padding: 0 10px; line-height: 28px;    color: blue;" v-for="item in downLoadList" class="AnnFileListPMeta">
           <i class="iconfont icon-xiazai"></i>--<span @click="downloadSingle(item)">{{item.Name}}</span>

src/components/scenicSpot/scenicSpotInfoManage.vue

@@ -829,11 +829,11 @@
         inputVisible2: false,
         inputValue2: "",
          IsFreeList: [{
-            value: 0,
+            value: 1,
             label: "是"
           },
           {
-            value: 1,
+            value: 0,
             label: "否"
           }
         ],

src/components/scenicSpot/scenicSpotList.vue

@@ -393,11 +393,11 @@
             value: "-1",
             label: "不限"
           },{
-            value: "0",
+            value: "1",
             label: "免费"
           },
           {
-            value: "1",
+            value: "0",
             label: "有价"
           }
         ],

src/router/config.js

@@ -67,16 +67,19 @@ export default {
                 title: '出团通知书下载'
             },
         },
+        {
+            path: '/SalesconfirmationOrder',    //销售出团通知
+            name: 'SalesconfirmationOrder',
+            component: resolve => require(['@/components/SalesconfirmationOrder'], resolve),
+            meta: {
+                title: '销售出团通知书下载'
+            },
+        },
         {
             path: '/TravelControlTrip',
             name: 'TravelControlTrip',
             component: resolve => require(['@/components/TravelControlTrip'], resolve),
         },
-        {
-            path: '/BusExport',
-            name: 'BusExport',
-            component: resolve => require(['@/components/BusExport'], resolve),
-        },
         {
             path: '/index',
             name: 'index',
@@ -788,6 +791,14 @@ export default {
                                 title: '航班管理'
                             },
                         },
+                        {
+                            path: '/flightPerformance', //机票业绩
+                            name: 'flightPerformance',
+                            component: resolve => require(['@/components/Ticketing/flightPerformance'], resolve),
+                            meta: {
+                                title: '机票业绩'
+                            },
+                        },
                         {
                             path: '/flightChild', //航班子表管理
                             name: 'flightChild',
@@ -2320,7 +2331,14 @@ export default {
                             meta: {
                                 title: '少价管理'
                             }
-                        }, , { // 财务往来单据 收入确认单
+                        }, { //奖励管理
+                            path: '/RewardManagement',
+                            name: 'RewardManagement',
+                            component: resolve => require(['@/components/systemManagement/RewardManagement'], resolve),
+                            meta: {
+                                title: '奖励管理'
+                            }
+                        } , { // 财务往来单据 收入确认单
                             path: '/priceIncomeConfirmList',
                             name: 'priceIncomeConfirmList',
                             component: resolve => require(['@/components/FinancialModule/priceIncomeConfirmList'], resolve),
@@ -3255,6 +3273,11 @@ export default {
 
             ]
         },
+        {
+            path: '/BusExport',
+            name: 'BusExport',
+            component: resolve => require(['@/components/BusExport'], resolve),
+        },
         {
             path: '/leaderPay2', //领队报账
             name: 'leaderPay2',