From 0c5f55649bd2d471c520a0c60f2ac2bbe538ea00 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Fri, 2 Aug 2024 23:10:15 +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/api/config.js | 9 +- src/api/task.js | 11 +- src/layout/doKitting.vue | 61 ++++--- src/layout/newConfig.vue | 335 ++++++++++++--------------------------- src/utils/formatter.js | 18 +-- 5 files changed, 162 insertions(+), 272 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 01dae2d..73e8a9a 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -8,12 +8,16 @@ const updateConfig = (params) => { return request.post('/config/updateConfig', params) } +const getConfigsByPage = (params) => { + return request.post('/config/getConfigsByPage', params) +} + const restartSystem = (params) => { return request({ url: '/system/restartSystem', method: 'post', data: params, - timeout: 5000 + timeout: 10000 }) } @@ -22,12 +26,13 @@ const reloadConfig = (params) => { url: '/system/reloadConfig', method: 'post', data: params, - timeout: 5000 + timeout: 10000 }) } export { getConfigs, + getConfigsByPage, updateConfig, restartSystem, reloadConfig diff --git a/src/api/task.js b/src/api/task.js index 691bd31..e89aaa3 100644 --- a/src/api/task.js +++ b/src/api/task.js @@ -104,6 +104,14 @@ const callEmptyVehicle = (params) => { }) } +const queryFinishByStandAndGoods = (params) => { + return request({ + url: '/task/queryFinishByStandAndGoods', + method: 'post', + data: params + }) +} + export { sendGoodsInTask, sendGoodsOutTask, @@ -117,5 +125,6 @@ export { confirmFinishedWork, confirmFinishWork, getFinishedWorkInfo, - callEmptyVehicle + callEmptyVehicle, + queryFinishByStandAndGoods } \ No newline at end of file diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue index 8c62f6e..c4846c7 100644 --- a/src/layout/doKitting.vue +++ b/src/layout/doKitting.vue @@ -24,7 +24,7 @@ label-width="150px" style="max-width: 100%" :rules="rules" status-icon>
-
{{ workFormEntity.tip }}
+
{{ workFormEntity.tip }}
@@ -136,7 +136,7 @@