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

src/components/administrative/empBankAccount.vue

@@ -147,7 +147,7 @@
           </el-col>
           <el-col :span="4" v-if='addMsg.AccountClassify!=3 && addMsg.AccountClassify!=4' :gutter="35">
 
-            <el-form-item :label="nameA" prop="OpenBankName">
+            <el-form-item :label="addMsg.AccountClassify!=2?nameA:$t('fnc.khuhang')" prop="OpenBankName">
               <el-input type="text" v-model="addMsg.OpenBankName" :placeholder="$t('ground.liruzhihang')"></el-input>
             </el-form-item>
 

src/components/administrative/empBankAccountAll.vue

@@ -512,7 +512,7 @@ export default {
       loading: false,
       accountList: [],
       ClientTypeList: [],
-      nameA: this.$t("ground.zhanghumingcheng2"),
+      nameA: this.$t("fnc.khuhang"),//this.$t("ground.zhanghumingcheng2")
       nameB: this.$t("fnc.khuren"),
       nameC: this.$t("ground.kahao"),
       nameD: this.$t("fnc.accBming"),