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

# Conflicts:
#	src/assets/common/lang/zh.js
#	src/components/SalesModule/VisaFinancialDocuments.vue
#	src/components/SalesModule/groupInquiry.vue

src/assets/common/lang/zh.js

@@ -29,7 +29,6 @@ export const pub={
   room:'房数',
   year:'年',
   month:'月',
-  day:'日',
   yearMonth:'年月',
   addImg:'添加图片',
   confirmCancel:'确认取消',
@@ -38,6 +37,9 @@ export const pub={
   returnBack:'返回',
   allday:'全天',
   clickToView:'点击查看',
+  man:'男',
+  woman:'女',
+  
 }
 
 export const login = {
@@ -930,6 +932,7 @@ export const fnc = {
   jigou: '机构',
   qsrneirong: '请输入内容',
   zhanghuleixing: '账户类型',
+  zhfenlei: '账户分类',
   yueacc: '余额',
   bwbyue: '本位币余额',
   caozuoriqi: '操作日期',
@@ -976,7 +979,79 @@ export const fnc = {
   tjzhanghu: '添加账户',
   sfduigong: '是否对公',
   sybumen: '适用部门：',
-
+  shanghuhao: '商户号',
+  qqdizhi: '请求地址',
+  zfxinxi: '支付信息',
+  shsiyao: '商户私钥',
+  ptgongyao: '平台公钥',
+  banbenhao: '版本号',
+  shoukuandan: '收款单',
+  fukuandan: '付款单',
+  sfytxiangguan: '是否与团相关',
+  spliucheng: '审批流程',
+  liuchengtu: '流程图',
+  gongzhang: '公账',
+  sizhang: '私账',
+  rmbxianjin: '人民币现金',
+  wbxianjin: '外币现金',
+  ptxnzhanghu: '平台虚拟账户',
+  djxnzhanghu: '地接虚拟账户',
+  szxiangdi: '收支相抵',
+  khleixing: '客户类型',
+  fkduixiang: '付款对象',
+  khmingcheng: '客户名称',
+  zslingdui: '正式领队/导游',
+  lslingdui: '临时领队/导游',
+  daishengcheng: '待生成',
+  fkzhanghu: '付款账户',
+  qxzfkzh: '请选择付款账户',
+  ldmingcheng: '领队名称',
+  day: '日',
+  fyshuoming: '费用说明',
+  danjia: '单价',
+  jine: '金额',
+  yuanbi: '原币',
+  sfjine: '实付金额',
+  daxie: '（大写）',
+  xiaoxie: '（小写）',
+  yjfkuanriqi: '预计付款日期',
+  qxzrqshijian: '选择日期时间',
+  fjshuoming: '附加说明',
+  fygsbumen: '费用归属部门',
+  gnpiaowu: '国内票务',
+  jpshouzhi: '机票收支',
+  xiayibu: '下一步',
+  tijiao: '提交',
+  zancun: '暂存',
+  jxzhidan: '继续制单',
+  nothanks: '不了，谢谢',
+  kuaijilian: '（会计联）',
+  yewulian: '（业务联）',
+  dayinshijian: '打印时间',
+  hnrdanwei: '汇款人(单位)',
+  huikuanren: '汇款人',
+  fkzhlshuihao: '付款账户(流水号)',
+  jpbianhao: '机票编号',
+  skjine: '收款金额',
+  fkjine: '付款金额',
+  ling: '零',
+  qian: '前',
+  cnskuandan: '出纳收款单',
+  cnfkuandan: '出纳付款单',
+  cnfshulian: '附属出纳联',
+  fkfangshi: '付款方式',
+  danhao: '单号',
+  zhidanren: '制单人',
+  wbzjine: '外币总金额',
+  bwbzjine: '本位币总金额',
+  hkshijian: '汇款时间',
+  jiaoyiriqi: '交易日期',
+  fkuanzhanghu: '收款账户',
+  skuanzhanghao: '收款账号',
+  shouxufei: '手续费',
+  khyuanbi: '（原币）',
+  khbweibi: '（本位币）',
+  jylshuihao: '交易流水号',
 }
 export const tips = {
   tips: '提示',
@@ -1026,6 +1101,14 @@ export const tips = {
   znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
   shangchuanExcel: '上传文件只能是 excel 格式!',
   feiyongleixing: '费用类型？',
+  qxzzhleixing: '请选择账户类型!',
+  dzfpzxxdelete: '的支付信息配置?删除后不可撤回！',
+  qscWEfile: '请上传图片、word、excel类型的文件！',
+  czcgsfjxzhidan: '操作成功，是否继续制单？',
+  jpswxzxianlu: '机票尚未选择线路',
+  qzcpbianhao: '签证产品编号',
+  qishu: '期数',
+  jiaoyifangshi: '交易方式',
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -1102,11 +1185,52 @@ export const rule = {
   qxzlxcengji: '请选择类型层级',
   qtxzhmingcheng: '请填写账户名称',
   qxzsybumen: '请选择适用部门',
-}
-
-
+  qsrshuhao: '请输入商户号',
+  qsrshsyao: '请输入商户私钥',
+  qsrptsiyao: '请输入平台公钥',
+  qsrqqdizhi: '请输入请求地址',
+  qsrbbenhao: '请输入版本号',
+  qxzssgongsi: '请选择所属公司',
+  qxzshleixing: '请选择账户类型',
+  qxzzhfenlei: '请选择账户分类',
+  qxzzhanghu: '请选择账户',
+  qsrdingdanhao: '请输入订单号',
+  qxzfyshuoming: '请选择费用说明',
+  qxzbzhong: '请选择币种',
+  qxzxybshren: '请选择下一步审批人',
+  qtxzsyxfyshuoming: '请填写至少一项费用说明！',
+  qxzyjfkshijian: '请选择预计付款时间!',
+  qxzfkduixiang: '请选择付款对象!',
+  qxzkhmingcheng: '请选择客户名称!',
+  qxzfkdzhanghu: '请选择付款账户',
+  qxzxybsheren: '请选择下一步审核人',
+  qxzzdbumen:' 请选择制单部门',
 
+  qsrbmmingchen:"请输入部门名称",
+  qxzbmcengji:"请选择部门层级",
+  qxzfuzeren:"请选择负责人",
+  qsrbdgangwei:"请选择绑定岗位",
+  qsrzqdbmdianhua:"请输入正确的部门电话",
+  qszhengshu:"请输整数",
+  qsrname:"请输入姓名",
+  qsrtelphone:"请输入正确的手机",
+  qsrIdnum:"请输正确的身份证号",
+ 
+  
+}
 
+export const adm={
+  adm_xzbumen:"新增部门",
+  adm_sxjg:"树形结构",
+  adm_fhlb:"返回列表",
+  adm_jggl:"结构管理",
+  adm_addzibumen:"添加子部门",
+  adm_addbumen:"添加部门",
+  adm_addyuangong:"添加员工",
+  adm_edityuangong:"员工修改",
+  adm_xueli:"学历",
+  adm_rzshijain:"入职时间",
+}
 export const visaT = {
   cxjihua: '出行计划',
   sqneirong:'申请类型',
@@ -1168,17 +1292,5 @@ export const visaT = {
   sqbdh:'申请表编号',
   xzsycl:'下载身元材料',
   xzggbg:'下载归国报告',
-  dccg:'导出成功！'
-}
-
-export const adm={
-  adm_xzbumen:"新增部门",
-  adm_sxjg:"树形结构",
-  adm_fhlb:"返回列表",
-  adm_jggl:"结构管理",
-  adm_addbumen:"添加部门",
-  adm_addzibumen:"添加子部门",
-  adm_addyuangong:"添加部门",
-  adm_edityuangong:"添加员工",
-  adm_rzshijian:"入职时间",
+  dccg:'导出成功！',
 }
\ No newline at end of file

src/router/config.js

@@ -1718,14 +1718,6 @@ export default {
                 title: '团期查询'
               },
             },
-            { // 签证中心 签证财务单据
-              path: '/VisaFinancialDocuments',
-              name: 'VisaFinancialDocuments',
-              component: resolve => require(['@/components/SalesModule/VisaFinancialDocuments'], resolve),
-              meta: {
-                title: '签证财务单据'
-              },
-            },
             { // 签证中心 签证工作表
               path: '/visaWorksheet',
               name: 'visaWorksheet',