From f4107ec904b17e8047135354d2d129ebd9fe1f07 Mon Sep 17 00:00:00 2001 From: lb Date: Tue, 14 Feb 2023 14:54:26 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=A1=A8=E6=A0=BC=E7=9A=84=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BaseListTable.vue | 228 +++++++++--------- src/views/atomViews/ListViewWithHead.vue | 2 + src/views/modules/pms/blenderStep/config.js | 6 +- src/views/modules/pms/car/config.js | 4 +- src/views/modules/pms/customer/config.js | 28 +-- src/views/modules/pms/equipment/config.js | 7 +- src/views/modules/pms/equipmentType/config.js | 1 + src/views/modules/pms/factory/config.js | 3 + src/views/modules/pms/material/config.js | 7 +- .../modules/pms/materialStorage/config.js | 3 + src/views/modules/pms/materialType/config.js | 7 +- src/views/modules/pms/product/config.js | 10 +- .../modules/pms/productionLine/config.js | 29 ++- src/views/modules/pms/shape/config.js | 5 +- src/views/modules/pms/supplier/config.js | 3 + src/views/modules/pms/workSequence/config.js | 3 + 16 files changed, 173 insertions(+), 173 deletions(-) diff --git a/src/components/BaseListTable.vue b/src/components/BaseListTable.vue index d48802a..34ff13e 100644 --- a/src/components/BaseListTable.vue +++ b/src/components/BaseListTable.vue @@ -1,80 +1,74 @@ diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index c6f3f8e..c887529 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -10,6 +10,8 @@ :column-config="tableConfig.column" :table-data="dataList" @operate-event="handleOperate" + :current-page="page" + :current-size="size" /> ['否', '是'][val] }, diff --git a/src/views/modules/pms/customer/config.js b/src/views/modules/pms/customer/config.js index 2761bf2..2d69e9c 100644 --- a/src/views/modules/pms/customer/config.js +++ b/src/views/modules/pms/customer/config.js @@ -1,16 +1,17 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; -import switchBtn from "@/components/noTemplateComponents/switchBtn"; import request from "@/utils/request"; +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "客户名称" }, { prop: "code", label: "编码" }, { prop: "tel", label: "联系电话" }, { prop: "email", label: "联系邮箱" }, { prop: "address", label: "地址" }, { prop: "contact", label: "联系人" }, - // { prop: "status", label: "产线状态", subcomponent: switchBtn }, // subcomponent { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, { @@ -80,48 +81,26 @@ export default function () { input: true, label: "联系电话", prop: "tel", - // rules: { required: true, message: "not empty", trigger: "blur" }, elparams: { placeholder: "请输入联系电话" }, }, { input: true, label: "联系邮箱", prop: "email", - // rules: { required: true, message: "not empty", trigger: "blur" }, elparams: { placeholder: "请输入联系邮箱" }, }, - // { - // select: true, - // label: "所属工厂", - // prop: "factoryId", - // fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }), - // option: [], - // rules: { required: true, message: "not empty", trigger: "change" }, - // }, - // { - // input: true, - // label: "产线TT值", - // prop: "tvalue", - // rules: [ - // { required: true, message: "not empty", trigger: "blur" }, - // { type: "number", message: "数字", trigger: "blur", transform: (val) => Number(val) }, - // ], - // elparams: { placeholder: "设定TT值(每小时下片数量)" }, - // }, ], [ { input: true, label: "地址", prop: "address", - // rules: { required: true, message: "not empty", trigger: "blur" }, elparams: { placeholder: "请输入客户地址" }, }, { input: true, label: "联系人", prop: "contact", - // rules: { required: true, message: "not empty", trigger: "blur" }, elparams: { placeholder: "请输入联系人" }, }, ], @@ -132,7 +111,6 @@ export default function () { { name: "add", label: "保存", type: "primary", permission: "pms:customer:save", showOnEdit: false }, { name: "update", label: "更新", type: "primary", permission: "pms:customer:update", showOnEdit: true }, { name: "reset", label: "重置", type: "warning", showAlways: true }, - // { name: 'cancel', label: '取消', showAlways: true }, ], }, }; diff --git a/src/views/modules/pms/equipment/config.js b/src/views/modules/pms/equipment/config.js index c10f66f..cb15421 100644 --- a/src/views/modules/pms/equipment/config.js +++ b/src/views/modules/pms/equipment/config.js @@ -7,6 +7,8 @@ import QuillRichInput from "@/components/noTemplateComponents/richInput"; export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: 'name', label: '设备名称' }, { prop: 'code', label: '设备编码' }, { prop: 'equipmentType', label: '设备类型' }, @@ -50,7 +52,7 @@ export default function () { const dialogConfigs = { clickModalToClose: true, - menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }], + menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }], form: { rows: [ [ @@ -89,7 +91,8 @@ export default function () { // extraParams: ['stepId'], extraParams: 'equipmentId', props: [ - { prop: 'createTime', label: '创建时间', filter: timeFilter }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, // { prop: 'equipmentId', label: '所属设备id' }, { prop: 'attrName', label: '属性名称', isEditField: true }, { prop: 'attrValue', label: '属性值', isEditField: true }, diff --git a/src/views/modules/pms/equipmentType/config.js b/src/views/modules/pms/equipmentType/config.js index c2148a8..a9c173f 100644 --- a/src/views/modules/pms/equipmentType/config.js +++ b/src/views/modules/pms/equipmentType/config.js @@ -5,6 +5,7 @@ import { dictFind, timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "类型名称" }, { prop: "code", label: "类型编码" }, diff --git a/src/views/modules/pms/factory/config.js b/src/views/modules/pms/factory/config.js index 84ae57c..e269635 100644 --- a/src/views/modules/pms/factory/config.js +++ b/src/views/modules/pms/factory/config.js @@ -1,8 +1,11 @@ import TableOperaionComponent from '@/components/noTemplateComponents/operationComponent' +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: 'name', label: '工厂名称' }, { prop: 'code', label: '工厂编码' }, { prop: 'address', label: '地址' }, diff --git a/src/views/modules/pms/material/config.js b/src/views/modules/pms/material/config.js index 5c395be..58212f4 100644 --- a/src/views/modules/pms/material/config.js +++ b/src/views/modules/pms/material/config.js @@ -5,8 +5,8 @@ import { timeFilter, dictFilter } from "@/utils/filters"; export default function () { const tableProps = [ - // { type: 'index', label: '序号' }, - // { prop: "createTime", label: "添加时间", filter: timeFilter }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "物料名称" }, { prop: "code", label: "物料编码" }, { prop: "typeDictValue", label: "类别", filter: dictFilter("material_category") }, // subcomponent: {/** TODO: create a new component for this option */} }, @@ -171,7 +171,8 @@ export default function () { // extraParams: ['stepId'], extraParams: "materialId", props: [ - { prop: "createTime", label: "添加时间", filter: timeFilter, isEditField: true }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "属性名", isEditField: true }, { prop: "value", label: "属性值", isEditField: true }, { diff --git a/src/views/modules/pms/materialStorage/config.js b/src/views/modules/pms/materialStorage/config.js index 7292055..5398678 100644 --- a/src/views/modules/pms/materialStorage/config.js +++ b/src/views/modules/pms/materialStorage/config.js @@ -2,9 +2,12 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC import switchBtn from "@/components/noTemplateComponents/switchBtn"; import request from "@/utils/request"; import { dictFilter } from '@/utils/filters' +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "料仓名称" }, { prop: "code", label: "料仓编码" }, { prop: "typeDictValue", label: "料仓类型", filter: dictFilter('liaocang') }, diff --git a/src/views/modules/pms/materialType/config.js b/src/views/modules/pms/materialType/config.js index 4cee201..c248e23 100644 --- a/src/views/modules/pms/materialType/config.js +++ b/src/views/modules/pms/materialType/config.js @@ -4,11 +4,12 @@ import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ - { prop: 'createTime', label: '添加时间', filter: timeFilter }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: 'name', label: '类型名称' }, - { prop: 'code', label: '类型编码' }, + { prop: 'code', label: '类型编码' }, { prop: 'enName', label: '英文名称' }, - { prop: 'enAb', label: '缩写' }, + { prop: 'enAb', label: '缩写' }, { prop: 'description', label: '描述', }, { prop: 'remark', label: '备注' }, { diff --git a/src/views/modules/pms/product/config.js b/src/views/modules/pms/product/config.js index 34e4bc8..1487687 100644 --- a/src/views/modules/pms/product/config.js +++ b/src/views/modules/pms/product/config.js @@ -6,7 +6,8 @@ import { timeFilter, dictFilter } from '@/utils/filters' export default function () { const tableProps = [ - { prop: 'createTime', label: '添加时间', filter: timeFilter }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: 'name', label: '产品名称' }, { prop: 'code', label: '产品编码' }, { prop: 'typeDictValue', label: '产品类型', filter: dictFilter('product_type') }, @@ -53,7 +54,7 @@ export default function () { const dictList = JSON.parse(localStorage.getItem('dictList') || {}) const dialogConfigs = { - menu: [{ name: '产品信息', key: 'info' }, { name: '产品属性信息', key: 'attr', onlyEditMode: true }, { name: '附件', key: 'attachment', onlyEditMode: true}], + menu: [{ name: '产品信息', key: 'info' }, { name: '产品属性信息', key: 'attr', onlyEditMode: true }, { name: '附件', key: 'attachment', onlyEditMode: true }], form: { rows: [ [ @@ -93,7 +94,8 @@ export default function () { // extraParams: ['stepId'], extraParams: 'productId', props: [ - { prop: 'createTime', label: '创建时间', filter: timeFilter }, + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, // { prop: 'productId', label: '产品ID' }, { prop: 'name', label: '属性名称', isEditField: true }, { prop: 'value', label: '属性值', isEditField: true }, @@ -120,7 +122,7 @@ export default function () { forceAttachCode: true, // 产品属性新增必填 code 字段...... rows: [ [ - { input: true, label: '属性名称', prop: 'name', rules: { required: true, message: 'not empty', trigger: 'blur' }, elparams: { placeholder: '请输入属性名称' } }, + { input: true, label: '属性名称', prop: 'name', rules: { required: true, message: 'not empty', trigger: 'blur' }, elparams: { placeholder: '请输入属性名称' } }, { input: true, label: '属性值', prop: 'value', rules: { required: true, message: 'not empty', trigger: 'blur' }, elparams: { placeholder: '请输入属性值' } }, ], [ diff --git a/src/views/modules/pms/productionLine/config.js b/src/views/modules/pms/productionLine/config.js index c3740e0..dde9a01 100644 --- a/src/views/modules/pms/productionLine/config.js +++ b/src/views/modules/pms/productionLine/config.js @@ -1,15 +1,18 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import switchBtn from "@/components/noTemplateComponents/switchBtn"; import request from "@/utils/request"; +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "产线名称" }, { prop: "code", label: "产线编码" }, { prop: "factory", label: "所属工厂" }, { prop: "status", label: "产线状态", subcomponent: switchBtn }, // subcomponent // TODO: 2023.2.3 产线状态切换功能不生效 - { prop: "tvalue", label: "每小时下片数量" }, + // { prop: "tvalue", label: "每小时下片数量" }, { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, { @@ -73,8 +76,6 @@ export default function () { rules: { required: true, message: "not empty", trigger: "blur" }, elparams: { placeholder: "请输入产线编码" }, }, - ], - [ { select: true, label: "所属工厂", @@ -83,17 +84,19 @@ export default function () { option: [], rules: { required: true, message: "not empty", trigger: "change" }, }, - { - input: true, - label: "产线TT值", - prop: "tvalue", - rules: [ - { required: true, message: "not empty", trigger: "blur" }, - { type: "number", message: "数字", trigger: "blur", transform: (val) => Number(val) }, - ], - elparams: { placeholder: "设定TT值(每小时下片数量)" }, - }, ], + // [ + // { + // input: true, + // label: "产线TT值", + // prop: "tvalue", + // rules: [ + // { required: true, message: "not empty", trigger: "blur" }, + // { type: "number", message: "数字", trigger: "blur", transform: (val) => Number(val) }, + // ], + // elparams: { placeholder: "设定TT值(每小时下片数量)" }, + // }, + // ], [{ textarea: true, label: "描述信息", prop: "description", elparams: { placeholder: "描述信息" } }], [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], ], diff --git a/src/views/modules/pms/shape/config.js b/src/views/modules/pms/shape/config.js index 17c796d..9efa17c 100644 --- a/src/views/modules/pms/shape/config.js +++ b/src/views/modules/pms/shape/config.js @@ -5,13 +5,10 @@ import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "砖型名称" }, { prop: "code", label: "砖型编码" }, - // { prop: "factory", label: "所属工厂" }, - // { prop: "status", label: "产线状态", subcomponent: switchBtn }, // subcomponent - // TODO: 2023.2.3 产线状态切换功能不生效 - // { prop: "tvalue", label: "每小时下片数量" }, { prop: "specifications", label: "规格" }, { prop: "remark", label: "备注" }, { diff --git a/src/views/modules/pms/supplier/config.js b/src/views/modules/pms/supplier/config.js index 90575e4..66003e5 100644 --- a/src/views/modules/pms/supplier/config.js +++ b/src/views/modules/pms/supplier/config.js @@ -1,9 +1,12 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import switchBtn from "@/components/noTemplateComponents/switchBtn"; import request from "@/utils/request"; +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "供应商名称" }, { prop: "code", label: "编码" }, { prop: "tel", label: "联系电话" }, diff --git a/src/views/modules/pms/workSequence/config.js b/src/views/modules/pms/workSequence/config.js index 793dfc9..e0d6436 100644 --- a/src/views/modules/pms/workSequence/config.js +++ b/src/views/modules/pms/workSequence/config.js @@ -1,8 +1,11 @@ import TableOperaionComponent from '@/components/noTemplateComponents/operationComponent' +import { timeFilter } from '@/utils/filters' export default function () { const tableProps = [ + { type: 'index', label: '序号' }, + { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: 'name', label: '工序名称' }, { prop: 'code', label: '工序编码' }, { prop: 'prdLine', label: '产线名称' },