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

src/assets/common/lang/zh.js

@@ -883,6 +883,7 @@ export const fnc = {
   jigou: '机构',
   qsrneirong: '请输入内容',
   zhanghuleixing: '账户类型',
+  zhfenlei: '账户分类',
   yueacc: '余额',
   bwbyue: '本位币余额',
   caozuoriqi: '操作日期',
@@ -929,7 +930,12 @@ export const fnc = {
   tjzhanghu: '添加账户',
   sfduigong: '是否对公',
   sybumen: '适用部门：',
-
+  shanghuhao: '商户号',
+  qqdizhi: '请求地址',
+  zfxinxi: '支付信息',
+  shsiyao: '商户私钥',
+  ptgongyao: '平台公钥',
+  banbenhao: '版本号',
 }
 export const tips = {
   tips: '提示',
@@ -979,6 +985,8 @@ export const tips = {
   znengExcel: '只能上传Excel文件，重复的费用类型不会添加哦',
   shangchuanExcel: '上传文件只能是 excel 格式!',
   feiyongleixing: '费用类型？',
+  qxzzhleixing: '请选择账户类型!',
+  dzfpzxxdelete: '的支付信息配置?删除后不可撤回！',
 }
 export const Operation = {
   Op_ShortName:'线路简称',
@@ -1055,4 +1063,13 @@ export const rule = {
   qxzlxcengji: '请选择类型层级',
   qtxzhmingcheng: '请填写账户名称',
   qxzsybumen: '请选择适用部门',
+  qsrshuhao: '请输入商户号',
+  qsrshsyao: '请输入商户私钥',
+  qsrptsiyao: '请输入平台公钥',
+  qsrqqdizhi: '请输入请求地址',
+  qsrbbenhao: '请输入版本号',
+  qxzssgongsi: '请选择所属公司',
+  qxzshleixing: '请选择账户类型',
+  qxzzhfenlei: '请选择账户分类',
+  qxzzhanghu: '请选择账户',
 }

src/components/systemManagement/AccountType.vue

@@ -473,9 +473,9 @@
             isdelete(ID){
                 this.deleteID = ID;
                 this.$confirm(this.$t('tips.shifoushanchu'), this.$t('tips.tips') ,{
-                confirmButtonText: this.$t('pub.sureBtn'),
-                cancelButtonText: this.$t('pub.cancelBtn'),
-                type: 'warning'
+                    confirmButtonText: this.$t('pub.sureBtn'),
+                    cancelButtonText: this.$t('pub.cancelBtn'),
+                    type: 'warning'
                 }).then(() => {
                     this.$message({
                         type: 'success',