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

src/components/Hotel/roomReservationsDetails.vue

@@ -24,7 +24,7 @@
           <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
           <input v-if="IsOperation==1&&(CurrentUserInfo.EmployeeId==615||CurrentUserInfo.EmployeeId==46)" type="button" class="fr normalBtn mb30"
             :value="$t('pub.saveBtn')" @click="saveList(1)" />
-          <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('gorund.yizhidanbng')}}</span>
+          <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
         </li>
       </ul>
       {{$t('ground.jisuan1')}} <br />
@@ -144,7 +144,7 @@
                     </td>
                     <td>
                       <el-select class='w120 sel' v-model='subItem.SupplierId' @change="getSupplierShoupei(subItem)"
-                        filterable :placeholder="$t('gorund.qingxuanzegys')">
+                        filterable :placeholder="$t('ground.qingxuanzegys')">
                         <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                         <el-option v-for="(SupplierItem,Supplierindex) in SupplierList" :key="Supplierindex"
                           :label="SupplierItem.Name" :value="SupplierItem.ID">
@@ -445,7 +445,7 @@
                     <td>
                       <el-select class='w135 sel' v-model='subItem.IsSyncHotelCount'>
                         <el-option :label="$t('ground.tongbugx')" :value='0'></el-option>
-                        <el-option :label="$t('gorund.bugengxin')" :value='1'></el-option>
+                        <el-option :label="$t('ground.bugengxin')" :value='1'></el-option>
                       </el-select>
                     </td>
                   </tr>