From c4b8f5eeb47dfaa1b02f4eee861832759c82187d Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Thu, 13 Nov 2025 16:14:17 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BA=93=E5=AD=98=E7=8A=B6=E6=80=81=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/stock.vue | 1144 +++++++++++++++++++++--------------------- 1 file changed, 575 insertions(+), 569 deletions(-) diff --git a/src/layout/stock.vue b/src/layout/stock.vue index 810c9de..fdc6f82 100644 --- a/src/layout/stock.vue +++ b/src/layout/stock.vue @@ -1,634 +1,640 @@ \ No newline at end of file From c5c53f30d57a0867e9b14d9ac89d51623d39372c Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Mon, 24 Nov 2025 14:31:44 +0800 Subject: [PATCH 2/8] =?UTF-8?q?1.=20=E7=9B=98=E7=82=B9=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=89=A9=E6=96=99=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=88=A4=E6=96=AD=EF=BC=9B=202.=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=8C=87=E7=A4=BA=E5=99=A8=EF=BC=8C1/3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/goods.vue | 833 ++++++++++++++++++++------------------- src/layout/inventory.vue | 753 ++++++++++++++++++----------------- 2 files changed, 820 insertions(+), 766 deletions(-) diff --git a/src/layout/goods.vue b/src/layout/goods.vue index 620ac40..b05d86d 100644 --- a/src/layout/goods.vue +++ b/src/layout/goods.vue @@ -1,448 +1,491 @@ \ No newline at end of file diff --git a/src/layout/inventory.vue b/src/layout/inventory.vue index 1a67af2..51a5d1d 100644 --- a/src/layout/inventory.vue +++ b/src/layout/inventory.vue @@ -1,349 +1,360 @@ \ No newline at end of file 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 3/8] =?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 => { From b64ff96b7bdb08fde1aa2bc58a80c12d0cf0c36f Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Thu, 25 Dec 2025 14:05:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/callEmptyVehicle.vue | 19 +- src/layout/goods.vue | 20 +- src/layout/kateOrdersTable.vue | 736 +++++++++++++++++--------------- src/layout/vehicle.vue | 673 +++++++++++++++-------------- 4 files changed, 745 insertions(+), 703 deletions(-) diff --git a/src/layout/callEmptyVehicle.vue b/src/layout/callEmptyVehicle.vue index ce8887c..d261a3a 100644 --- a/src/layout/callEmptyVehicle.vue +++ b/src/layout/callEmptyVehicle.vue @@ -104,7 +104,6 @@ export default { standId: store.getters.getStandId, displayGoods: false,// 是否显示料号输入 // displayVehicleType1Selection: false,// 是否显示料箱类型选择 - // timer: '', labelPosition: 'top', workFormRef: ref(), workFormEntity: reactive({ @@ -131,21 +130,9 @@ export default { ] } }, - mounted() { - // this.timer = setInterval(() => { - // // this.getAllTasks() - // }, 2000) - }, - beforeUnmount() { - // clearInterval(this.timer) - }, methods: { vehicleType2ChangeHandle() { - if (this.workFormEntity.vehicleType2 == '间接物料') { - this.displayGoods = true - } else { - this.displayGoods = false - } + this.displayGoods = this.workFormEntity.vehicleType2 === '间接物料'; }, resetForms() { this.workFormEntity = reactive({ @@ -156,7 +143,7 @@ export default { }) }, confirmTask() { - if (this.workFormEntity.vehicleType2 == '') { + if (this.workFormEntity.vehicleType2 === '') { errorBox('请选择物料种类') return } @@ -173,7 +160,7 @@ export default { } callEmptyVehicle(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { ElMessage.success(response.message) this.resetForms() } else { diff --git a/src/layout/goods.vue b/src/layout/goods.vue index b05d86d..cd22077 100644 --- a/src/layout/goods.vue +++ b/src/layout/goods.vue @@ -5,6 +5,8 @@ + 搜索 重置 @@ -248,6 +250,7 @@ export default { pageSize: 10, total: 0, goodsIdQuery: '', + vehicleTypeQuery: '', loading: true, dialogVisible: false, uploadDialogVisible: false, @@ -255,7 +258,21 @@ export default { goodsFormEntity: reactive({}), labelPosition: 'top', goodsFormRef: ref(), - rules: reactive({}) + rules: reactive({}), + vehicleTypeOptions: [ + { + value: "", + label: '全部' + }, + { + value: "直接物料", + label: '直接物料' + }, + { + value: "间接物料", + label: '间接物料' + } + ], } }, mounted() { @@ -282,6 +299,7 @@ export default { pageNo: this.currentPage, pageSize: this.pageSize, goodsId: this.goodsIdQuery.trim(), + goodsType: this.vehicleTypeQuery.trim(), userName: store.getters.getUserName } getGoodsInfoByPage(request).then(res => { diff --git a/src/layout/kateOrdersTable.vue b/src/layout/kateOrdersTable.vue index fd79860..643d632 100755 --- a/src/layout/kateOrdersTable.vue +++ b/src/layout/kateOrdersTable.vue @@ -1,406 +1,432 @@ \ No newline at end of file diff --git a/src/layout/vehicle.vue b/src/layout/vehicle.vue index 410c465..f418a1f 100644 --- a/src/layout/vehicle.vue +++ b/src/layout/vehicle.vue @@ -1,384 +1,395 @@ \ No newline at end of file From 6f29427894e117b41c8b6a589fb55f0ac298f739 Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Thu, 8 Jan 2026 17:03:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E7=9A=84=E6=98=BE=E7=A4=BA=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=EF=BC=9B=202.=20=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=88=9B=E5=BB=BA=E4=B8=8E=E5=88=86=E9=85=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/stand.js | 20 +- src/layout/standSettings.vue | 46 ++++ src/layout/workDateTable.vue | 366 ++++++++++++++++++++++++++ src/layout/workSummary.vue | 491 ++++++++++++++++++----------------- src/router/index.js | 2 +- 5 files changed, 679 insertions(+), 246 deletions(-) create mode 100755 src/layout/workDateTable.vue diff --git a/src/api/stand.js b/src/api/stand.js index 9deb18d..dc1c9f2 100644 --- a/src/api/stand.js +++ b/src/api/stand.js @@ -16,7 +16,25 @@ const updateStandInfo = (params) => { }) } +const switchToCreate = (params) => { + return request({ + url: '/stand/switchToCreate', + method: 'post', + data: params + }) +} + +const switchToDistribute = (params) => { + return request({ + url: '/stand/switchToDistribute', + method: 'post', + data: params + }) +} + export { getStandsByPage, - updateStandInfo + updateStandInfo, + switchToCreate, + switchToDistribute } \ No newline at end of file diff --git a/src/layout/standSettings.vue b/src/layout/standSettings.vue index 2dffe82..969b91b 100644 --- a/src/layout/standSettings.vue +++ b/src/layout/standSettings.vue @@ -13,6 +13,8 @@ placeholder="是否允许平地机" :options="yesOrNoOptions" @change="search()"> 搜索 重置 + 一键切换创建工作 + 一键切换分配工作
@@ -156,6 +158,10 @@ import {Search} from '@element-plus/icons-vue' import zhCn from 'element-plus/dist/locale/zh-cn.mjs' + + + \ No newline at end of file diff --git a/src/layout/workSummary.vue b/src/layout/workSummary.vue index 73cb86e..f3d611c 100644 --- a/src/layout/workSummary.vue +++ b/src/layout/workSummary.vue @@ -1,306 +1,309 @@ \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index ac7696b..eb92efa 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -44,7 +44,7 @@ const routes = [ { path: '/stockUpdateRecord', component: () => import('@/layout/stockUpdateRecord.vue') },// 库存更新记录 { path: '/roleUser', component: () => import('@/layout/role_user.vue') },// 角色——用户列表 { path: '/rolePermission', component: () => import('@/layout/role_permission.vue') },// 角色——权限列表 - + { path: '/workDateTable', component: () => import('@/layout/workDateTable.vue') },// 工作日历 ] }, { From b159388557ff187845b5377c447fff5ae16ff563 Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Fri, 9 Jan 2026 15:26:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=9A=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=8E=86=EF=BC=8C=E5=BA=93?= =?UTF-8?q?=E5=AD=98=EF=BC=88=E7=9B=98=E7=82=B9=E7=94=A8=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/excel.js | 13 +- src/api/kateWork.js | 193 ++++++------ src/layout/dbsTable.vue | 41 +-- src/layout/kateOrdersTable.vue | 52 +++- src/layout/stockForInv.vue | 518 +++++++++++++++++++++++++++++++++ src/layout/workDateTable.vue | 138 ++++----- src/router/index.js | 1 + src/utils/formatter.js | 12 +- 8 files changed, 762 insertions(+), 206 deletions(-) create mode 100644 src/layout/stockForInv.vue diff --git a/src/api/excel.js b/src/api/excel.js index 42490f2..16c887a 100644 --- a/src/api/excel.js +++ b/src/api/excel.js @@ -198,6 +198,16 @@ const downloadWorkFlowExcel = (data) => { }) } +const downloadKateOrdersExcel = (data) => { + return request({ + url: '/excel/downloadKateOrdersExcel', + method: 'post', + responseType: 'blob', + data: data, + timeout: 600000 + }) +} + export { uploadExcelStock, uploadExcelGoods, @@ -219,5 +229,6 @@ export { uploadExcelKanban, uploadWorkFlow, uploadExcelWorkDate, - downloadWorkFlowExcel + downloadWorkFlowExcel, + downloadKateOrdersExcel } \ No newline at end of file diff --git a/src/api/kateWork.js b/src/api/kateWork.js index d180f4f..5893768 100644 --- a/src/api/kateWork.js +++ b/src/api/kateWork.js @@ -1,133 +1,157 @@ import request from "@/http/request"; const getDbs = (params) => { - return request({ - url: '/kateWork/getDbs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getDbs', + method: 'post', + data: params + }) } const deleteDbs = (params) => { - return request({ - url: '/kateWork/deleteDbs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/deleteDbs', + method: 'post', + data: params + }) } const updateDbs = (params) => { - return request({ - url: '/kateWork/updateDbs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/updateDbs', + method: 'post', + data: params + }) } const getOrders = (params) => { - return request({ - url: '/kateWork/getOrders', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getOrders', + method: 'post', + data: params + }) } const deleteOrders = (params) => { - return request({ - url: '/kateWork/deleteOrders', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/deleteOrders', + method: 'post', + data: params + }) } const updateOrders = (params) => { - return request({ - url: '/kateWork/updateOrders', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/updateOrders', + method: 'post', + data: params + }) } const getStationConfigs = (params) => { - return request({ - url: '/kateWork/getStationConfigs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getStationConfigs', + method: 'post', + data: params + }) } const deleteStationConfigs = (params) => { - return request({ - url: '/kateWork/deleteStationConfigs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/deleteStationConfigs', + method: 'post', + data: params + }) } const updateStationConfigs = (params) => { - return request({ - url: '/kateWork/updateStationConfigs', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/updateStationConfigs', + method: 'post', + data: params + }) } const getClcKanbanRequirement = (params) => { - return request({ - url: '/kateWork/getClcKanbanRequirement', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getClcKanbanRequirement', + method: 'post', + data: params + }) } const getWorkFlows = (params) => { - return request({ - url: '/kateWork/getWorkFlows', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getWorkFlows', + method: 'post', + data: params + }) } const updateWorkFlows = (params) => { - return request({ - url: '/kateWork/updateWorkFlows', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/updateWorkFlows', + method: 'post', + data: params + }) } const getWorkSummary = (params) => { - return request({ - url: '/kateWork/getWorkSummary', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getWorkSummary', + method: 'post', + data: params + }) } const getClcKanbanByPage = (params) => { - return request({ - url: '/kateWork/getClcKanbanByPage', - method: 'post', - data: params - }) + return request({ + url: '/kateWork/getClcKanbanByPage', + method: 'post', + data: params + }) } const genClcKanbanRequirement = (params) => { - return request({ - url: '/kateWork/genClcKanbanRequirement', - method: 'post', - data: params, - timeout: 600000 - }) + return request({ + url: '/kateWork/genClcKanbanRequirement', + method: 'post', + data: params, + timeout: 600000 + }) } const getBigBoxList = (params) => { - return request({ - url: '/kateWork/getBigBoxList', - method: 'post', - data: params, - timeout: 10000 - }) + return request({ + url: '/kateWork/getBigBoxList', + method: 'post', + data: params, + timeout: 10000 + }) +} + +const queryWorkDate = (params) => { + return request({ + url: '/kateWork/queryWorkDate', + method: 'post', + data: params + }) +} + +const addWorkDate = (params) => { + return request({ + url: '/kateWork/addWorkDate', + method: 'post', + data: params + }) +} + +const deleteWorkDate = (params) => { + return request({ + url: '/kateWork/deleteWorkDate', + method: 'post', + data: params + }) } export { @@ -146,5 +170,8 @@ export { getWorkSummary, getClcKanbanByPage, genClcKanbanRequirement, - getBigBoxList + getBigBoxList, + queryWorkDate, + addWorkDate, + deleteWorkDate } \ No newline at end of file diff --git a/src/layout/dbsTable.vue b/src/layout/dbsTable.vue index f70e5f9..1ad27f7 100644 --- a/src/layout/dbsTable.vue +++ b/src/layout/dbsTable.vue @@ -10,9 +10,7 @@ 导入DBS - 导入工作日历 + @click="openUploadDialog()">导入DBS
@@ -125,33 +123,6 @@ - -
- 上次更新 -
-
-
-
时间：
- -
-
-
人员：
- -
-
-
-
文件名：
- - -
-
-
-
- 再次更新 - -
- @@ -300,11 +271,11 @@ export default { getCurrentRow(row) { this.dbsId = row.dbsId }, - openUploadDialog(uploadType) { + openUploadDialog() { // 请求上传记录 const param = { userName: store.getters.getUserName, - fileDescription: uploadType == 1 ? 'DBS' : 'WORK_DATE', + fileDescription: 'DBS', isAsc: false, sortBy: 'upload_time' } @@ -330,11 +301,7 @@ export default { console.log(err) errorBox('发生异常') }) - if (uploadType == 1) { - this.uploadDialogVisible = true - } else { - this.uploadWorkDateDialogVisible = true - } + this.uploadDialogVisible = true }, }, } diff --git a/src/layout/kateOrdersTable.vue b/src/layout/kateOrdersTable.vue index 643d632..22cc189 100755 --- a/src/layout/kateOrdersTable.vue +++ b/src/layout/kateOrdersTable.vue @@ -3,11 +3,11 @@
- - - @@ -15,8 +15,11 @@ 重置 - 导入 + 导出未做工单 + + 导入工单
@@ -192,6 +195,8 @@ import {queryUploadRecord} from '@/api/excel.js' import {Search} from '@element-plus/icons-vue' diff --git a/src/layout/stockForInv.vue b/src/layout/stockForInv.vue new file mode 100644 index 0000000..435ee42 --- /dev/null +++ b/src/layout/stockForInv.vue @@ -0,0 +1,518 @@ + + + + + + \ No newline at end of file diff --git a/src/layout/workDateTable.vue b/src/layout/workDateTable.vue index d8db24a..357b5c1 100755 --- a/src/layout/workDateTable.vue +++ b/src/layout/workDateTable.vue @@ -6,13 +6,16 @@ + style="width: 158px; margin-right: 10px;" clearable/> 搜索 重置 - 导入 + 新增一个工作日 + + 导入工作日历 @@ -22,7 +25,7 @@ :cell-style="{ 'text-align': 'center' }"> @@ -30,7 +33,7 @@ @@ -39,10 +42,10 @@ :small="false" :disabled="false" :background="false" :default-page-size="10" layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search" @current-change="search"/> - +
- @@ -57,8 +60,8 @@ - - + + @@ -80,11 +83,11 @@
时间：
- +
人员：
- +
@@ -118,6 +121,9 @@ import {Search} from '@element-plus/icons-vue' import UploadExcelWorkDate from "@/excel/UploadExcelWorkDate.vue"; From 06f1b10163e642b4cc4ee664e45c6ed91c398ed7 Mon Sep 17 00:00:00 2001 From: liang <594755172@qq.com> Date: Tue, 20 Jan 2026 20:22:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=A1=B5=E4=B8=BA=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 1 - src/store/index.js | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 2af86cc..aa003a6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,6 @@ const routes = [ path: '/home', name: 'home', component: HomeView, - redirect: '/stock', children: [ { path: '/stock', component: stock },// 库存 { path: '/goodsIn', component: () => import('@/layout/goodsIn.vue') },// 入库 diff --git a/src/store/index.js b/src/store/index.js index 1f390f3..b3ea900 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2,11 +2,7 @@ import { createStore } from 'vuex' export default createStore({ state: { - stateTagsList: [{ - id: '21', - labelName: '库存', - path: '/stock' - }], + stateTagsList: [], user: {}, menuList: [], token: '',