From 2d12eac2edd1047cbc9256f75454f414cdbc2928 Mon Sep 17 00:00:00 2001 From: "bo.wu@finesys.com.cn" Date: Sat, 6 Sep 2025 12:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=89=A9=E6=96=99=E4=BB=A5=E9=80=97?= =?UTF-8?q?=E5=8F=B7=E5=88=86=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/excel.js | 12 +++++- src/layout/stationConfig.vue | 12 +++--- src/layout/stock.vue | 41 +++++++++++++++++++ src/layout/workFlow.vue | 76 ++++++++++++++++++++++++++++++++---- src/layout/workSummary.vue | 45 +++++++++++++++++---- 5 files changed, 163 insertions(+), 23 deletions(-) diff --git a/src/api/excel.js b/src/api/excel.js index 93db6fd..42490f2 100644 --- a/src/api/excel.js +++ b/src/api/excel.js @@ -188,6 +188,15 @@ const downloadWorkSummaryExcel = (data) => { timeout: 600000 }) } +const downloadWorkFlowExcel = (data) => { + return request({ + url: '/excel/downloadWorkFlowExcel', + method: 'post', + responseType: 'blob', + data: data, + timeout: 600000 + }) +} export { uploadExcelStock, @@ -209,5 +218,6 @@ export { uploadExcelBaseGoods, uploadExcelKanban, uploadWorkFlow, - uploadExcelWorkDate + uploadExcelWorkDate, + downloadWorkFlowExcel } \ No newline at end of file diff --git a/src/layout/stationConfig.vue b/src/layout/stationConfig.vue index 8b07755..675e79f 100644 --- a/src/layout/stationConfig.vue +++ b/src/layout/stationConfig.vue @@ -68,36 +68,36 @@ - + - + - + - + - + - + diff --git a/src/layout/stock.vue b/src/layout/stock.vue index fb044ee..810c9de 100644 --- a/src/layout/stock.vue +++ b/src/layout/stock.vue @@ -20,6 +20,8 @@ :suffix-icon="Search" /> + 搜索 @@ -222,6 +224,7 @@ export default { vehicleIdQuery: '', locationIdQuery: '', goodsTypeQuery: '', + stockStatusQuery: -99, createTimeQuery: null, shortcuts: [ { @@ -296,6 +299,40 @@ export default { label: '库存锁定' } ], + stockStatusSearchOptions: [ + { + value: -99, + label: '全部' + }, + { + value: 0, + label: '库存正常' + }, + { + value: 1, + label: '出库中' + }, + { + value: 2, + label: '盘点中' + }, + { + value: 3, + label: '移库中' + }, + { + value: 4, + label: '拣选中' + }, + { + value: 5, + label: '回库中' + }, + { + value: 9, + label: '库存锁定' + } + ], goodsList: [], goodsTypeOptions: [ { @@ -427,6 +464,7 @@ export default { vehicleId: this.vehicleIdQuery.trim(), locationId: this.locationIdQuery.trim(), goodsType: this.goodsTypeQuery.trim(), + stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery, createTime: timeFormatter(this.createTimeQuery), userName: store.getters.getUserName } @@ -448,6 +486,8 @@ export default { this.goodsIdQuery = '' this.vehicleIdQuery = '' this.locationIdQuery = '' + this.goodsTypeQuery = '' + this.stockStatusQuery = -99 this.createTimeQuery = null this.search() }, @@ -461,6 +501,7 @@ export default { vehicleId: this.vehicleIdQuery.trim(), locationId: this.locationIdQuery.trim(), goodsType: this.goodsTypeQuery.trim(), + stockStatus: this.stockStatusQuery == -99 ? null : this.stockStatusQuery, createTime: timeFormatter(this.createTimeQuery), userName: store.getters.getUserName } diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue index bf3fe3f..84ad6e0 100644 --- a/src/layout/workFlow.vue +++ b/src/layout/workFlow.vue @@ -3,13 +3,13 @@
- - - - + @@ -21,6 +21,7 @@ 重置 + 导出 导入 @@ -121,7 +122,7 @@ - + @@ -203,7 +204,7 @@ import {ref, reactive} from 'vue' import {dateFormatter, timeFormatter} from '@/utils/formatter.js' import {Search} from '@element-plus/icons-vue' import UploadExcelWorkFlow from '@/excel/UploadExcelWorkFlow.vue' -import {queryUploadRecord} from '@/api/excel.js' +import {queryUploadRecord, downloadWorkFlowExcel} from '@/api/excel.js' import zhCn from 'element-plus/dist/locale/zh-cn.mjs' @@ -494,4 +530,28 @@ export default { flex-direction: column; padding: 10px; } + +/* 专门为料号文本域添加样式 */ +.goods-id-textarea { + vertical-align: top; +} + +.goods-id-textarea :deep(.el-textarea__inner) { + font-size: 12px; + line-height: 1.2; + padding: 5px; + height: 32px !important; + min-height: 32px !important; + resize: none; +} + +/* 确保其他输入框保持一致的高度 */ +.el-input { + height: 32px; +} + +.el-input :deep(.el-input__wrapper) { + height: 32px; + line-height: 32px; +} \ No newline at end of file diff --git a/src/layout/workSummary.vue b/src/layout/workSummary.vue index b43924f..73cb86e 100644 --- a/src/layout/workSummary.vue +++ b/src/layout/workSummary.vue @@ -3,13 +3,13 @@
- - - - + @@ -129,7 +129,7 @@ export default { workStation: this.standIdQuery.trim(), workOrder: this.workOrderQuery.trim(), workCenter: this.workCenterQuery.trim(), - goodsId: this.goodsIdQuery.trim(), + goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','), lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery, workDate: timeFormatter(this.workDateQuery), workEndDate: timeFormatter(this.workEndDateQuery), @@ -193,10 +193,10 @@ export default { workStation: this.standIdQuery.trim(), workOrder: this.workOrderQuery.trim(), workCenter: this.workCenterQuery.trim(), - goodsId: this.goodsIdQuery.trim(), + goodsId: this.goodsIdQuery.trim().split('\n').filter(id => id.trim() !== '').join(','), lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery, workDate: timeFormatter(this.workDateQuery), - workEndDate: timeFormatter(this.workEndDateQuery), + workEndDate: timeFormatter(this.workEndDateQuery), userName: store.getters.getUserName } downloadWorkSummaryExcel(request).then(res => { @@ -274,4 +274,33 @@ export default { flex-direction: column; padding: 10px; } + +/* 专门为料号文本域添加样式 */ +.goods-id-container { + display: inline-block; + vertical-align: top; +} + +.goods-id-textarea { + vertical-align: top; +} + +.goods-id-textarea :deep(.el-textarea__inner) { + font-size: 12px; + line-height: 1.2; + padding: 5px; + height: 32px !important; + min-height: 32px !important; + resize: none; +} + +/* 确保其他输入框保持一致的高度 */ +.el-input { + height: 32px; +} + +.el-input :deep(.el-input__wrapper) { + height: 32px; + line-height: 32px; +} \ No newline at end of file