From f2ad908e2a28996a759048f70174d959fb4e6002 Mon Sep 17 00:00:00 2001 From: liangzhou <594755172@qq.com> Date: Sun, 13 Oct 2024 16:39:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?= =?UTF-8?q?=201.=20=E5=A2=9E=E5=8A=A0=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/excel.js | 39 +++++++++---- src/excel/UploadExcelWorkFlow.vue | 94 +++++++++++++++++++++++++++++++ src/layout/inTaskRecord.vue | 30 ++++++---- src/layout/sortBoxs.vue | 64 ++++++++++++++++++++- src/layout/workFlow.vue | 71 +++++++++++++++++++++++ 5 files changed, 274 insertions(+), 24 deletions(-) create mode 100644 src/excel/UploadExcelWorkFlow.vue diff --git a/src/api/excel.js b/src/api/excel.js index dfab06c..db7344b 100644 --- a/src/api/excel.js +++ b/src/api/excel.js @@ -63,6 +63,15 @@ const uploadExcelOrders = (data) => { }) } +const uploadWorkFlow = (data) => { + return request({ + url: '/excel/uploadWorkFlow', + method: 'post', + data: data, + timeout: 600000 + }) +} + const uploadExcelInventoryList = (data) => { return request({ url: '/excel/uploadInventoryList', @@ -77,7 +86,8 @@ const downloadStockExcel = (data) => { url: '/excel/downloadStockExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -86,7 +96,8 @@ const downloadInRecordExcel = (data) => { url: '/excel/downloadInRecordExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -95,7 +106,8 @@ const downloadOutRecordExcel = (data) => { url: '/excel/downloadOutRecordExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -104,7 +116,8 @@ const downloadInventoryRecordExcel = (data) => { url: '/excel/downloadInventoryRecordExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -113,7 +126,8 @@ const downloadGoodsExcel = (data) => { url: '/excel/downloadGoodsExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -122,7 +136,8 @@ const downloadVehicleExcel = (data) => { url: '/excel/downloadVehicleExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -131,7 +146,8 @@ const downloadLocationsExcel = (data) => { url: '/excel/downloadLocationsExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -149,7 +165,8 @@ const downloadClcKanbanRequirementExcel = (data) => { url: '/excel/downloadClcKanbanRequirementExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -158,7 +175,8 @@ const downloadWorkSummaryExcel = (data) => { url: '/excel/downloadWorkSummaryExcel', method: 'post', responseType: 'blob', - data: data + data: data, + timeout: 600000 }) } @@ -180,5 +198,6 @@ export { downloadClcKanbanRequirementExcel, downloadWorkSummaryExcel, uploadExcelBaseGoods, - uploadExcelKanban + uploadExcelKanban, + uploadWorkFlow } \ No newline at end of file diff --git a/src/excel/UploadExcelWorkFlow.vue b/src/excel/UploadExcelWorkFlow.vue new file mode 100644 index 0000000..24ec042 --- /dev/null +++ b/src/excel/UploadExcelWorkFlow.vue @@ -0,0 +1,94 @@ + + + \ No newline at end of file diff --git a/src/layout/inTaskRecord.vue b/src/layout/inTaskRecord.vue index 7dc1e3c..4fb69f6 100644 --- a/src/layout/inTaskRecord.vue +++ b/src/layout/inTaskRecord.vue @@ -2,8 +2,8 @@
- - + + 搜索 重置 导出记录 @@ -12,20 +12,26 @@ - - - - - + + + + + + + + + - - + + - - + + + diff --git a/src/layout/sortBoxs.vue b/src/layout/sortBoxs.vue index 42f3b88..6ee7d70 100644 --- a/src/layout/sortBoxs.vue +++ b/src/layout/sortBoxs.vue @@ -13,7 +13,7 @@ 工作站：
- {{ standId }} + {{ standId }}
@@ -68,6 +68,25 @@
+ + + + + + + + + +
+ + @@ -96,6 +115,13 @@ export default { sumOfOrders: null }), rules: reactive({}), + showBoxListDialogFlag: false, + bixBoxList: [], + currentPage: 1, + pageSize: 10, + total: 0, + loading: true, + bigBoxNo: '', } }, mounted() { @@ -160,7 +186,41 @@ export default { console.log(err) errorBox('请求发生异常。') }) - } + }, + getCurrentRow(row) { + this.bigBoxNo = row.bigBoxNo + }, + showStockDealDialog() { + this.dialogVisible = true + // this.search() + }, + search() { + this.loading = true + const request = { + pageNo: this.currentPage, + pageSize: this.pageSize, + standId: this.standIdQuery.trim(), + workOrder: this.workOrderQuery.trim(), + workCenter: this.workCenterQuery.trim(), + goodsId: this.goodsIdQuery.trim(), + lackStatus: this.lackStatusQuery == -99 ? null : this.lackStatusQuery, + workDate: timeFormatter(this.workDateQuery), + userName: store.getters.getUserName + } + getWorkSummary(request).then(res => { + const tableResponse = res.data + if (tableResponse.code == 0) { + this.workSummaryList = tableResponse.returnData.lists + this.total = tableResponse.returnData.total + } else { + errorBox(tableResponse.message) + } + }).catch(err => { + console.log(err) + errorBox('查询工作总结错误') + }) + this.loading = false + }, } } diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue index ec77b8b..05d3a97 100644 --- a/src/layout/workFlow.vue +++ b/src/layout/workFlow.vue @@ -18,6 +18,10 @@ 搜索 重置 + + 导入 +
+ +
+ 上次更新 +
+
+
+
时间：
+ +
+
+
人员：
+ +
+
+
+
文件名：
+ + +
+
+
+
+ 再次更新 + +
+ @@ -166,6 +197,8 @@ import { ElMessage } from 'element-plus' 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 zhCn from 'element-plus/dist/locale/zh-cn.mjs'