From c314f49f565a09c6f5810fc8e37b5c77c424a849 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Thu, 1 Aug 2024 16:39:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/http/request.js | 2 +- src/layout/callEmptyVehicle.vue | 4 +- src/layout/doKitting.vue | 144 +++++++----- src/layout/finishKitting.vue | 109 +++++---- src/layout/goodsIn.vue | 245 ++++++++++---------- src/layout/newConfig.vue | 391 ++++++++++++++++++++++++++++++++ src/layout/sortBoxs.vue | 310 +++++++++++++++++++++++++ src/layout/taskMonitor.vue | 1 - src/layout/vehicle.vue | 6 +- src/router/index.js | 3 +- src/store/index.js | 10 +- src/views/HomeView.vue | 3 +- src/views/login.vue | 1 + 13 files changed, 982 insertions(+), 247 deletions(-) create mode 100644 src/layout/newConfig.vue create mode 100644 src/layout/sortBoxs.vue diff --git a/src/http/request.js b/src/http/request.js index 3d42d7b..2489669 100644 --- a/src/http/request.js +++ b/src/http/request.js @@ -7,7 +7,7 @@ const request = axios.create({ // axios.defaults.baseURL = 'http://192.168.3.254:12315/wms' // axios.defaults.baseURL = 'http://localhost:12315/wms' -// axios.defaults.baseURL = 'http://10.30.9.89:12315/wms' +// axios.defaults.baseURL = 'http://192.168.8.93:12315/wms' // // request 请求器 // // 可以自请求发送前对请求做一些处理 diff --git a/src/layout/callEmptyVehicle.vue b/src/layout/callEmptyVehicle.vue index d269530..302802a 100644 --- a/src/layout/callEmptyVehicle.vue +++ b/src/layout/callEmptyVehicle.vue @@ -343,7 +343,7 @@ export default { .station-div { display: inline-flex; justify-content: center; - width: 125px; + width: 150px; margin-left: 5px; margin-right: 5px; padding: 5px; @@ -359,7 +359,7 @@ export default { .station-no-div { display: inline-flex; justify-content: center; - width: 75px; + width: 200px; padding: 5px; border: 5px double #000000; } diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue index afe1df2..8c62f6e 100644 --- a/src/layout/doKitting.vue +++ b/src/layout/doKitting.vue @@ -31,7 +31,7 @@ 料号
-
@@ -45,26 +45,38 @@ controls-position="right" :min="0" width="200px" disabled />
- {{ workFormEntity.goodsUnit - }} + PC
- +
- {{ workFormEntity.goodsUnit }} + PC
@@ -141,9 +153,9 @@ export default { workFormRef: ref(), workFormEntity: reactive({ goodsId: '', - goodsUnit: '', planPickNum: 0, - actualDifference: 0, + remainNumOrigin: null, + remainNumReal: null, remark: '', finishedRows: 0, totalRows: 0, @@ -159,6 +171,7 @@ export default { } }, mounted() { + this.$refs.goodsId.focus() // this.timer = setInterval(() => { // // this.getAllTasks() // }, 2000) @@ -168,51 +181,51 @@ export default { }, methods: { getCurrentWorkInfo() { - this.workFormEntity = { - goodsId: 'text0001', - goodsUnit: 'PC', - planPickNum: 10, - actualDifference: 0, - remark: '装盒子', - finishedRows: 800, - totalRows: 2500, - finishedCounts: 2500, - totalCounts: 6000, - tip: '' - } - // const request = { - // standId: this.standId, - // goodsId: this.workFormEntity.goodsId + // this.workFormEntity = { + // goodsId: '5678932/CS', + // planPickNum: 10, + // remainNumOrigin: 5, + // remainNumReal: 5, + // remark: '装盒子', + // finishedRows: 800, + // totalRows: 2500, + // finishedCounts: 2500, + // totalCounts: 6000, + // tip: '' // } - // getWorkByStandAndGoods(request).then(res => { - // const response = res.data - // if (response.code == 0) { - // this.workFormEntity.goodsId = response.returnData.goodsId - // this.workFormEntity.goodsUnit = response.returnData.goodsUnit - // this.workFormEntity.planPickNum = response.returnData.planPickNum - // this.workFormEntity.actualDifference = response.returnData.actualDifference - // this.workFormEntity.remark = response.returnData.remark - // this.workFormEntity.finishedRows = response.returnData.finishedRows - // this.workFormEntity.totalRows = response.returnData.totalRows - // this.workFormEntity.finishedCounts = response.returnData.finishedCounts - // this.workFormEntity.totalCounts = response.returnData.totalCounts - // this.workFormEntity.tip = response.returnData.tip - // } else { - // this.resetForms() - // ElMessage.error(response.message) - // } - // }).catch(err => { - // console.log(err) - // this.resetForms() - // ElMessage.error('查询工作信息错误') - // }) + const request = { + standId: this.standId, + goodsId: this.workFormEntity.goodsId + } + getWorkByStandAndGoods(request).then(res => { + const response = res.data + if (response.code == 0) { + this.workFormEntity.goodsId = response.returnData.goodsId + this.workFormEntity.planPickNum = response.returnData.planPickNum + this.workFormEntity.remainNumOrigin = response.returnData.remainNumOrigin + this.workFormEntity.remainNumReal = response.returnData.remainNumReal + this.workFormEntity.remark = response.returnData.remark + this.workFormEntity.finishedRows = response.returnData.finishedRows + this.workFormEntity.totalRows = response.returnData.totalRows + this.workFormEntity.finishedCounts = response.returnData.finishedCounts + this.workFormEntity.totalCounts = response.returnData.totalCounts + this.workFormEntity.tip = response.returnData.tip + } else { + this.resetForms() + ElMessage.error(response.message) + } + }).catch(err => { + console.log(err) + this.resetForms() + ElMessage.error('查询工作信息错误') + }) }, resetForms() { this.workFormEntity = reactive({ goodsId: '', - goodsUnit: '', planPickNum: 0, - actualDifference: 0, + remainNumOrigin: null, + remainNumReal: null, remark: '', finishedRows: 0, totalRows: 0, @@ -232,7 +245,8 @@ export default { const confirmParams = { standId: this.standId, goodsId: this.workFormEntity.goodsId, - actualDifference: this.workFormEntity.actualDifference + remainNumOrigin: this.workFormEntity.remainNumOrigin, + remainNumReal: this.workFormEntity.remainNumReal } confirmFinishWork(confirmParams).then(res => { const response = res.data @@ -242,6 +256,7 @@ export default { type: 'success', }) this.resetForms() + this.$refs.goodsId.focus() } else { ElMessage.error(response.message) } @@ -307,16 +322,27 @@ export default { } :deep(.el-input) { + width: 195px; height: 130px; font-size: 25px; } :deep(.el-input-number) { - width: 300px; + width: 125px; height: 130px; font-size: 25px; } +/* :deep(.el-input .el-input__inner) { + font-size: 60px; + height: 130px; +} + +:deep(.el-input-number .el-input__inner) { + font-size: 60px; + height: 130px; +} */ + .title-div { display: inline-flex; width: -webkit-fill-available; @@ -334,7 +360,7 @@ export default { .station-div { display: inline-flex; justify-content: center; - width: 125px; + width: 150px; margin-left: 5px; margin-right: 5px; padding: 5px; @@ -350,7 +376,7 @@ export default { .station-no-div { display: inline-flex; justify-content: center; - width: 75px; + width: 200px; padding: 5px; border: 5px double #000000; } @@ -364,7 +390,7 @@ export default { .display-title-div { display: inline-flex; justify-content: center; - width: 430px; + width: 205px; height: 80px; margin: 5px; padding: 5px; @@ -380,7 +406,7 @@ export default { .display-form-div { display: inline-flex; justify-content: center; - width: 420px; + width: 195px; margin: 5px; padding: 5px; border: 5px double #000000; @@ -390,7 +416,7 @@ export default { .display-form-div-left { display: inline-flex; justify-content: center; - width: 300px; + width: 125px; margin: 5px; padding: 5px; border: 5px double #000000; @@ -399,7 +425,7 @@ export default { .display-form-div-right { display: inline-flex; justify-content: center; - width: 100px; + width: 50px; margin: 5px; padding: 5px; background-color: #CCCCCC; diff --git a/src/layout/finishKitting.vue b/src/layout/finishKitting.vue index 93eaf51..2943a81 100644 --- a/src/layout/finishKitting.vue +++ b/src/layout/finishKitting.vue @@ -25,7 +25,7 @@
+ style="display: inline-flex; justify-content: center; height: 60px; width: 700px; margin: 5px; padding: 5px; background-color: #00AAE8;"> {{ workFormEntity.tip }} @@ -87,13 +87,19 @@ 备注
+ style="display: inline-flex; justify-content: center; width: 520px; margin: 5px; padding: 5px; background-color: #00AAE8;"> {{ workFormEntity.remark }}
+
+
+ 打印标签 +
+
{ - // const response = res.data - // if (response.code == 0) { - // this.workFormEntity.tip = response.returnData.tip - // this.workFormEntity.remark = response.returnData.remark - // this.workFormEntity.planRows = response.returnData.planRows - // this.workFormEntity.actualRows = response.returnData.actualRows - // this.workFormEntity.planCounts = response.returnData.planCounts - // this.workFormEntity.actualCounts = response.returnData.actualCounts - // } else { - // this.resetForms() - // } - // }).catch(err => { - // console.log(err) - // this.resetForms() - // ElMessage.error('查询工作信息错误') - // }) + getFinishedWorkInfo(request).then(res => { + const response = res.data + if (response.code == 0) { + this.workFormEntity.tip = response.returnData.tip + this.workFormEntity.remark = response.returnData.remark + this.workFormEntity.planRows = response.returnData.planRows + this.workFormEntity.actualRows = response.returnData.actualRows + this.workFormEntity.planCounts = response.returnData.planCounts + this.workFormEntity.actualCounts = response.returnData.actualCounts + } else { + this.resetForms() + } + }).catch(err => { + console.log(err) + this.resetForms() + ElMessage.error('查询工作信息错误') + }) }, resetForms() { this.workFormEntity = reactive({ @@ -191,31 +189,32 @@ export default { }) }, confirmWork() { - if (formData.standId == '') { - ElMessage({ - message: '站台号不可缺少', - type: 'error', - }) - return - } - const confirmParams = { - standId: this.standId, - } - confirmFinishedWork(confirmParams).then(res => { - const response = res.data - if (response.code == 0) { - ElMessage({ - message: response.message, - type: 'success', - }) - this.resetForms() - } else { - ElMessage.error(response.message) - } - }).catch(err => { - console.log(err) - ElMessage.error('确认时发生异常') + console.log('完成确认') + if (this.standId == '') { + ElMessage({ + message: '站台号不可缺少', + type: 'error', }) + return + } + const confirmParams = { + standId: this.standId, + } + confirmFinishedWork(confirmParams).then(res => { + const response = res.data + if (response.code == 0) { + ElMessage({ + message: response.message, + type: 'success', + }) + this.resetForms() + } else { + ElMessage.error(response.message) + } + }).catch(err => { + console.log(err) + ElMessage.error('确认时发生异常') + }) } } } @@ -300,7 +299,7 @@ export default { .station-div { display: inline-flex; justify-content: center; - width: 125px; + width: 150px; margin-left: 5px; margin-right: 5px; padding: 5px; @@ -316,7 +315,7 @@ export default { .station-no-div { display: inline-flex; justify-content: center; - width: 75px; + width: 200px; padding: 5px; border: 5px double #000000; } diff --git a/src/layout/goodsIn.vue b/src/layout/goodsIn.vue index c51e869..20b799f 100644 --- a/src/layout/goodsIn.vue +++ b/src/layout/goodsIn.vue @@ -24,15 +24,23 @@ label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
-
{{ workFormEntity.tip }}
+
+
+ 箱号 +
+
+ +
+
料号
- +
@@ -41,34 +49,48 @@
- +
- 个 + PC
-
-
- 箱号 -
-
- -
-
+
完成确认 + style="margin-left: 25px; align-self: center; font-weight: bold;font-size: 45px; writing-mode: vertical-lr;">绑定完成
+
+ + 已绑定物料 + + + + + + + + + +
@@ -76,7 +98,7 @@ + + + \ No newline at end of file diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue new file mode 100644 index 0000000..a54b153 --- /dev/null +++ b/src/layout/sortBoxs.vue @@ -0,0 +1,310 @@ + + + + + + + \ No newline at end of file diff --git a/src/layout/taskMonitor.vue b/src/layout/taskMonitor.vue index 001736a..cf7778b 100644 --- a/src/layout/taskMonitor.vue +++ b/src/layout/taskMonitor.vue @@ -1,4 +1,3 @@ -