diff --git a/manifest.json b/manifest.json
index 7902f8e..7087ac8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "MES",
     "appid" : "__UNI__66F7FE2",
     "description" : "",
-    "versionName" : "2.4.2",
-    "versionCode" : 242,
+    "versionName" : "2.4.3",
+    "versionCode" : 243,
     "transformPx" : false,
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pages/login.vue b/pages/login.vue
index 8af9bd0..0803ae6 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -8,15 +8,15 @@
 		<view class="login-form-content">
 			<view class="input-item flex align-center">
 				<view class="iconfont icon-user icon"></view>
-				<input v-model="loginForm.username" class="input" type="text" placeholder="请输入账号" maxlength="30" />
+				<input v-model="loginForm.username" @confirm="handleLogin" class="input" type="text" placeholder="请输入账号" maxlength="30" />
 			</view>
 			<view class="input-item flex align-center">
 				<view class="iconfont icon-password icon"></view>
-				<input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
+				<input v-model="loginForm.password" @confirm="handleLogin" type="password" class="input" placeholder="请输入密码" maxlength="20" />
 			</view>
 			<view class="input-item flex align-center" style="margin: 20px auto 0;" v-if="captchaEnabled">
 				<view class="iconfont icon-code icon"></view>
-				<input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+				<input v-model="loginForm.code" @confirm="handleLogin" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
 				<image :src="codeUrl" @click="getCode" class="login-code-img"></image>
 			</view>
 			<!-- <u-cell-group :border="false">
@@ -252,6 +252,10 @@
 					uni.removeStorageSync('HBusername');
 					uni.removeStorageSync('HBpassword');
 				}
+				this.$store.dispatch("GetAreaOptions");
+				this.$store.dispatch("GetShelvesOptions");
+				this.$store.dispatch("GetLocationOptions");
+				this.$store.dispatch("GetWarehouseOptions");
 				this.$store.dispatch('GetInfo').then(res => {
 					// this.$tab.redirectTo('/pages/work/esop')
 					// if (this.typeTitle == '常用功能') {
diff --git a/pages/wms/purchase/purchaseListing.vue b/pages/wms/purchase/purchaseListing.vue
index e63fdc0..082eb2f 100644
--- a/pages/wms/purchase/purchaseListing.vue
+++ b/pages/wms/purchase/purchaseListing.vue
@@ -385,7 +385,7 @@
 					let warehouseObj = _this.$store.getters.warehouseOptions.find(item => item.warehouseCode == whCode);
 					if (!warehouseObj) {
 						_this.checkStorageLocationBarcode = false;
-						_this.$modal.msg("货架不存在！");
+						_this.$modal.msg("仓库不存在！");
 						return;
 					}
 					if (areaCode) {