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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -290,7 +290,7 @@
                         </tr>
                         <tr v-else @keyup.enter="addList(2,daIn+1)">
                             <td height="26px">
-                                <el-select  filterable  v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),addList(2,daIn+1)"  class=" _border_b_1">
+                                <el-select  filterable  v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(da.CostTypeId, daIn),getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)"  class=" _border_b_1">
                                     <el-option v-for='item in GetCostTypeList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -308,7 +308,7 @@
                                 <input v-model="da.UnitPrice"  type="text" @blur="addList(2,daIn+1)" @change="Calculation(2,daIn+1)" class="w80 h34 _border_b_1"></input>
                             </td>
                             <td height="26px">
-                                <el-select  filterable  v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
+                                <el-select  filterable  v-model='da.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)" class=" _border_b_1">
                                     <el-option v-for='item in coinGetList'
                                         :label='item.Name'
                                         :value='item.ID'
@@ -326,7 +326,7 @@
 
                     <tr @keyup.enter="addList(1)">
                         <td >
-                            <el-select  filterable  v-model='detailList.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId),addList(1)"  class=" _border_b_1">
+                            <el-select  filterable  v-model='detailList.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')" @change="getCostTypeName(detailList.CostTypeId), getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"  class=" _border_b_1">
                                 <el-option v-for='item in GetCostTypeList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -347,7 +347,7 @@
                             <input v-model="detailList.UnitPrice" type="text"  @blur="addList(1)" @change="Calculation(1)" class="w80 h34 _border_b_1"></input>
                         </td>
                         <td>
-                            <el-select  filterable  v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
+                            <el-select  filterable  v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')" @change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)" class=" _border_b_1">
                                 <el-option v-for='item in coinGetList'
                                     :label='item.Name'
                                     :value='item.ID'
@@ -1037,15 +1037,14 @@ export default {
                 }
             })
         },
