提交

src/assets/common/lang/zh.js

@@ -1375,7 +1375,8 @@ export const visaT = {
   qxzcjka:'请选择出境口岸',
   qxzcjhbh:'请选择出境航班号',
   qtxywx:'请填写英文姓',
-  qsrywx:'请输入中文姓',
+  qsrzwx:'请输入中文姓',
+  qsrywx:'请输入英文姓',
   qtxywm:'请填写英文名',
   qtxzcsrq:'请填选择出生日期',
   qtxzxb:'请填选择性别',

src/components/VisaCenter/VisaApplicationDetails.vue

@@ -26,20 +26,14 @@
             {{$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-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>    
             </el-dropdown-menu>
           </el-dropdown>
           <el-dropdown split-button type="primary" trigger="click"  @command="bindVisa">
             {{$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>
@@ -188,7 +182,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')
                 });
             });
         },