From 37371fc02320d9b1ed7ad90630a501c45d09a1cc Mon Sep 17 00:00:00 2001 From: lb Date: Mon, 17 Apr 2023 11:34:12 +0800 Subject: [PATCH] update import --- public/importTemplates/materialImport.xlsx | Bin 0 -> 9525 bytes public/index.html | 4 +- src/components/DialogUpload.vue | 48 +++++++++-- src/views/atomViews/ListViewWithHead.vue | 1 - .../pms/order/components/DialogUpload.vue | 2 +- src/views/modules/pms/order/config.js | 80 +----------------- src/views/modules/pms/product/config.js | 31 ++++++- vue.config.js | 6 +- 8 files changed, 76 insertions(+), 96 deletions(-) create mode 100644 public/importTemplates/materialImport.xlsx diff --git a/public/importTemplates/materialImport.xlsx b/public/importTemplates/materialImport.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..35ffa00821db48d79151b8f92167dfb631e0d140 GIT binary patch literal 9525 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 literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html index 8cd3f34..11c8690 100644 --- a/public/index.html +++ b/public/index.html @@ -38,8 +38,8 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> diff --git a/src/components/DialogUpload.vue b/src/components/DialogUpload.vue index 961eced..c7efb42 100644 --- a/src/components/DialogUpload.vue +++ b/src/components/DialogUpload.vue @@ -10,7 +10,7 @@
- 下载模板 + + 下载模板 + 取消
@@ -40,19 +50,20 @@ export default { props: { title: { type: String, - default: '导入' + default: "导入", }, hint: { hint: String, - default: '只能上传 Excel 文件' + default: "只能上传 Excel 文件", }, filename: { hint: String, - default: 'default_file.xlsx' + default: "default_file.xlsx", }, - url: { // 下载地址 + url: { + // 下载地址 hint: String, - default: '/importTemplates/orderImport.xlsx' + default: "/importTemplates/orderImport.xlsx", }, configs: { type: Object, @@ -75,6 +86,15 @@ export default { token: Cookies.get("token") || "", }; }, + actionUrl() { + return window.SITE_CONFIG["apiURL"] + this.urls.importUrl; + }, + savedFilename() { + return "templateUrl" in this.urls ? this.urls.templateUrl.split("/").pop() : this.filename; + }, + templateUrl() { + return "templateUrl" in this.urls ? this.urls.templateUrl : this.url ?? "#"; + }, }, methods: { init(data) { @@ -91,6 +111,16 @@ export default { handleSuccess(response, file, fileList) { // console.log("success response", response); + + if ("code" in response && response.code === 500) { + this.$message({ + message: response.msg, + type: "error", + duration: 1500, + }); + return; + } + let message = ""; let isError = false; @@ -100,7 +130,7 @@ export default { message = response; isError = true; } - + this.handleClose(); this.$message({ @@ -130,7 +160,7 @@ export default { handleDownloadTemplate(filename, href) { this.$notify({ title: "提示", - message: "开始下载", + message: "开始下载，请稍后检查浏览器的下载选项或者下载目录", type: "success", }); diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index c3922c2..790beaa 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -49,7 +49,6 @@ ref="upload-dialog" v-if="uploadDialogVisible" title="导入配方" - url="/importTemplates/bomImport.xlsx" filename="bomTemplate.xlsx" @refresh-list="getList" /> diff --git a/src/views/modules/pms/order/components/DialogUpload.vue b/src/views/modules/pms/order/components/DialogUpload.vue index 36ca3cc..1d48abe 100644 --- a/src/views/modules/pms/order/components/DialogUpload.vue +++ b/src/views/modules/pms/order/components/DialogUpload.vue @@ -114,7 +114,7 @@ export default { handleDownloadTemplate(filename) { this.$notify({ title: "提示", - message: "开始下载", + message: "开始下载，请稍后检查浏览器的下载选项或者下载目录", type: "success", }); diff --git a/src/views/modules/pms/order/config.js b/src/views/modules/pms/order/config.js index 10d4066..b5597e3 100644 --- a/src/views/modules/pms/order/config.js +++ b/src/views/modules/pms/order/config.js @@ -527,81 +527,9 @@ export default function () { finishedOrder: "/pms/order/pageEnd", unConfirmedOrder: "/pms/order/pageUnCom", base: "/pms/order", - importOrderUrl: "/pms-am/pms/order/importExcelOrder", - payload: '/pms/carHandle' - // base: "/pms/material", - // page: "/pms/material/page", - // tree: "/pms/material/tree", - // subase: "/pms/materialArrt", - // subpage: "/pms/materialArrt/page", - // more... + importUrl: "/pms-am/pms/order/importExcelOrder", + templateUrl: '/importTemplates/orderImport.xlsx', + payload: '/pms/carHandle', }, }; -} - -// const headFormFields = [ -// { -// label: '订单号', -// prop: 'code', -// input: true, -// bind: { placeholder: '请输入订单号' } -// }, -// // { -// // label: '子订单号', -// // prop: 'cate', -// // input: true, -// // bind: { placeholder: '请输入子订单号', rules: [{ type: 'number', message: '请输入整数', trigger: 'blur', transform: val => Number(val) }] } -// // }, -// // { -// // label: "配方", -// // prop: "bomId", -// // select: [], -// // fn: () => this.$http.get('/pms/bom/page', { params: { key: '', limit: 999, page: 1 } }), -// // bind: { placeholder: "请选择配方" }, -// // }, -// // { -// // label: '砖型', -// // prop: 'shapeId', -// // select: [], -// // fn: () => this.$http.get('/pms/shape/page', { params: { key: '', limit: 999, page: 1 } }), -// // bind: { placeholder: "请选择砖型" }, -// // }, -// // { -// // label: '工艺', -// // prop: 'techId', -// // select: [], -// // fn: () => this.$http.post('/pms/equipmentTech/pageView', { key: '', shape: '', wsId: 0, limit: 999, page: 1 }), -// // bind: { placeholder: "请选择砖型" }, -// // }, -// // { -// // label: '订单状态', -// // prop: 'types', // 0等待, 1确认, 2生产，3暂停, 4结束, 5接受, 6拒绝 -// // select: [ -// // {label: '等待', value: 0}, -// // {label: '确认', value: 1}, -// // {label: '生产', value: 2}, -// // {label: '暂停', value: 3}, -// // {label: '结束', value: 4}, -// // {label: '接受', value: 5}, -// // {label: '拒绝', value: 6}, -// // ], -// // // fn: () => this.$http.post('/pms/equipmentTech/pageView', { key: '', shape: '', wsId: 0, limit: 999, page: 1 }), -// // bind: { placeholder: "请选择订单状态" }, -// // }, -// { -// button: { -// type: "primary", -// name: "查询", -// }, -// }, -// { -// button: { -// type: "primary", -// name: "新增", -// permission: "", -// }, -// bind: { -// plain: true, -// }, -// }, -// ]; +} \ No newline at end of file diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js index 9fd211b..1aea499 100644 --- a/src/views/modules/pms/product/config.js +++ b/src/views/modules/pms/product/config.js @@ -14,7 +14,13 @@ export default function () { { prop: "weight", label: "重量", filter: (val) => (val ? val + " kg" : "-") }, { prop: "processTime", label: "产线完成单位产品用时", width: 200, filter: (val) => val + " s" }, { prop: "remark", label: "备注" }, - { prop: "description", label: "附件信息", subcomponent: TableTextComponent, buttonContent: "查看附件", actionName: 'view-attachment' }, + { + prop: "description", + label: "附件信息", + subcomponent: TableTextComponent, + buttonContent: "查看附件", + actionName: "view-attachment", + }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "operations", @@ -22,7 +28,16 @@ export default function () { fixed: "right", width: 90, subcomponent: TableOperaionComponent, - options: [{ name: "edit", label: "编辑", icon: "edit-outline" }, { name: "delete", icon: "delete", label: "删除", emitFull: true, icon: 'delete', label: '删除', emitFull: true, permission: "pms:product:delete" }], + options: [ + { name: "edit", label: "编辑", icon: "edit-outline" }, + { + name: "delete", + icon: "delete", + label: "删除", + emitFull: true, + permission: "pms:product:delete", + }, + ], }, ]; @@ -90,7 +105,10 @@ export default function () { select: true, label: "物料类型", prop: "typeDictValue", - options: "product_type" in dictList ? dictList["product_type"].map((item) => ({ value: item.dictValue, label: item.dictLabel })) : [], + options: + "product_type" in dictList + ? dictList["product_type"].map((item) => ({ value: item.dictValue, label: item.dictLabel })) + : [], elparams: { placeholder: "选择一个物料类型" }, }, ], @@ -100,7 +118,10 @@ export default function () { select: true, label: "单位", prop: "unitDictValue", - options: "unit" in dictList ? dictList["unit"].map((item) => ({ value: item.dictValue, label: item.dictLabel })) : [], + options: + "unit" in dictList + ? dictList["unit"].map((item) => ({ value: item.dictValue, label: item.dictLabel })) + : [], elparams: { placeholder: "选择单位" }, }, { @@ -198,6 +219,8 @@ export default function () { page: "/pms/product/page", subase: "/pms/productArrt", subpage: "/pms/productArrt/page", + importUrl: "/pms/product/import", + templateUrl: '/importTemplates/materialImport.xlsx' }, }; } diff --git a/vue.config.js b/vue.config.js index 152bbc8..ed3798d 100644 --- a/vue.config.js +++ b/vue.config.js @@ -30,9 +30,9 @@ module.exports = { '/pms-am/ureport/preview': { target: 'http://192.168.1.62:8080/' // TODO: 线上发布时需修改此处 }, - '/pms/order/importExcelOrder': { - target: 'http://192.168.1.21:8080/' // TODO: 线上发布时需修改此处 - } + // '/pms/order/importExcelOrder': { + // target: 'http://192.168.1.21:8080/' // TODO: 线上发布时需修改此处 + // } } } }