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

src/App.vue

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

src/assets/common/lang/zh.js

@@ -1435,4 +1435,14 @@ export const visaT = {
   qsrlingdui:'请输入领队',
   qxzmoban:'请选择模板',
   Regularflights:'常用航班',
+  qtxrank:'请填写排序',
+  addApplicant:'添加申请人',
+  rapplicantxx:'复制申请人信息',
+  qtxzwx:'请填写中文姓',
+  qtxzwm:'请填写中文名',
+  Completionover:'办理完成',
+  sfshanchubd:'是否删除绑定?',
+  qxzzzdqzlx:'请选择正确的签证类型！',
+  qxzxybddry:"请选择需要绑定的人员",
+  v_Othervisas:'其他'
 }
\ No newline at end of file

src/components/SalesModule/groupTourOrder.vue

@@ -1500,7 +1500,7 @@
           <th width="200">操作</th>
         </tr>
         <tr>
-          <td v-show="list.length==0" colspan="16" align="center">暂无数据</td>
+          <td v-show="list.length==0" colspan="17" align="center">暂无数据</td>
         </tr>
         <tbody v-for="(item,index) in list" :key="index">
         <tr>

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -26,6 +26,7 @@
             {{$t('visa.v_tvisa')}}
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1"  :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
+              <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>其他</el-dropdown-item>
               
             </el-dropdown-menu>
@@ -34,7 +35,11 @@
             {{$t('visa.v_gvisa')}}
             <el-dropdown-menu slot="dropdown" >
               <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
+<<<<<<< HEAD
+              <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
+=======
               <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>其他</el-dropdown-item>
+>>>>>>> 292691f5f6e9626c70936d1e9ce1f153541b45b3
            </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -85,9 +90,9 @@
             </span>
              <span v-else>
                <span v-if="item.VisaCountryType!=0">
-                 <span v-if="item.VisaManageStatus==1">未办理</span> 
-                <span v-if="item.VisaManageStatus==2">办理中</span> 
-                <span v-if="item.VisaManageStatus==3">办理完成</span> 
+                 <span v-if="item.VisaManageStatus==1">{{$t('visa.v_weibanli')}}</span> 
+                <span v-if="item.VisaManageStatus==2">{{$t('visa.v_banlizhong')}}</span> 
+                <span v-if="item.VisaManageStatus==3">{{$t('visaT.Completionover')}}</span> 
                </span>
               
             </span>
@@ -122,17 +127,17 @@ export default {
         StatusList:[
           {
             Id:'-1',
-            Name:'不限'  
+            Name:this.$t('pub.unlimitedSel')  
           },{
             Id:'0',
-            Name:'待处理'  
+            Name:this.$t('Airticket.Air_toProcessed') 
           },
           {
             Id:'1',
-            Name:'通过'  
+            Name:  this.$t('visa.v_tongguo')
           },{
             Id:'2',
-            Name:'拒签'  
+            Name:this.$t('visa.v_jujue')
           },
       ],
       LineID:14,
@@ -171,16 +176,16 @@ export default {
       },err=>{})
     },
     deletelist(id){//删除提示
-      this.$confirm('是否删除绑定?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
+      this.$confirm(this.$t('visaT.sfshanchubd'), this.$t('tips.tips'), {
+              confirmButtonText: this.$t('pub.sureBtn'),
+              cancelButtonText: this.$t('pub.cancelBtn'),
               type: 'warning'
           }).then(() => {                 
               this.deleteTshi(id)
           }).catch(() => {
           this.$message({
               type: 'info',
-              message: '已取消删除'
+              message: this.$t('tips.cancleDelete')
         });
       });
     },
@@ -196,11 +201,11 @@ export default {
     },
     bindVisa(command){ //绑定签证类型
       if(command.id>0&&this.LineID!=14){
-        this.$message.error('请选择正确的签证类型！')
+        this.$message.error(this.$t('visaT.qxzzzdqzlx'))
         return;
       }
       if(this.checkList.length==0){
-        this.$message.error('请选择需要绑定的人员')
+        this.$message.error(this.$t('visaT.qxzxybddry'))
         return
       }
       let msg = {

src/components/dmc/manager/dmcTotalTable.vue

@@ -127,7 +127,7 @@
                         <td>{{ds.StopoverName}}</td>
                       </tr>
                     </table>
-                    <el-button slot="reference" class="normalBtn mt5" style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
+                    <el-button slot="reference" class="normalBtn mt5 restaurantDetails" style='height:20px; padding: 0 8px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button>
                   </el-popover>
                 </div>
               </td>
@@ -233,24 +233,32 @@
               <td>
                 <div class="w250">
                   <el-button-group>
-                    <el-button @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF">收付款</el-button>
-                    <el-popover placement="bottom" width="300" trigger="click">
-                      <el-input class='mt10' v-model='remarkString' type='textarea'></el-input>
-                      <p class="alcenter mt10">
-                        <input type="button" value="保存" @click="saveRemark" class="normalBtn" />
-                      </p>
-                      <el-button type="primary" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;">添加备注</el-button>
-                    </el-popover>
-                    <br/>
-                    <el-button @click='openChart(item)' type="primary" style="background:#6DD875; border-color:#6DD875">联系OP</el-button>
-                    <el-popover placement="bottom" width="300" trigger="click">
-                      <el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
-                      <p class="alcenter mt10">
-                        <input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
-                      </p>
-                      <el-button type="primary" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
-                        style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;">地接团号</el-button>
-                    </el-popover>
+                    <el-tooltip class="item" effect="dark" content="收付款" placement="top-start">
+                      <el-button icon="iconfont icon-shoufukuan" @click="goUrlT('teamRevenueExpenditure',item.TCID,'团队收支')" type="primary" style="background:#00C6FF; border-color:#00C6FF"></el-button>
+                    </el-tooltip>
+
+                    <el-tooltip class="item" effect="dark" content="添加备注" placement="top-start">
+                        <el-popover placement="bottom" width="300" trigger="click">
+                          <el-input class='mt10' v-model='remarkString' type='textarea'></el-input>
+                          <p class="alcenter mt10">
+                            <input type="button" value="保存" @click="saveRemark" class="normalBtn" />
+                          </p>
+                          <el-button type="primary" icon="iconfont icon-beizhu" slot="reference" @click='CkedItem(item)' style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
+                        </el-popover>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="联系OP" placement="top-start">
+                      <el-button @click='openChart(item)' icon="iconfont icon-dianhua" type="primary" style="background:#6DD875; border-color:#6DD875"></el-button>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="地接团号" placement="top-start">
+                      <el-popover placement="bottom" width="300" trigger="click">
+                        <el-input class='mt10' v-model='NumObj.DMCNum' type='textarea'></el-input>
+                        <p class="alcenter mt10">
+                          <input type="button" value="保存" @click="UpdateCombinationNum()" class="normalBtn" />
+                        </p>
+                        <el-button type="primary" icon="iconfont icon-jituan" slot="reference" @click='ClickNumItem(item.DMCNum,outItem.NewCombinationNum,outItem.TCIDs)'
+                          style="background:#3333FF; border-color:#AD9AF6; border-radius: 0;"></el-button>
+                      </el-popover>
+                    </el-tooltip>
                   </el-button-group>
                 </div>
               </td>
@@ -520,6 +528,10 @@
 </script>
 
 <style>
+  .restaurantDetails{
+    color:#fff!important;
+    margin-bottom:5px;
+  }
   .dmcTotalSplitTrCss td {
     background: #eee !important;
   }