diff --git a/src/assets/img/look_error.png b/src/assets/img/look_error.png new file mode 100644 index 0000000..3bbc736 Binary files /dev/null and b/src/assets/img/look_error.png differ diff --git a/src/components/queryComponent/index.vue b/src/components/queryComponent/index.vue index 6ecb4f1..f9caf1b 100644 --- a/src/components/queryComponent/index.vue +++ b/src/components/queryComponent/index.vue @@ -1,6 +1,15 @@ - + + - 是否有效: 有效 无效 - 是否发布: 未发布 @@ -62,63 +49,34 @@ - - - - - + + + + - + + @@ -126,10 +84,12 @@ import { put, post } from "@/server/api.js"; // isShowAddButton: 是否显示新增按钮图标,也用来区分预测版本列表组件需要显示的功能 import uploadTemplate from "./upload.vue"; +import lookError from "./lookError.vue"; export default { name: "QueryComponent", components: { - uploadTemplate + uploadTemplate, + lookError }, props: ["isShowComponent", "isShowAddButton","customerId","CreateModel", 'isDownload', 'isDropdown',"batchImport"], data() { @@ -142,26 +102,6 @@ export default { valid: undefined, status: undefined, isShowDialog: '', - validArrray: [ - { - label: '有效', - value: true - }, - { - label: '无效', - value: false - } - ], - releaseArrray: [ - { - label: '未发布', - value: '0' - }, - { - label: '已发布', - value: '1' - } - ], } }, methods: { @@ -235,6 +175,10 @@ export default { download(){ this.$emit('download', '') }, + // 查看错误 + handleSeeError() { + this.isShowDialog = 'error' + }, // 新增按钮操作 handleNew() { if (!this.customerId) { diff --git a/src/components/queryComponent/lookError.vue b/src/components/queryComponent/lookError.vue new file mode 100644 index 0000000..58383ee --- /dev/null +++ b/src/components/queryComponent/lookError.vue @@ -0,0 +1,72 @@ + + + + + + {{ scope.row[item] }} + + + + + + + + + \ No newline at end of file diff --git a/src/router/plan.js b/src/router/plan.js index 9df31b3..2aaff75 100644 --- a/src/router/plan.js +++ b/src/router/plan.js @@ -48,6 +48,12 @@ const plant = { title: "原材料需求差异分析", component: () => import("@/views/plan/workbench/materialAnalysis"), }, + { + icon: "el-icon-document", + path: "/plan/workbench/lookError", + title: "错误查看", + component: () => import("@/views/plan/workbench/lookError"), + }, ] }, ], diff --git a/src/router/system.js b/src/router/system.js index 22f1871..f54001b 100644 --- a/src/router/system.js +++ b/src/router/system.js @@ -40,6 +40,12 @@ const stystem = { title: "流水号定义", component: () => import("@/views/system/serialNumber"), }, + { + icon: "el-icon-document", + path: "/system/oneimport", + title: "一维表导入", + component: () => import("@/views/system/oneimport"), + }, { icon: "el-icon-document", path: "/system/printer", diff --git a/src/server/api.js b/src/server/api.js index cfbb013..a7765c4 100644 --- a/src/server/api.js +++ b/src/server/api.js @@ -62,6 +62,13 @@ export const uploadExcel = (param, customerId, versionId) => headers: { "Content-Type": "multipart/form-data" }, data: param, }); +export const readexcel = (param, script) => + service.request({ + url: "/admin/base/script/readexcel?script=" + script, + method: "post", + headers: { "Content-Type": "multipart/form-data" }, + data: param, + }); export const bulkimportfile = (data) => service.request({ url: "/admin/ap/custdemandverhead/bulkimportfile", diff --git a/src/views/plan/workbench/lookError/index.vue b/src/views/plan/workbench/lookError/index.vue new file mode 100644 index 0000000..c49938e --- /dev/null +++ b/src/views/plan/workbench/lookError/index.vue @@ -0,0 +1,108 @@ + + + + + + + + + 搜索 + 重置 + + + + + + + + {{ scope.row[item] }} + + + + + + + + + + diff --git a/src/views/plan/workbench/materialAnalysis/index.vue b/src/views/plan/workbench/materialAnalysis/index.vue index b016bd8..c76097c 100644 --- a/src/views/plan/workbench/materialAnalysis/index.vue +++ b/src/views/plan/workbench/materialAnalysis/index.vue @@ -35,7 +35,7 @@ export default { } }, mounted () { - this.dragChangeSize();; + this.dragChangeSize(); }, methods: { handleQueryparams(data) { @@ -54,7 +54,7 @@ export default { padding: 8px !important; .material-top-wrap{ width: 100%; - height: calc(50% - 5px); + height: calc(50% - 12px); margin-bottom: 10px; .material-top-left-wrap { width: 320px; @@ -81,7 +81,7 @@ export default { } .material-bottom-wrap{ width: calc(100% - 4px); - height: calc(50% - 5px); + height: calc(50% - 10px); background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 55%, #F1F1F1 100%); border: 2px solid #919191; .el-tabs { diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue new file mode 100644 index 0000000..78999ee --- /dev/null +++ b/src/views/system/oneimport/addOrEdit.vue @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + 获取表字段 + + + + + + + + + + + + + + + + + + + + + + {{getColumnName('Script-ClearTable')}} + + + + + {{getColumnName('Script-AppendNewRecord')}} + + + + + {{getColumnName('Script-UpdateRecord')}} + + + + + {{getColumnName('Script-AppendAndUpdateRecord')}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 新增 + + + 删除 + + + + + + + + + + + + diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue new file mode 100644 index 0000000..ef0acef --- /dev/null +++ b/src/views/system/oneimport/index.vue @@ -0,0 +1,201 @@ + + + + + + + + + 搜索 + 重置 + + + 新增 + + + + + + + + {{ + getWorkshopName(scope.row["Script-PlantNr"]) + }} + {{ scope.row[item] }} + + + + + 修改 + 导入 + 删除 + + + + + + + + + + + + + diff --git a/src/views/system/oneimport/upload.vue b/src/views/system/oneimport/upload.vue new file mode 100644 index 0000000..37a030f --- /dev/null +++ b/src/views/system/oneimport/upload.vue @@ -0,0 +1,86 @@ + + + + 上传 + + + \ No newline at end of file