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

src/components/Hotel/reservation/OrderList.vue

@@ -459,7 +459,7 @@
                 v-if="scope.row.OpName&&pagesTitle=='OP'">{{$t('objFill.guanlian')}}OP：{{ scope.row.OpName }}</span>
               <span class="mr" v-if="scope.row.CustomerName">{{$t('active.cl_addPp')}}：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}/{{
               scope.row.CustomerTel
-            }}</span>
+            }})</span>
               <span class="mr">{{$t('restaurant.res_oderTime')}}：{{ scope.row.CreateTime }}</span>
               <div class="">
                 <i class="mx5" :class="{

src/components/SalesModule/MyCustomer.vue

@@ -650,6 +650,11 @@
                 maxlength="20"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
+            <el-form-item label="邮箱" prop="Email">
+              <el-input v-model="addMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id==2">
             <el-form-item :label="$t('pub.area')">
               <el-select class="addMsgSW" filterable v-model='addMsg.Province' @change='getCity'>
@@ -858,6 +863,11 @@
               <el-input v-model='updateMsg.Contact'></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
+            <el-form-item label="邮箱" prop="Email">
+              <el-input v-model="updateMsg.Email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" v-if="updateMsg.customerExceptionList.length > 0">
             <el-form-item label="解决异常">
               <el-select filterable multiple clearable collapse-tags v-model='updateMsg.CustomerExceptionIds'>
@@ -1928,7 +1938,8 @@
           UniqueCode: '',
           LINEID: '',
           Email: '',
-          PlatformUserNameList: []
+          PlatformUserNameList: [],
+         
         }
         this.BusinessCardPhotos = '',
           this.HousePhotos = '',

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"),