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

src/assets/common/lang/zh.js

@@ -658,6 +658,12 @@ export const visa = {
   v_yibaoru:'已报入',
   v_houbu:'候补',
   v_yxhoubu:'允许候补',
+  v_byxhoubu:'不允许候补',
+  v_sqtime:'送签日期',
+  v_cqtime:'出签日期',
+  v_kptime:'开票日期',
+  v_EuropeanVisaType:'欧洲签证类型',
+  v_britishVisa:'英国签证',
   
   
   
@@ -1217,6 +1223,50 @@ export const Operation = {
   Op_localBranchPrice:'当地分公司价格',
   Op_localdaiPrice:'当地代销商价格',
   Op_localDangPrice:'当地当团利润归属',
+  Op_Country:'国别',
+  Op_WarningTeam:'预警团',
+  Op_TransportState:'联运状态',
+  Op_hide:'隐藏',
+  Op_TeamWarningSearch:'团控预警查询',
+  Op_daysChoice:'天数选择',
+  Op_Attendance:'上座率',
+  Op_warningSearch:'预警查询',
+  Op_TeamName:'团名',
+  Op_nei:'内',
+  Op_zhu:'主',
+  Op_lian:'联',
+  Op_jietuan:'结团',
+  Op_night:'晚',
+  Op_teamNotice:'出团通知书',
+  Op_downLoadword:'下载WORD行程',
+  Op_PriceInfo:'价格信息',
+  Op_tradePrice:'同业价',
+  Op_directPrice:'直客价',
+  Op_fellowMember:'同行会员',
+  Op_standard:'标准',
+  Op_fellow:'同行',
+  Op_directMember:'直客会员',
+  Op_direct:'直客',
+  Op_baby:'婴儿',
+  Op_spickupPrice:'单地接价格',
+  Op_Income:'增收',
+  Op_childBed:'儿童占床',
+  Op_childSurcharge:'儿童附加费',
+  Op_oldmanSurcharge:'老人附加费',
+  Op_visaPrice:'签证费',
+  Op_singleRoomcha:'单房差',
+  Op_insurance:'保险',
+  Op_zafei:'杂费',
+  Op_jianmian:'减免',
+  Op_childNobed:'儿童不占床',
+  Op_visafeeBack:'退签证费',
+  Op_priceDetail:'查看价格明细',
+  Op_people:'人',
+  Op_takeSeat:'占位',
+  Op_nozhipai:'尚未指派',
+  Op_caozuoop:'操作op',
+  Op_bindNum:'绑定数量',
+  Op_Warmprompt:'温馨提示',
 }
 export const rule = {
   company: '请选择公司',
@@ -1450,7 +1500,8 @@ export const visaT = {
   qxzcjka:'请选择出境口岸',
   qxzcjhbh:'请选择出境航班号',
   qtxywx:'请填写英文姓',
-  qsrywx:'请输入中文姓',
+  qsrzwx:'请输入中文姓',
+  qsrywx:'请输入英文姓',
   qtxywm:'请填写英文名',
   qtxzcsrq:'请填选择出生日期',
   qtxzxb:'请填选择性别',

src/components/FinancialModule/addFinancialDocuments.vue

@@ -584,7 +584,8 @@ export default {
               IsLeader:1,
               PayDate:'',
               CallType:0,
-              Type:0
+              Type:0,
+              GuestInfoList:[]
             },
             detailList:{
                 ID:0,
@@ -871,9 +872,23 @@ export default {
             this.msg.detailList.forEach(x=>{
               delete x.rate;
             });
+          //旅客名单数据组装
+          if(this.orderObj!=null&&this.orderObj.OrderSource===10){
+            console.log("getGuestInfo",this.$store.getters.getGuestInfo)
+            let guestInfo = this.$store.getters.getGuestInfo;
+            this.msg.GuestInfoList=[];
+            if(guestInfo!=null&&guestInfo.length>0){
+              guestInfo.forEach(t=>{
+                this.msg.GuestInfoList.push({GuestId:t.guestId,GuestName:t.guestName})
+              })
+            }
+          }
+          console.log("1234",this.msg);
           this.loading = true;
             this.apipost('Financial_post_Set',this.msg,res=>{
                 if(res.data.resultCode==1){
+                  //清除旅客名单数据
+                  this.$store.commit('saveGuestInfo',[])
                   this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
                         confirmButtonText: this.$t('fnc.jxzhidan'),
                         cancelButtonText: this.$t('fnc.nothanks'),

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -26,8 +26,12 @@
             {{$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>
+<<<<<<< HEAD
+              <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}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
               
+>>>>>>> 3f75667611ac72e4be81b0af1210cd16ce00a70b
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown split-button type="primary" trigger="click"  @command="bindVisa">
@@ -186,7 +190,7 @@ export default {
               message: this.$t('tips.cancleDelete')
         });
       });
-    },
+    },  
     deleteTshi(id){  // 删除操作
       this.apipost('dmc_post_DelVisaPeople',{GuestId:id},res=>{
         if(res.data.resultCode==1){

src/components/VisaCenter/addVisaNew.vue

@@ -796,9 +796,9 @@ export default {
                     }
                 };
                 result.forEach(x=>{
-                    let str = x.replace(/-/, "年")
-                    let strS = str.replace(/-/, "月")
-                    let strSi = strS+'日'
+                    let str = x.replace(/-/,  this.$t('pub.year'))
+                    let strS = str.replace(/-/, this.$t('pub.month'))
+                    let strSi = strS+ this.$t('fnc.day')
                    let msg = {
                         VisaPlanId:_this.addMsg.Id,
                         Date:strSi,
@@ -842,7 +842,7 @@ export default {
         },
         submitForm(addMsg) {
             if(this.addMsg.PeopleList.length<1){
-                this.$message.error('请添加申请人')
+                this.$message.error(this.$t('visaT.qtjsqr'))
                 return
             }
             //提交创建、修改表单
@@ -929,17 +929,17 @@ export default {
 
         },
         deleteThis(i){
-             this.$confirm('是否删除?删除后已填写资料无法恢复！', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
+             this.$confirm(this.$t('visaT.ts'), this.$t('tips.tips'), {
+                confirmButtonText: this.$t('pub.sureBtn'),
+                cancelButtonText: this.$t('pub.cancelBtn'),
                 type: 'warning'
             }).then(() => {
                 this.addMsg.PeopleList.splice(i,1)
-                this.$message.success('删除成功');
+                this.$message.success(this.$t('tips.shanchuchenggong'));
             }).catch(() => {
                 this.$message({
                     type: 'info',
-                    message: '已取消删除'
+                    message: this.$t('tips.cancleDelete')
                 });
             });
         },

src/router/config.js

@@ -1443,6 +1443,14 @@ export default {
                 title: '一日游'
               },
             },
+            {
+              path:'/oneDayTrip2',  //一日游销售自主开团用
+              name:'oneDayTrip2',
+              component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
+              meta: {
+                title: '一日游'
+              },
+            },
             {
               path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
               name: 'priceIncomeConfirmInfo',