From d1162e6acc2425902aeb916aa356b2bd0b0f1ecd Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 22 Sep 2023 11:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=B7=A5=E8=89=BA+=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/plan/order/index.vue | 4 +- src/views/plan/whiteOrder/index.vue | 87 ++++++++++++++++++++++--- src/views/plan/workorder/index.vue | 24 +++---- src/views/technology/proroute/index.vue | 11 +++- 4 files changed, 103 insertions(+), 23 deletions(-) diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index a6420f9..5b2b9a0 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -85,7 +85,7 @@ 导入 - --> + + --> 导出 @@ -490,7 +491,37 @@ - + + + + +
将文件拖到此处，或点击上传
+
+ + + + 仅允许导入xls、xlsx格式文件。 + 下载模板 + +
+ +
+ 确 定 + 取 消 +
+ @@ -503,6 +534,7 @@ import { addWhiteOrder, updateWhiteOrder } from "@/api/plan/whiteOrder"; +import {getToken} from "@/utils/auth" import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import moment from "moment"; @@ -625,7 +657,22 @@ export default { addrules: {}, /**********************************/ eRouteProps: {multiple: true}, - eRouteOptions: [] + eRouteOptions: [], + // 导入数据 + upload: { + // 是否显示弹出层（用户导入） + open: false, + // 弹出层标题（用户导入） + title: "", + // 是否禁用上传 + isUploading: false, + // 是否更新已经存在的用户数据 + updateSupport: 0, + // 设置上传的请求头部 + headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()}, + // 上传的地址 + url: process.env.VUE_APP_BASE_API + "/plan/order/importData" + } }; }, created() { @@ -1004,9 +1051,6 @@ export default { // 打开拆分弹窗 this.splitOpen = true; }, - // 导入-点击导入按钮 - handleImport() { - }, // 导出 handleExport() { this.download('/plan/whiteOrder/export', { @@ -1310,6 +1354,31 @@ export default { this.$modal.msgSuccess("删除成功"); }).catch(() => { }); + }, + // 导入-导入窗口打开 + handleImport() { + this.upload.title = "订单信息导入"; + this.upload.open = true; + }, + // 导入-文件上传中处理 + handleFileUploadProgress(event, file, fileList) { + this.upload.isUploading = true; + }, + // 导入-文件上传成功处理 + handleFileSuccess(response, file, fileList) { + this.upload.open = false; + this.upload.isUploading = false; + this.$refs.upload.clearFiles(); + this.$alert("
" + response.msg + "
", "导入结果", {dangerouslyUseHTMLString: true}); + this.getList(); + }, + // 导入-提交上传文件 + submitFileForm() { + this.$refs.upload.submit(); + }, + // 导入-下载模板 + importTemplate() { + this.download('/plan/whiteOrder/importTemplate', {}, `order_example_template_${new Date().getTime()}.xlsx`) } } }; diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue index 34cfbcc..2a2ba62 100644 --- a/src/views/plan/workorder/index.vue +++ b/src/views/plan/workorder/index.vue @@ -176,11 +176,11 @@ - + @@ -437,11 +437,11 @@ - + @@ -667,11 +667,13 @@ export default { return } } - + this.loading = true; const workorderIds = row.workorderCode || this.codes; this.$modal.confirm('是否确认下发生产工单编号为"' + workorderIds + '"的数据项？').then(function () { + return downWorkorder(workorderIds); }).then(() => { + this.loading = false; this.getList(); this.$modal.msgSuccess("下发成功"); }).catch(() => { diff --git a/src/views/technology/proroute/index.vue b/src/views/technology/proroute/index.vue index 20778b3..548e061 100644 --- a/src/views/technology/proroute/index.vue +++ b/src/views/technology/proroute/index.vue @@ -9,6 +9,14 @@ @keyup.enter.native="handleQuery" /> + + + {{scope.row.routeCode}} + @@ -243,7 +252,7 @@ - +