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

src/components/SalesModule/enrollTotal.vue

 <template>
-  <div class="flexOne">
+  <div class="flexOne groupts">
     <div class="enrollTotalSearch">
       <ul>
         <li><span><em>线路</em>
@@ -274,6 +274,9 @@
           <td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span>
+                <span v-if="item.tsIdList.length>0">投诉单号：
+                  <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
+                </span>
                 <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p>
               </div>
               <div>
@@ -450,6 +453,18 @@
       };
     },
     methods: {
+       //跳转
+      goUrlTS (path, id, orderId, title) {
+        this.$router.push({
+          name: path,
+          query: {
+            'id': id,
+            'orderId': orderId,
+            blank: 'y',
+            tab: title
+          }
+        })
+      },
       goUrlSFD: function (path, name, item) {
         let obj = JSON.parse(JSON.stringify(item))
         obj.oP_Remarks = ''
@@ -669,6 +684,11 @@
 </script>
 
 <style>
+.groupts .underline{
+    text-decoration: underline;
+    margin: 5px;
+    text-align: center;
+  }
 .color_red_order{
   color: #e95252 !important;
 }

src/components/SalesModule/groupTourOrder.vue

@@ -733,11 +733,15 @@
     border-top: 3px solid #38425d;
   }
 
-
+.groupts .underline{
+    text-decoration: underline;
+    margin: 5px;
+    text-align: center;
+  }
 </style>
 
 <template>
-  <div class="flexOne" style="min-width: 1200px;">
+  <div class="flexOne groupts" style="min-width: 1200px;">
     <!-- 修改信息 -->
     <div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
       <p>修改
@@ -1786,7 +1790,8 @@
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span>
-                <p><span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}}</a> ;</span><span
+                <p><span v-if="item.tsIdList.length>0">投诉单号：
+                  <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}}</a> ;</span><span
                   v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}
                 </p></div>
               <div>

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -655,10 +655,15 @@
     font-size:20px;
     cursor: pointer;
   }
+  .groupts .underline{
+    text-decoration: underline;
+    margin: 5px;
+    text-align: center;
+  }
 </style>
 
 <template>
-	<div class="flexOne" v-loading='loading'>
+	<div class="flexOne groupts" v-loading='loading'>
     <!-- 修改信息 -->
 		<div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2" >
 			<p>修改
@@ -1773,7 +1778,9 @@
           <td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
             <div>
               <div><span>备注：</span><p>
-                <span v-for="ts in item.tsIdList">投诉单号：<a href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;</span>
+                <span v-if="item.tsIdList.length>0">投诉单号：
+                  <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
+                  </span>
                 <span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
               <div>
                 <!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->

src/components/SalesVisa/VisaProductCountryManager.vue

@@ -353,15 +353,6 @@
                     <el-input v-model="country.Sort" placeholder="排序"/>
                 </el-form-item>
                 <el-form-item label="国家图标">
-                          <!-- <el-upload 
-                            :file-list="fileList"	
-                            :http-request="uploadTest" 
-                            :multiple="true" 
-                            :limit="2"
-                            :on-change="handleChange1"
-                            action="">
-                            <el-button size="small" type="primary">点击上传</el-button>
-                        </el-upload> -->
                         <div class="TFimgList">
                                 <img v-if="!country.Icon" src="../../assets/img/bg_c3@3x.png">
                                 <img v-else :src='country.Icon'>
@@ -378,14 +369,6 @@
                             </div>
                 </el-form-item>
                 <el-form-item label="背景图片">
-                    <!-- <el-upload 
-                      :file-list="fileList2"	
-                      :http-request="uploadTest2" 
-                      :multiple="true" 
-                      :limit="2"
-                      :on-change="handleChange2"
-                        action="">
-                            <el-button size="small" type="primary">点击上传</el-button></el-upload> -->
                             <div class="TFimgList">
                                 <img v-if="!country.ImageFileList[0]" src="../../assets/img/bg_c3@3x.png">
                                 <img v-else :src='country.ImageFileList[0]'>
@@ -512,7 +495,7 @@ export default {
         CountryId: 2,
         HotCountry: 1,
         Icon: "",
-        ImageFileList: [],
+        ImageFileList: ["../../assets/img/bg_c3@3x.png"],
         Sort:0,
       },
     //   fileList: [],
@@ -703,8 +686,8 @@ export default {
       let path = "/Upload/DMC/Icon/";
       this.UploadSelfFileT(path, newArr, x => {
         let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
-        this.country.ImageFileList[0] = url;
-        //  this.fileList.push({url:url})
+        this.country.ImageFileList.push(url);
+        console.log("this.country",this.country)
       });
     },
     handleChange2(file, fileList) {
@@ -722,7 +705,6 @@ export default {
       this.UploadSelfFileT(path, newArr, x => {
         let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
         this.country.Icon = url;
-        //  this.fileList.push({url:url})
       });
     },
     EditCountry(item) {

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -875,11 +875,15 @@
     font-size: 20px;
     cursor: pointer;
   }
-
+.groupts .underline{
+    text-decoration: underline;
+    margin: 5px;
+    text-align: center;
+  }
 </style>
 
 <template>
-  <div class="flexOne RegistrationList" style="min-width: 1200px;">
+  <div class="flexOne RegistrationList groupts" style="min-width: 1200px;">
 
 
     <div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2">
@@ -1978,8 +1982,9 @@
                 <div class="clearfix RL-MARK">
                   <span class="RL-remarkTitle">备注:</span>
                   <p class="RL-redType RL-remarkCon">
-                    <span v-if="childItem.TsId>0">投诉单号：<a href="javascript:void(0);"
-                        @click="goUrlTS('ComplaintsDetail',childItem.TsId,childItem.OrderId,'投诉详情')">{{childItem.TsId}}</a>
+                    <span v-if="childItem.tsIdList.length>0">投诉单号：
+                      <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
+                        @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}}</a>
                       ;</span>
                     <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
                       {{childItem.PlatformOrder}};</span>

src/components/systemManagement/currencyManagement.vue

@@ -160,7 +160,10 @@
                     <th>{{$t('fnc.sfbenweibi')}}</th>
                     <th>{{$t('fnc.chushihuilv')}}</th>
                     <th>{{$t('fnc.benqihuilv')}}</th>
-                    <th>{{$t('fnc.danqgianhuilv')}}</th>
+                    <th>现汇买入价</th>
+                    <th>现钞买入价</th>
+                    <th>现钞卖出价</th>
+                    <th>现汇卖出价</th>
                     <th>上调汇率</th>
                     <th>{{$t('fnc.zjjiner')}}</th>
                     <th>{{$t('system.table_operation')}}</th>
@@ -179,6 +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.OutCashRate}}</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>