From f68efe6a96be6989326f8d40ae6a4e45b9050a17 Mon Sep 17 00:00:00 2001 From: zwq Date: Thu, 2 Nov 2023 13:35:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 7 +-- .env.prod | 7 +++ src/api/asrs/warehouseStorehouse.js | 10 +++- .../Verifition/Verify/VerifyPoints.vue | 4 +- .../Verifition/Verify/VerifySlide.vue | 4 +- src/views/asrs/inventoryOverview/index.vue | 7 ++- src/views/asrs/inventoryOverview/indexb.vue | 7 ++- src/views/asrs/jobMainTask/index.vue | 18 +++---- src/views/asrs/jobMainTaskHistory/index.vue | 34 ++++++------ src/views/asrs/mixins/code-filter.js | 9 ++-- .../warehouseLocationMonitoring/index.vue | 12 ++--- .../warehouseLocationMonitoring/indexb.vue | 12 ++--- .../index.vue | 1 + .../add-or-updata.vue | 54 ++++++++++--------- .../out-or-move.vue | 41 ++++++++++++-- .../index.vue | 4 +- .../indexb.vue | 4 +- .../fpw/finishInventoryOverview/index.vue | 7 ++- 18 files changed, 154 insertions(+), 88 deletions(-) diff --git a/.env.dev b/.env.dev index 7d8648e..ac71a0d 100644 --- a/.env.dev +++ b/.env.dev @@ -2,7 +2,7 @@ # @Author: zwq # @Date: 2023-08-17 15:10:53 # @LastEditors: zwq - # @LastEditTime: 2023-10-25 13:59:56 + # @LastEditTime: 2023-11-02 10:02:06 # @Description: ### # 开发环境配置 @@ -12,8 +12,9 @@ ENV = 'development' VUE_APP_TITLE = 南京锂膜管理系统 # 南京锂膜管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.1.23:48080' -# VUE_APP_BASE_API = 'http://192.168.0.31:48081' +# VUE_APP_BASE_API = 'http://192.168.1.23:48080' +VUE_APP_BASE_API = 'http://192.168.0.31:48081' +# VUE_APP_BASE_API = 'http://192.168.1.26:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.prod b/.env.prod index d55df0f..813d8ca 100644 --- a/.env.prod +++ b/.env.prod @@ -1,3 +1,10 @@ +### + # @Author: zwq + # @Date: 2023-08-17 15:10:53 + # @LastEditors: zwq + # @LastEditTime: 2023-11-02 11:20:37 + # @Description: +### # 生产环境配置 ENV = 'production' diff --git a/src/api/asrs/warehouseStorehouse.js b/src/api/asrs/warehouseStorehouse.js index febcc4c..b8b1ba8 100644 --- a/src/api/asrs/warehouseStorehouse.js +++ b/src/api/asrs/warehouseStorehouse.js @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-22 15:31:37 * @LastEditors: zwq - * @LastEditTime: 2023-10-20 15:16:19 + * @LastEditTime: 2023-10-31 09:48:35 * @Description: */ import request from '@/utils/request' @@ -32,6 +32,14 @@ export function inWarehouseStorehouse(data) { data: data }) } +// 手动出库 +export function outWarehouseStorehouse(data) { + return request({ + url: '/asrs/warehouse-storehouse/out', + method: 'post', + data: data + }) +} // 删除立库库位 export function deleteWarehouseStorehouse(id) { return request({ diff --git a/src/components/Verifition/Verify/VerifyPoints.vue b/src/components/Verifition/Verify/VerifyPoints.vue index 58c20c9..e0625a4 100644 --- a/src/components/Verifition/Verify/VerifyPoints.vue +++ b/src/components/Verifition/Verify/VerifyPoints.vue @@ -151,7 +151,7 @@ export default { this.fontPos.splice(0, this.fontPos.length) this.checkPosArr.splice(0, this.checkPosArr.length) this.num = 1 - this.getPictrue() + //this.getPictrue() this.$nextTick(() => { this.setSize = this.resetSize(this) // 重新设置宽度高度 this.$parent.$emit('ready', this) @@ -222,7 +222,7 @@ export default { this.fontPos.splice(0, this.fontPos.length) this.checkPosArr.splice(0, this.checkPosArr.length) this.num = 1 - this.getPictrue() + //this.getPictrue() this.showRefresh = true }, diff --git a/src/components/Verifition/Verify/VerifySlide.vue b/src/components/Verifition/Verify/VerifySlide.vue index a1cac7d..474a845 100644 --- a/src/components/Verifition/Verify/VerifySlide.vue +++ b/src/components/Verifition/Verify/VerifySlide.vue @@ -184,7 +184,7 @@ export default { methods: { init() { this.text = this.explain - this.getPictrue() + //this.getPictrue() this.$nextTick(() => { const setSize = this.resetSize(this) // 重新设置宽度高度 for (const key in setSize) { @@ -344,7 +344,7 @@ export default { this.iconClass = 'icon-right' this.isEnd = false - this.getPictrue() + //this.getPictrue() setTimeout(() => { this.transitionWidth = '' this.transitionLeft = '' diff --git a/src/views/asrs/inventoryOverview/index.vue b/src/views/asrs/inventoryOverview/index.vue index eb9b0da..344cb54 100644 --- a/src/views/asrs/inventoryOverview/index.vue +++ b/src/views/asrs/inventoryOverview/index.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2023-08-22 15:01:54 * @LastEditors: zwq - * @LastEditTime: 2023-10-13 14:30:24 + * @LastEditTime: 2023-10-31 11:20:46 * @Description: -->