diff --git a/src/api/task.js b/src/api/task.js
index 1a70d50..e3dedcd 100644
--- a/src/api/task.js
+++ b/src/api/task.js
@@ -68,7 +68,8 @@ const getWorkByStandAndGoods = (params) => {
return request({
url: '/task/getWorkByStandAndGoods',
method: 'post',
- data: params
+ data: params,
+ timeout: 10000
})
}
@@ -148,6 +149,15 @@ const requestSortBox = (params) => {
return request({
url: '/task/requestSortBox',
method: 'post',
+ data: params,
+ timeout: 10000
+ })
+}
+
+const requestSumOfBox = (params) => {
+ return request({
+ url: '/task/requestSumOfBox',
+ method: 'post',
data: params
})
}
@@ -211,6 +221,7 @@ export {
requestInTest,
requestPrintData,
requestSortBox,
+ requestSumOfBox,
getPickTasksByPage,
deletePickTasks,
updatePickTasks,
diff --git a/src/http/request.js b/src/http/request.js
index f931042..140e628 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -1,7 +1,7 @@
import axios from 'axios'
const request = axios.create({
- baseURL: 'http://localhost:12315/wms',
+ baseURL: 'http://10.90.36.70:443/wmsServer/wms',
timeout: 5000
})
diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue
index 419a22a..c1b2382 100644
--- a/src/layout/clcNoPlan.vue
+++ b/src/layout/clcNoPlan.vue
@@ -31,7 +31,7 @@
+ v-on:keyup.enter="getStockNumOfGoodsIdMethod()" clearable>
diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue
index 5f5d3aa..49bbb33 100644
--- a/src/layout/goodsIn.vue
+++ b/src/layout/goodsIn.vue
@@ -103,6 +103,7 @@ import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
import { reactive, ref } from 'vue'
import { errorBox } from '@/utils/myMessageBox.js'
import { ElMessage, ElMessageBox } from 'element-plus'
+import loading from '@/utils/loading.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
@@ -254,7 +255,9 @@ export default {
}
},
confirmTask() {
+ loading.open('处理中,请稍等...')
if (this.currentVehicleId == '') {
+ loading.close()
errorBox('必须输入料箱号')
return
}
@@ -264,6 +267,7 @@ export default {
goodsList: this.tempTasks.length > 0 ? this.tempTasks : [],
}
sendGoodsInTask(request).then(res => {
+ loading.close()
const response = res.data
if (response.code == 0) {
ElMessage.success('入库确认成功。')
@@ -275,6 +279,7 @@ export default {
errorBox(response.message)
}
}).catch(err => {
+ loading.close()
console.log(err)
errorBox('入库处理异常')
})
diff --git a/src/layout/goodsInQR.vue b/src/layout/goodsInQR.vue
index 36342b7..e3d5937 100644
--- a/src/layout/goodsInQR.vue
+++ b/src/layout/goodsInQR.vue
@@ -112,6 +112,7 @@ import { replaceEnglishAndNumberIGAI } from '@/utils/formatter'
import { reactive, ref } from 'vue'
import { errorBox } from '@/utils/myMessageBox.js'
import { ElMessage, ElMessageBox } from 'element-plus'
+import loading from '@/utils/loading.js'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
@@ -266,7 +267,9 @@ export default {
}
},
confirmTask() {
+ loading.open('处理中,请稍等...')
if (this.currentVehicleId == '') {
+ loading.close()
errorBox('必须输入料箱号')
return
}
@@ -276,6 +279,7 @@ export default {
goodsList: this.tempTasks.length > 0 ? this.tempTasks : [],
}
sendGoodsInTask(request).then(res => {
+ loading.close()
const response = res.data
if (response.code == 0) {
ElMessage.success('入库确认成功。')
@@ -287,6 +291,7 @@ export default {
errorBox(response.message)
}
}).catch(err => {
+ loading.close()
console.log(err)
errorBox('入库处理异常')
})
diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue
index 3a47fdf..0a1799d 100644
--- a/src/layout/sortBoxs.vue
+++ b/src/layout/sortBoxs.vue
@@ -31,18 +31,28 @@
大盒子
-
+
+
+
+ 当前盒子序号
+ controls-position="right" :min="0" :max="workFormEntity.sumOfOrders" clearable />
@@ -64,7 +74,7 @@