diff --git a/.env.development b/.env.development
index 1244d0b..7dc61fc 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
-VITE_BASE_URL=http://localhost:12080/admin-api
+VITE_BASE_URL=http://192.168.0.106:12080/admin-api
VITE_BASE_URL_IMAGE=http://localhost:12080/admin-api
\ No newline at end of file
diff --git a/src/pages/inLocation/addForm.vue b/src/pages/inLocation/addForm.vue
index eebc62c..8014dda 100644
--- a/src/pages/inLocation/addForm.vue
+++ b/src/pages/inLocation/addForm.vue
@@ -93,11 +93,11 @@
-
+
-
@@ -159,6 +159,7 @@
const locationList = ref([])//备件的库位列表
const locationItem = ref('')//备件账内库
const isFocus = ref(false)
+ const msg = ref('')
function submit() {
console.log(form.value)
if (form.value.itemNumbers.length === 0) {
@@ -220,7 +221,7 @@
return;
}
if (!form1.value.itemName) {
- proxy.$modal.showToast('找不到该备件')
+ proxy.$modal.showToast(msg.value)
return;
}
if (!form1.value.locationNumber) {
@@ -265,7 +266,8 @@
function getLocation() {
locationApi.getLocation(form1.value.locationNumber).then(res => {
if (!res.data) {
- proxy.$modal.showToast('找不到该库位')
+ msg.value = res.msg
+ proxy.$modal.showToast(res.msg)
return;
}
locationItem.value = res.data
diff --git a/src/pages/inLocation/index.vue b/src/pages/inLocation/index.vue
index 91a46dd..f59e50a 100644
--- a/src/pages/inLocation/index.vue
+++ b/src/pages/inLocation/index.vue
@@ -19,7 +19,7 @@
采购人:{{item.purchaser}}
- 采购时间:{{item.date}}
+ 采购时间:{{`${item.date[0]}-${item.date[1]>=10?item.date[1]:'0'+item.date[1]}-${item.date[2]>=10?item.date[2]:'0'+item.date[2]}`}}
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 3651178..838fadf 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -14,8 +14,10 @@
- {{store.name}} {{store.post.name}}
- {{store.dept.name}}
+ {{store.name}}
+
+
+
@@ -32,6 +34,17 @@
+
+ 扫码
+
+
+
+
+ 扫码
+
+
+
+
采购入库
@@ -50,7 +63,6 @@
-
diff --git a/src/pages/outLocation/addForm.vue b/src/pages/outLocation/addForm.vue
index e68d95f..046b63a 100644
--- a/src/pages/outLocation/addForm.vue
+++ b/src/pages/outLocation/addForm.vue
@@ -89,7 +89,7 @@