From 5f33d3743fb44ec9769954e07ab03937d6816c87 Mon Sep 17 00:00:00 2001 From: lb Date: Sun, 23 Apr 2023 10:13:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8E=9F=E6=96=99=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/importTemplates/materialImport.xlsx | Bin 9525 -> 9152 bytes public/importTemplates/productImport.xlsx | Bin 0 -> 9525 bytes public/index.html | 4 +- src/views/modules/pms/equipment/config.js | 7 +- .../material/components/ListViewWithHead.vue | 73 ++++++++---------- src/views/modules/pms/material/config.js | 54 +++++++------ src/views/modules/pms/product/config.js | 12 ++- 7 files changed, 80 insertions(+), 70 deletions(-) create mode 100644 public/importTemplates/productImport.xlsx diff --git a/public/importTemplates/materialImport.xlsx b/public/importTemplates/materialImport.xlsx index 35ffa00821db48d79151b8f92167dfb631e0d140..c7bd88fc720344655f246505597d64c1a5ffef23 100644 GIT binary patch delta 6392 zcmZ9QbyU^Q*2WJFheq(w4bm-#&O->2N=bu+bc58FICOIe1*Gc$64EK%jfAuaNJyuE z@bbHNt@pn7oj>M}XYHA_XYX0Fp83?PbShP+px{tnE*9&efIvowPblO-K(efQ4|zJKQeG!iA_c=XcW1 z_p#J!^9qL&q0c)!EQYN5^QBjV_eD*@!+-YCxwZ66nVuXZ>K_gwmp; z0TVA=m;B@xGsfA%%}rL>kQ9fBDc@8%ftF{UrXb8 z6PgBohd{cuG2W^rot2lujT=G9$}YoXe6Pwj_s=|UFKYsTsN>v4z=+RgarB@DLJ?W3 zrY#M-_MXjO+@v9dTh>nU{4r_9pWvOQP(j^DFcR<@V!O~lO6S3sq4I<`nGVKz3vu`9 zqSh#fNMZg&aPl=% zpv31#oC)ptNY7a|qSC~QFur?1y&Nx@NS>Z_UajPk!hg{z1Ot6;whZa_8HTCR-K`TC zkSawkiTzW|JXnb>vn$lShlF8-P;O56+i>_ayxs*bAZ--hM)b5q>6Kl;QF=`ZAdf(KF*rX0qHL&lVeClGzb9DMzo zA7Sh_@g+O?C+r$|JB%JzK1Y7SOx}G97h~!l=mJRvDTzpKO2XfU7hFTBgpBv^M()rO zDG|=-vS35EDgBklN{(V7TF_~MxKuUg0zRVfBhCXrrXxKeC7BhB%+Q^!tmD+VeeY$4 zt&39I@MIDAYAGJ{PDCi;Y5&ovpdfAL*owXJ`)5SSC#)<
isvA-%r3pcN-O3Dp4 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 literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html index 11c8690..78aa5e3 100644 --- a/public/index.html +++ b/public/index.html @@ -39,8 +39,8 @@ <% } %> diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js index 742230b..923c136 100644 --- a/src/views/modules/pms/equipment/config.js +++ b/src/views/modules/pms/equipment/config.js @@ -56,10 +56,13 @@ export default function () { }, { button: { - type: 'plain', + type: 'primary', name: '新增', permission: 'pms:equipment:save' - } + }, + bind: { + plain: true, + }, } ] diff --git a/src/views/modules/pms/material/components/ListViewWithHead.vue b/src/views/modules/pms/material/components/ListViewWithHead.vue index 7ff6556..6ed361f 100644 --- a/src/views/modules/pms/material/components/ListViewWithHead.vue +++ b/src/views/modules/pms/material/components/ListViewWithHead.vue @@ -9,43 +9,24 @@ - + - + - + - + + + @@ -54,6 +35,7 @@ import BaseListTable from "./BaseListTable.vue"; import BaseSearchForm from "@/components/BaseSearchForm.vue"; import DialogWithMenu from "@/components/DialogWithMenu.vue"; import DialogJustForm from "./DialogJustForm.vue"; +import DialogUpload from "@/components/DialogUpload.vue"; const DIALOG_WITH_MENU = "DialogWithMenu"; const DIALOG_JUST_FORM = "DialogJustForm"; @@ -61,7 +43,7 @@ const dictList = JSON.parse(localStorage.getItem("dictList")); export default { name: "ListViewWithHead", - components: { BaseSearchForm, BaseListTable, DialogWithMenu, DialogJustForm }, + components: { BaseSearchForm, BaseListTable, DialogWithMenu, DialogJustForm, DialogUpload }, props: { tableConfig: { type: Object, @@ -104,6 +86,7 @@ export default { dataList: [], tableLoading: false, subdialogVisible: false, + uploadDialogVisible: false, subdialogConfigs: { form: { rows: [ @@ -214,9 +197,9 @@ export default { const params = queryParams ? { ...queryParams, page: this.page, limit: this.size } : { - page: this.page, - limit: this.size, - }; + page: this.page, + limit: this.size, + }; if (!queryParams && this.listQueryExtra.length) { this.listQueryExtra.map((name) => { @@ -228,7 +211,7 @@ export default { .get(this.urls.page, { params: { ...params, - parentId: "0", + // parentId: "0", }, }) .then(({ data: res }) => { @@ -280,7 +263,7 @@ export default { } }); }) - .catch((err) => {}); + .catch((err) => { }); } case "edit": { this.openDialog(data); /** data is ==> id */ @@ -318,7 +301,16 @@ export default { }, handleRefreshDatalist() { - location.reload(); + // location.reload(); + this.getList() + }, + + openUploadDialog() { + this.uploadDialogVisible = true; + + this.$nextTick(() => { + this.$refs["upload-dialog"].init(); + }); }, handleBtnClick({ btnName, payload }) { @@ -331,6 +323,9 @@ export default { this.getList(payload); break; } + case "导入": + this.openUploadDialog(); + break; } }, diff --git a/src/views/modules/pms/material/config.js b/src/views/modules/pms/material/config.js index 50d0c76..59c8b76 100644 --- a/src/views/modules/pms/material/config.js +++ b/src/views/modules/pms/material/config.js @@ -5,18 +5,18 @@ import { timeFilter, dictFilter } from "@/utils/filters"; export default function () { const tableProps = [ - { type: 'index', label: '序号' }, - { prop: "code", label: "原料编码" }, - { prop: "description", label: "原料描述", }, - { prop: "name", label: "原料名称" }, - { prop: "typeDictValue", label: "类型", filter: dictFilter("material_category") }, // subcomponent: {/** TODO: create a new component for this option */} }, + { type: "index", label: "序号" }, + { width: 90, prop: "code", label: "原料编码" }, + { width: 240, prop: "description", label: "原料描述" }, + { width: 90, prop: "name", label: "原料名称" }, + { width: 90, prop: "typeDictValue", label: "类型", filter: dictFilter("material_category") }, // subcomponent: {/** TODO: create a new component for this option */} }, { prop: "baseMaterialCode", label: "基础原料编码" }, { prop: "baseMaterialDescription", label: "基础原料描述" }, // { prop: "type", label: "原料类型" }, - { prop: "density", label: "堆积密度" }, + { width: 90, prop: "density", label: "堆积密度" }, // { prop: "brandsOwner", label: "品牌" }, - { prop: "dosLow", label: "加料下限" }, - { prop: "dosHigh", label: "加料上限" }, + { width: 90, prop: "dosLow", label: "加料下限" }, + { width: 90, prop: "dosHigh", label: "加料上限" }, // { prop: "description", label: "详情", subcomponent: TableTextComponent }, // { prop: "remark", label: "中文描述" }, { prop: "createTime", label: "添加时间", filter: timeFilter }, @@ -30,7 +30,8 @@ export default function () { options: [ // { name: "add-sub", permission: "pms:material:save" }, { name: "edit", label: "编辑", icon: "edit-outline" }, - { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:material:save" },], + { name: "delete", icon: "delete", label: "删除", emitFull: true, permission: "pms:material:save" }, + ], }, ]; @@ -58,6 +59,16 @@ export default function () { plain: true, }, }, + { + button: { + type: "success", + name: "导入", + permission: "", + }, + bind: { + plain: true, + }, + }, ]; /** @@ -90,7 +101,6 @@ export default function () { elparams: { placeholder: "请输入原料编码" }, }, { input: true, label: "原料描述", prop: "description", elparams: { placeholder: "原料描述" } }, - ], [ // { @@ -135,8 +145,8 @@ export default function () { label: "基础原料", prop: "baseMaterialId", options: [], - optionLabel: 'code', - fetchData: () => this.$http.get('/pms/baseMaterial/page', { params: { limit: 999, page: 1, key: '' } }), + optionLabel: "code", + fetchData: () => this.$http.get("/pms/baseMaterial/page", { params: { limit: 999, page: 1, key: "" } }), elparams: { placeholder: "请选择基础原料" }, }, { input: true, label: "堆积密度(g/cm³)", prop: "density", elparams: { placeholder: "堆积密度" } }, @@ -155,7 +165,7 @@ export default function () { prop: "dosLow", rules: [ { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, ], elparams: { placeholder: "请输入加料下限" }, }, @@ -165,7 +175,7 @@ export default function () { prop: "dosHigh", rules: [ { required: true, message: "必填项不能为空", trigger: "blur" }, - { type: 'number', message: "请输入正确的数字类型", trigger: "blur", transform: val => Number(val) }, + { type: "number", message: "请输入正确的数字类型", trigger: "blur", transform: (val) => Number(val) }, ], elparams: { placeholder: "请输入加料上限" }, }, @@ -206,7 +216,7 @@ export default function () { // extraParams: ['stepId'], extraParams: "materialId", props: [ - { type: 'index', label: '序号' }, + { type: "index", label: "序号" }, { prop: "name", label: "属性名", isEditField: true }, { prop: "value", label: "属性值", isEditField: true }, { prop: "createTime", label: "添加时间", filter: timeFilter }, @@ -231,15 +241,9 @@ export default function () { extraParam: "materialId", forceAttachCode: true, rows: [ - [ - { input: true, label: "属性名", prop: "name", elparams: { placeholder: "请输入属性名" } } - ], - [ - { input: true, label: "属性值", prop: "value", elparams: { placeholder: "请输入属性值" } } - ], - [ - { input: true, label: "备注", prop: "remark", elparams: { placeholder: "请输入备注" } }, - ] + [{ input: true, label: "属性名", prop: "name", elparams: { placeholder: "请输入属性名" } }], + [{ input: true, label: "属性值", prop: "value", elparams: { placeholder: "请输入属性值" } }], + [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "请输入备注" } }], ], operations: [ { name: "add", label: "保存", type: "primary", permission: "pms:materialArrt:save", showOnEdit: false }, @@ -266,6 +270,8 @@ export default function () { tree: "/pms/material/tree", subase: "/pms/materialArrt", subpage: "/pms/materialArrt/page", + importUrl: "/pms/material/importExcel", + templateUrl: "/importTemplates/materialImport.xlsx", // more... }, }; diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js index 1aea499..46116d8 100644 --- a/src/views/modules/pms/product/config.js +++ b/src/views/modules/pms/product/config.js @@ -57,17 +57,23 @@ export default function () { }, { button: { - type: "plain", + type: "primary", name: "新增", permission: "pms:product:save", }, + bind: { + plain: true + } }, { button: { - type: "plain", + type: "success", name: "导入", permission: "", }, + bind: { + plain: true + } }, ]; @@ -220,7 +226,7 @@ export default function () { subase: "/pms/productArrt", subpage: "/pms/productArrt/page", importUrl: "/pms/product/import", - templateUrl: '/importTemplates/materialImport.xlsx' + templateUrl: '/importTemplates/productImport.xlsx' }, }; }