update

src/assets/common/lang/zh.js

@@ -255,8 +255,6 @@ export const admin={  //行政
 	admin_lnLoginPwd:'请输入登录密码',
 	admin_Department:'部门',
   admin_Post:'岗位',
-
-
   admin_xueli:'学历',
   admin_Entrytime:'入职时间',
   admin_Departuretime:'离职时间',
@@ -1059,6 +1057,76 @@ export const fnc = {
   khyuanbi: '（原币）',
   khbweibi: '（本位币）',
   jylshuihao: '交易流水号',
+  shzhuangtai: '审核状态',
+  yjdanju: '佣金单据',
+  mbleixing: '模板类型',
+  djleixing: '单据类型',
+  yingshou: '应收',
+  yingfu: '应付',
+  shishou: '实收',
+  shifu: '实付',
+  zjdiaobo: '资金调拨',
+  tuanqi: '团期',
+  hkriqi: '汇款日期',
+  fybumen: '费用部门',
+  zdrenyuan: '制单人员',
+  zhleixing: '账户类型',
+  sfkzhanghu: '收付款账户',
+  dxleixing: '对象类型',
+  ddbianhao: '订单编号',
+  bzleixing: '币种类型',
+  djjine: '单据金额',
+  zdriqi: '制单日期',
+  spriqi: '审批日期',
+  gjchaxun: '高级查询',
+  piltijiao: '批量提交',
+  gzweituo: '工作委托',
+  shoukuan: '收款',
+  fukuan: '付款',
+  duixiang: '对象',
+  dqzhuangtai: '当前状态',
+  gnjpqishu: '国内票务期数',
+  qzbianhao: '签证编号',
+  tsbianhao: '投诉编号',
+  smjpbianhao: '散卖机票编号',
+  chakan: '查看',
+  shenhe: '审核',
+  zhuanjiao: '转交',
+  tzjyriqi: '调整交易日期',
+  xzzjiaoren: '选择转交人',
+  zhuanjiaoren: '转交人',
+  yjyriqi: '原交易日期',
+  cwbaobiao: '财务报表',
+  shuoming:'说明',
+  djbianhao: '单据编号',
+  cjshijian: '创建时间',
+  xiangqing: '详情',
+  zjdbbiao: '资金调拨报表',
+  zongbu: '总部',
+  fgongsi: '分公司',
+  zjdbodan: '资金调拨单',
+  skduixiang: '收款对象',
+  skfangshi: '收款方式',
+  dkzhanghu: '到款账户',
+  bwyue: '本位金额',
+  dbriqi: '调拨日期',
+  qingkong: '清空',
+  bnshanchu: '不能删除了！',
+  zhibiao: '制表',
+  bwbjine: '本位币金额',
+  shliucheng: '审核流程',
+  shouqi: '收起',
+  zhankai: '展开',
+  faqi: '发起',
+  daishen: '待审',
+  bohui: '驳回',
+  you: '由',
+  gei: '给',
+  zjbeizhu: '转交备注',
+  jieshu: '结束',
+  ljhaoshi: '累计耗时',
+  xsfujian: '显示附件',
+  ycfujian: '隐藏附件',
 }
 export const tips = {
   tips: '提示',
@@ -1118,6 +1186,8 @@ export const tips = {
   jiaoyifangshi: '交易方式',
   tips_deletealldepart: '删除该部门，会将其子部门全部删除！是否删除?',
   
+  zwtqxinxi: '暂无团期信息',
+  zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -1136,6 +1206,19 @@ export const Operation = {
   Op_Project:'项目',
   Op_notInvoled:'未参与',
   Op_ManageDepartment:'管理部门',
+  Op_LineDirection:'线路方向',
+  Op_leaveCountry:'出境',
+  Op_theEntry:'入境',
+  Op_Cdreservation:'成都机位出发',
+  Op_localrevervation:'当地机位出发',
+  Op_headOfficePrice:'总公司价格',
+  Op_branchPrice:'分公司价格',
+  Op_affiliate:'代销商价格',
+  Op_profitsBelong:'当团利润归属',
+  Op_localzongprice:'当地总公司价格',
+  Op_localBranchPrice:'当地分公司价格',
+  Op_localdaiPrice:'当地代销商价格',
+  Op_localDangPrice:'当地当团利润归属',
 }
 export const rule = {
   company: '请选择公司',
@@ -1214,7 +1297,6 @@ export const rule = {
   qxzfkdzhanghu: '请选择付款账户',
   qxzxybsheren: '请选择下一步审核人',
   qxzzdbumen:' 请选择制单部门',
-
   qsrbmmingchen:"请输入部门名称",
   qxzbmcengji:"请选择部门层级",
   qxzfuzeren:"请选择负责人",
@@ -1224,8 +1306,12 @@ export const rule = {
   qsrname:"请输入姓名",
   qsrtelphone:"请输入正确的手机",
   qsrIdnum:"请输正确的身份证号",
- 
-  
+  qxzzjiaoren: '请选择转交人',
+  qtxzjbeizhu: '请填写转交备注',
+  qxztzhdjyriqi: '请选择调整后的交易日期',
+  qtxshuoming: '请填写说明',
+  qxzygxytjddanju: '请选择一个需要提交的单据！',
+  qxzbmen: '请选择部门',
 }
 
 export const adm={

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -89,7 +89,7 @@
     <div v-loading="loading">
       <div class="sfd_header">
         <ul class="clearfix">
-          <li><span>{{$t('scen.sc_temID')}}:</span>{{TCNUM}}</li>
+          <li><span>团队编号：</span>{{TCNUM}}</li>
           <!-- <li><span>订单号：</span>{{orderId}}</li> -->
           <li> </li>
           <li><span>已收总金额：</span>{{moneyFormat(allMoney)}}</li>
@@ -106,7 +106,7 @@
       <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
         <tr>
           <th width="100">单号</th>
-          <th width="200">{{$t('fnc.fyleixing')}}</th>
+          <th width="200">费用类型</th>
           <th width="350">交易方式</th>
           <th width="100">同行转款</th>
           <th width="100">应收</th>

src/components/administrative/departmentManagement.vue

@@ -226,20 +226,20 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_xueli')" prop="EmEducation">
+              <el-form-item :label="$t('adm.adm_xueli')" prop="EmEducation">
                 <el-input maxlength='20' type="text" v-model="addMsg1.EmEducation"
                           :placeholder="$t('pub.pleaseImport')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_Entrytime')" prop="EmEntry">
+              <el-form-item label="入职时间" prop="EmEntry">
                 <el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmEntry' type="date"></el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_Departuretime')" prop="EmLeave">
+              <el-form-item label="离职时间" prop="EmLeave">
                 <el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmLeave' type="date"
                                 disabled></el-date-picker>
               </el-form-item>
@@ -269,7 +269,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_Birthday')" prop="EmBirthday">
+              <el-form-item label="生日" prop="EmBirthday">
                 <el-date-picker value-format="yyyy-MM-dd" v-model='addMsg1.EmBirthday' type="date"></el-date-picker>
               </el-form-item>
             </el-col>
@@ -279,7 +279,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_password')" prop="EmPassword">
+              <el-form-item label="密码" prop="EmPassword">
                 <el-input type="password" v-model="addMsg1.EmPassword" :placeholder="$t('pub.pleaseImport')"></el-input>
               </el-form-item>
             </el-col>
@@ -287,8 +287,8 @@
           <el-row :gutter="10">
             <el-col :span="24">
               <input type="button" :value="$t('pub.cancelBtn')" class="hollowFixedBtn"
-                     @click="resetForm('addMsg1'),treeLayerShowUser=false" />
-              <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')" />
+                     @click="resetForm('addMsg1'),treeLayerShowUser=false"></input>
+              <input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="submitForm1('addMsg1')"></input>
               <button v-if='isleaveBtn' class="normalBtn" @click="setIsLeave(leaveId)">{{leaveBtn}}</button>
             </el-col>
           </el-row>
@@ -346,19 +346,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_departsort')" prop="Sort">
+              <el-form-item label="部门排序" prop="Sort">
                 <el-input type="text" v-model="addMsg.Sort" :placeholder="$t('pub.pleaseImport')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label="$t('admin.admin_isleader')"  prop="IsLeader">
+              <el-form-item label='是否领队' prop="IsLeader">
                 <el-switch v-model="addMsg.IsLeader" active-value="1" inactive-value="0"></el-switch>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10">
             <el-col :span="24">
-              <el-form-item :label="$t('admin.admin_Bindingposition')" prop="PostIdArr">
+              <el-form-item label="绑定岗位" prop="PostIdArr">
                 <el-select filterable class='w400 multiple_input' multiple v-model='addMsg.PostIdArr'
                            :placeholder="$t('pub.pleaseSel')">
                   <el-option v-for='item in postList' :label='item.PostName' :value='item.PostId' :key="item.PostId">
@@ -388,14 +388,14 @@
         <th>{{$t('admin.admin_departmentLevel')}}</th>
         <th>{{$t('admin.admin_leader')}}</th>
         <th>{{$t('admin.admin_dphone')}}</th>
-        <th width="300">{{$t('admin.admin_Bindingposition')}}</th>
-        <th>{{$t('admin.admin_sort')}}</th>
+        <th width="300">绑定岗位</th>
+        <th>排序</th>
         <th>{{$t('admin.admin_operate')}}</th>
       </tr>
       <tr v-for="(item,index) in DataList">
         <td>{{item.RB_Branch_Name}}</td>
         <td>{{item.DepartmentName}}</td>
-        <td>{{item.Tier}}{{$t('admin.admin_level')}}</td>
+        <td>{{item.Tier}}级</td>
         <td>{{item.DepartmentManagerName}}</td>
         <td>{{item.DepartmentTel}}</td>
         <td>{{item.PostName}}</td>