From c33de5c5026f221b2a7793486bcc36fc992e2731 Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Wed, 10 Dec 2025 14:50:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E7=9B=98=E7=82=B9=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=AB=99=E5=8F=B0?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B=202.=20=E5=BB=B6=E9=95=BF?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E8=87=B3?= =?UTF-8?q?60=E7=A7=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 93 ++++++++++++++++++++++++++++++++++++---- package.json | 1 + src/api/kateLogin.js | 2 +- src/http/request.js | 2 +- src/layout/inventory.vue | 2 + 5 files changed, 89 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 10682f9..48e034e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,6 +25,7 @@ "vue-router": "^4.0.3", "vue3-print-nb": "^0.1.4", "vuex": "^4.0.0", + "worker-loader": "^3.0.8", "xlsx": "^0.18.5" }, "devDependencies": { @@ -3929,7 +3930,6 @@ "version": "5.2.2", "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, "engines": { "node": "*" } @@ -5578,7 +5578,6 @@ "version": "3.0.0", "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz", "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, "engines": { "node": ">= 4" } @@ -7453,7 +7452,6 @@ "version": "2.2.1", "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "dev": true, "bin": { "json5": "lib/cli.js" }, @@ -12020,6 +12018,55 @@ "node": ">=0.10.0" } }, + "node_modules/worker-loader": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", + "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", + "dependencies": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/worker-loader/node_modules/loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" + } + }, + "node_modules/worker-loader/node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -15053,8 +15100,7 @@ "big.js": { "version": "5.2.2", "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, "binary-extensions": { "version": "2.2.0", @@ -16409,8 +16455,7 @@ "emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==" }, "encode-utf8": { "version": "1.0.3", @@ -17914,8 +17959,7 @@ "json5": { "version": "2.2.1", "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", - "dev": true + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" }, "jsonfile": { "version": "6.1.0", @@ -21501,6 +21545,37 @@ "dev": true, "peer": true }, + "worker-loader": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-3.0.8.tgz", + "integrity": "sha512-XQyQkIFeRVC7f7uRhFdNMe/iJOdO6zxAaR3EWbDp45v3mDhrTi+++oswKNxShUNjPC/1xUp5DB29YKLhFo129g==", + "requires": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz", diff --git a/package.json b/package.json index 5b88500..a6924ad 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "vue-router": "^4.0.3", "vue3-print-nb": "^0.1.4", "vuex": "^4.0.0", + "worker-loader": "^3.0.8", "xlsx": "^0.18.5" }, "devDependencies": { diff --git a/src/api/kateLogin.js b/src/api/kateLogin.js index 099e741..073c4fa 100644 --- a/src/api/kateLogin.js +++ b/src/api/kateLogin.js @@ -1,6 +1,6 @@ import axios from "axios"; axios.defaults.baseURL = 'https://login.microsoftonline.com/caterpillar.onmicrosoft.com' -axios.defaults.timeout = 50000; +axios.defaults.timeout = 60000; // axios.defaults.withCredentials = true const postToGetToken = (params) => { diff --git a/src/http/request.js b/src/http/request.js index 3597aba..25f7b63 100644 --- a/src/http/request.js +++ b/src/http/request.js @@ -2,7 +2,7 @@ import axios from 'axios' const request = axios.create({ baseURL: 'https://csclasrs.ecorp.cat.com/wmsServer/wms', - timeout: 10000 + timeout: 60000 }) // axios.defaults.baseURL = 'http://10.90.36.70:443/wmsServer/wms' diff --git a/src/layout/inventory.vue b/src/layout/inventory.vue index 51a5d1d..94fa78e 100644 --- a/src/layout/inventory.vue +++ b/src/layout/inventory.vue @@ -226,6 +226,7 @@ export default { const request = { goodsId: this.workFormEntity.goodsId, vehicleId: this.confirmFormEntity.vehicleId, + standId: this.standId, userName: store.getters.getUserName } inventoryOut(request).then(res => { @@ -258,6 +259,7 @@ export default { vehicleId: this.confirmFormEntity.vehicleId, confirmNum: this.confirmFormEntity.confirmNum, invIndex: this.invIndexMap.get(invKey), + standId: this.standId, userName: store.getters.getUserName } inventoryConfirmBack(confirmParams).then(res => {