-        getRate(i,t,index){  // 根据选择币种获取汇率
+        getRate(cID,i,t,index){  // 根据选择币种获取汇率
             this.coinGetList.forEach(x=>{
                 if(x.ID==i){
                     if(t==1){
-                        this.detailList.Rate = x.PayRate;
+                        this.detailList.Rate = cID === 57 ? x.PayRateHistory : x.PayRate;
                         this.detailList.currenName = x.Name;
                     }else{
-                        console.log(x)
-                        this.msg.detailList[index].Rate =x.PayRate;
+                        this.msg.detailList[index].Rate = cID === 57 ? x.PayRateHistory : x.PayRate;
                         this.msg.detailList[index].currenName = x.Name;
                     }
                     this.$forceUpdate();
@@ -1164,8 +1163,8 @@ export default {
                 }
             }, err => {})
         },
-        financeinfo_post_GetList(){ // 获取币种
-            this.apipost('financeinfo_post_GetList',{Name:''}, res => {
+        financeinfo_post_GetList(TCID){ // 获取币种
+            this.apipost('financeinfo_post_GetList',{Name:'', TCID: TCID}, res => {
                 if(res.data.resultCode == 1) {
                     this.coinGetList = res.data.data;
                 }
@@ -1263,6 +1262,10 @@ export default {
                     }
                     this.msg.URL = this.$route.query.path;
                     this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
+                    if (id > 0) {
+                        let TCID = data.TCIDList.length>0 ? data.TCIDList[0] : 0
+                        this.financeinfo_post_GetList(TCID);
+                    }
                     this.$forceUpdate();
                     this.loading=false;
                     if(this.$route.query.InPay)
@@ -1424,7 +1427,6 @@ export default {
         this.IsUploadPic = this.$route.query.IsUploadPic;
         this.msg.Cmd = this.$route.query.Cmd?this.$route.query.Cmd:'';
         this.financeinfo_post_GetClientTypeList();
-        this.financeinfo_post_GetList();
         const myDate = new Date();
         this.yaer = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
         this.month = myDate.getMonth()+1; //获取当前月份(0-11,0代表1月)
@@ -1444,6 +1446,8 @@ export default {
             this.BillSonName = this.$route.query.Name;
             this.FinancialFlowTemplate_post_GetProcessList(this.$route.query.id);
             this.Financial_post_Get(0,parseInt(this.$route.query.id));
+            let TCID = (this.orderObj && this.orderObj.TCIDList.length>0) ? this.orderObj.TCIDList[0] : 0
+            this.financeinfo_post_GetList(TCID);
         }
         if(this.$route.query.Conditon){
             this.returnCode = this.$route.query.Conditon;

src/components/SalesModule/productQuery.vue

@@ -170,26 +170,26 @@
         <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(),resetSelect();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>
             </el-form-item>
             <el-form-item label="参团类型" prop="GroupType">
-              <el-select v-model='addMsg.GroupType' @change="groupTypeChange" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-select v-model='addMsg.GroupType' @change="groupTypeChange()" filterable :placeholder="$t('pub.pleaseSel')">
                 <el-option v-for="item in ctlxList" v-if="item.Id!=5" :label='item.Name' :value='item.Id' :key='item.Id'>
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
+            <el-form-item label="联系人" prop="ContactName" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
               <el-input v-model='addMsg.ContactName'></el-input>
             </el-form-item>
-            <el-form-item label="联系电话" prop="ContactMobile" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
+            <el-form-item label="联系电话" prop="ContactMobile" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
               <el-input v-model='addMsg.ContactMobile' maxlength='20'></el-input>
             </el-form-item>
-            <el-form-item label="客户门店" prop="CustomerId" v-show="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''">
+            <el-form-item label="客户门店" prop="CustomerId" v-if="addMsg.CustomerType==1||addMsg.CustomerType==2||addMsg.CustomerType==''">
               <el-select v-model='addMsg.CustomerId' filterable :placeholder="$t('pub.pleaseSel')" @change='getSspt'>
                 <el-option v-for="item in khmdList" :label='item.customerName+"-"+item.contact' :value='item.customerId'
                   :key='item.customerId'>
@@ -1567,10 +1567,12 @@
         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
@@ -1892,7 +1894,6 @@
           Number(this.addMsg.BabyNum) + Number(this.addMsg.AirticketNum)
         this.addMsg.IsChildrenTour = this.addObj.IsSupportChildren
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount
-
         this.apipost('sellorder_post_SetOrderInfo_02', this.addMsg, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message)

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -655,6 +655,7 @@
                   <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" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</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">
@@ -675,7 +676,6 @@
                         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;">

src/components/dmc/manager/dmcTotalTable.vue

@@ -57,12 +57,13 @@
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
       <table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
         <tr>
-          <th colspan="10">公司通用信息</th>
+          <th colspan="11">公司通用信息</th>
           <th colspan="5">团队需求表</th>
           <th colspan="7">地接op操作</th>
         </tr>
         <tr>
           <th width="130">序号</th>
+          <th width="75">出团公司</th>
           <th width="75">出发地</th>
           <th width="80">航班时间</th>
           <th width="125">公司团号</th>
@@ -94,6 +95,9 @@
               <td>
                 {{item.StartCityNames}}
               </td>
+              <td>
+                {{item.OutBranchName}}
+              </td>
               <td>
                 <div class="w120">
                   {{item.FlightDate}}
@@ -264,7 +268,7 @@
               </td>
             </tr>
             <tr>
-              <td colspan="21" style="text-align: left!important;padding:0 20px;">
+              <td colspan="22" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
                   <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>

src/components/scenicSpot/scenicSpotInfoManage.vue

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

src/components/scenicSpot/scenicSpotList.vue

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

src/components/systemManagement/currencyManagement.vue

@@ -160,10 +160,10 @@
                     <th>{{$t('fnc.sfbenweibi')}}</th>
                     <th>{{$t('fnc.chushihuilv')}}</th>
                     <th>{{$t('fnc.benqihuilv')}}</th>
-                    <th>现钞买入价</th>
-                    <th>现汇买入价</th>
                     <th>现钞卖出价</th>
-                    <th>现汇卖出价</th>
+                    <!-- <th>现汇买入价</th> -->
+                    <th>现钞买入价</th>
+                    <!-- <th>现汇卖出价</th> -->
                     <th>上调汇率</th>
                     <th>{{$t('fnc.zjjiner')}}</th>
                     <th>{{$t('system.table_operation')}}</th>
@@ -182,9 +182,9 @@
                         <span>{{item.CurrentRate}}</span>
                         <span :class="item.IsStandardCurrency!=1?'':'display_none'" @click="getCurrentRate(item.ID,index)" class="iconfont icon-qiehuan"></span>
                     </td>
-                    <td>{{item.InCashRate}}</td>
+                    <!-- <td>{{item.InCashRate}}</td> -->
                     <td>{{item.OutCashRate}}</td>
-                    <td>{{item.OutRemitRate}}</td>
+                    <!-- <td>{{item.OutRemitRate}}</td> -->
                     <td>{{item.ExchangeRates}}</td>
                     <td><span class="_underline" @click="goUrl('FineBalance',item.ID,item.Name)">{{item.Money}}</span></td>
                     <td>