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

src/assets/common/lang/jp.js

@@ -277,6 +277,18 @@ export const admin={  //行政
     admin_lnLoginPwd:'登録パスワードを入力してください',
     admin_Department:'部署',
     admin_Post:'職位',
+    admin_Contract:'連絡先の名前',
+    admin_Mobile:'連絡先携帯',
+    admin_jieji:'受取人の名前',
+    admin_jieMobile:'受信者の携帯電話',
+    admin_chutuan:'出団通知名',
+    companyShow:'は本社',
+    departChushi:'クラス初期階層',
+    isServiceFei:'サービス料の有無',
+    fufei:'有料',
+    serviceFei:'サービス料金',
+    companyZhang:'会社確認章',
+    tripLogo:'ストロークロゴ',
 }
 //zk
  export const hotel = {

src/assets/common/lang/zh-tw.js

@@ -287,6 +287,18 @@ export const admin={  //行政
   admin_Bindingposition:'綁定崗位',  
   admin_sort:'排序',  
   admin_level:'級',
+  admin_Contract:'連絡人姓名',
+  admin_Mobile:'連絡人手機',
+  admin_jieji:'接機人姓名',
+  admin_jieMobile:'接機人手機',
+  admin_chutuan:'出團通知名',
+  companyShow:'是否為總公司',
+  departChushi:'部門初始層級',
+  isServiceFei:'是否服務費收費',
+  fufei:'付費',
+  serviceFei:'服務費用',
+  companyZhang:'公司確認章',
+  tripLogo:'行程Logo',
 }
 //zk
  export const hotel = {

src/assets/common/lang/zh.js

@@ -287,6 +287,18 @@ export const admin={  //行政
   admin_Bindingposition:'绑定岗位',
   admin_sort:'排序',
   admin_level:'级',
+  admin_Contract:'联系人姓名',
+  admin_Mobile:'联系人手机',
+  admin_jieji:'接机人姓名',
+  admin_jieMobile:'接机人手机',
+  admin_chutuan:'出团通知名',
+  companyShow:'是否为总公司',
+  departChushi:'部门初始层级',
+  isServiceFei:'是否服务费收费',
+  fufei:'付费',
+  serviceFei:'服务费用',
+  companyZhang:'公司确认章',
+  tripLogo:'行程Logo',
 }
 //zk
  export const hotel = {

src/components/platformModule/companyManagement.vue

@@ -152,7 +152,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="城市" prop="City">
+        <el-form-item :label="$t('system.table_city')" prop="City">
           <el-select class='w280' :placeholder="$t('pub.pleaseSel')" filterable v-model="addMsg.City">
             <el-option :label="$t('pub.unlimitedSel')" :value='commonDefaultSelect'></el-option>
             <el-option v-for='item in CityList' :key="item.ID" :label="item.Name" :value="item.ID">
@@ -165,19 +165,19 @@
         <el-form-item class='w400' :label="$t('pub.telphone')" prop="Tel">
           <el-input type="text" v-model="addMsg.Tel" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label='联系人姓名' prop="ContactPersion">
+        <el-form-item class='w400' :label="$t('admin.admin_Contract')" prop="ContactPersion">
           <el-input type="text" v-model="addMsg.ContactPersion" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label='联系人手机' prop="MobilePhone">
+        <el-form-item class='w400' :label="$t('admin.admin_Mobile')" prop="MobilePhone">
           <el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label='接机人姓名' prop="AirportServicePerson">
+        <el-form-item class='w400' :label="$t('admin.admin_jieji')" prop="AirportServicePerson">
           <el-input type="text" v-model="addMsg.AirportServicePerson" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label='接机人手机' prop="AirportServicePhone">
+        <el-form-item class='w400' :label="$t('admin.admin_jieMobile')" prop="AirportServicePhone">
           <el-input type="text" v-model="addMsg.AirportServicePhone" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
-        <el-form-item class='w400' label='出团通知名' prop="NoticesName">
+        <el-form-item class='w400' :label="$t('admin.admin_chutuan')" prop="NoticesName">
           <el-input type="text" v-model="addMsg.NoticesName" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
         <el-form-item class='w400' :label='$t("admin.admin_status")' prop="Status">
@@ -186,13 +186,13 @@
         <el-form-item class='w400' :label='$t("admin.admin_isshow")' prop="is_show">
           <el-switch v-model="addMsg.is_show" active-value="0" inactive-value="1"></el-switch>
         </el-form-item>
-        <el-form-item class='w400' label='B2B是否显示' prop="B2BShow">
+        <el-form-item class='w400' :label="$t('admin.B2BShow')" prop="B2BShow">
           <el-switch v-model="addMsg.B2BShow" active-value="0" inactive-value="1"></el-switch>
         </el-form-item>
-        <el-form-item class='w400' label='是否为总公司' prop="IsParentCompany">
+        <el-form-item class='w400' :label="$t('admin.companyShow')" prop="IsParentCompany">
           <el-switch v-model="addMsg.IsParentCompany" active-value="1" inactive-value="2"></el-switch>
         </el-form-item>
-        <el-form-item class='w400' label='部门初始层级' prop="BeginTier">
+        <el-form-item class='w400' :label="$t('admin.departChushi')" prop="BeginTier">
           <el-input type="text" v-model="addMsg.BeginTier" :placeholder="$t('pub.pleaseImport')"></el-input>
         </el-form-item>
         <el-form-item class='w400' :label='$t("admin.admin_leader")' prop="BranchManager">
@@ -204,17 +204,17 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class='w400' label='是否服务费收费'>
+        <el-form-item class='w400' :label='$t("admin.isServiceFei")'>
           <el-select v-model='addMsg.IsFreeFee' :placeholder="$t('pub.pleaseSel')" class='w280'>
-            <el-option label="付费" :value='0'></el-option>
-            <el-option label="免费" :value='1'></el-option>
+            <el-option :label="$t('admin.fufei')" :value='0'></el-option>
+            <el-option :label="$t('advmanager.v_free')" :value='1'></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item class='w400' label='服务费用' v-if="addMsg.IsFreeFee==0">
+        <el-form-item class='w400' :label="$t('admin.serviceFei')" v-if="addMsg.IsFreeFee==0">
           <el-input type="text" v-model="addMsg.ServiceFee"></el-input>
         </el-form-item>
 
-        <el-form-item label='公司确认章'>
+        <el-form-item :label='$t("admin.companyZhang")'>
           <el-upload class="avatar-uploader" :http-request="UploadImage" :show-file-list="false"
             :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
             <img v-if="imageUrl" :src="imageUrl" class="avatar">
@@ -223,7 +223,7 @@
             <span v-else class="repUp">{{$t('system.up_upImg')}}</span>
           </el-upload>
         </el-form-item>
-        <el-form-item label='行程Logo'>
+        <el-form-item :label='$t("admin.tripLogo")'>
           <el-upload class="avatar-uploader" :http-request="UploadImage_Logo" :show-file-list="false"
             :on-success="handleAvatarSuccessLogo" :before-upload="beforeAvatarUpload">
             <img v-if="imageUrlLogo" :src="imageUrlLogo" class="avatar">
@@ -232,7 +232,7 @@
             <span v-else class="repUp">{{$t('system.up_upImg')}}</span>
           </el-upload>
         </el-form-item>
-        <el-form-item class='w400' label='备注' prop="Remarks">
+        <el-form-item class='w400' :label='$t("hotel.hotel_remark")' prop="Remarks">
           <el-input type="textarea" v-model="addMsg.Remarks"></el-input>
         </el-form-item>
       </el-form>