From c3dfc401a9201c2f8f669a09045728548e0b06b0 Mon Sep 17 00:00:00 2001 From: lb Date: Thu, 23 Feb 2023 15:17:35 +0800 Subject: [PATCH] update --- src/views/modules/pms/bom/config.js | 9 ++- src/views/modules/pms/customer/config.js | 27 ++++++--- src/views/modules/pms/shape/config.js | 32 ++++++++--- src/views/modules/pms/supplier/config.js | 71 ++++++++++++------------ 4 files changed, 85 insertions(+), 54 deletions(-) diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js index 0be276a..f94d3e9 100644 --- a/src/views/modules/pms/bom/config.js +++ b/src/views/modules/pms/bom/config.js @@ -112,6 +112,12 @@ export default function () { // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, elparams: { placeholder: "请输入版本号" }, }, + { input: true, label: "物料销售文本(短)", prop: "shortDesc", elparams: { placeholder: "物料销售文本" } } + + ], + [{ textarea: true, label: "物料销售文本", prop: "description", elparams: { placeholder: "物料销售文本" } }], + [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], + [ { // input: true, forceDisabled: true, @@ -120,9 +126,8 @@ export default function () { key: 'sync', // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, // elparams: { placeholder: "请输入同步状态" }, - }, + } ], - [{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], ], operations: [ { name: "add", label: "保存", type: "primary", permission: "pms:bom:save", showOnEdit: false }, diff --git a/src/views/modules/pms/customer/config.js b/src/views/modules/pms/customer/config.js index 0c81b53..7ad650a 100644 --- a/src/views/modules/pms/customer/config.js +++ b/src/views/modules/pms/customer/config.js @@ -12,6 +12,7 @@ export default function () { { prop: "tel", label: "联系电话" }, { prop: "email", label: "联系邮箱" }, { prop: "address", label: "地址" }, + { prop: "prtTag", label: "是否打印标签", filter: val => ({ yes: '是', no: '否' })[val] ?? '-' }, { prop: "description", label: "描述" }, { prop: "remark", label: "备注" }, { @@ -75,14 +76,6 @@ export default function () { rules: { required: true, message: "必填项不能为空", trigger: "blur" }, elparams: { placeholder: "请输入编码" }, }, - ], - [ - { - input: true, - label: "联系人", - prop: "contact", - elparams: { placeholder: "请输入联系人" }, - }, { input: true, label: "地址", @@ -91,6 +84,12 @@ export default function () { }, ], [ + { + input: true, + label: "联系人", + prop: "contact", + elparams: { placeholder: "请输入联系人" }, + }, { input: true, label: "联系电话", @@ -104,7 +103,19 @@ export default function () { elparams: { placeholder: "请输入联系邮箱" }, }, ], + [ + { + select: true, + label: "是否打印标签", + prop: "prtTag", + elparams: { placeholder: "是否打印标签" }, + options: [ + { label: '是', value: 'yes' }, + { label: '否', value: 'no' }, + ] + }, + ], [{ 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 61cfb04..a940590 100644 --- a/src/views/modules/pms/shape/config.js +++ b/src/views/modules/pms/shape/config.js @@ -1,15 +1,17 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationComponent"; import switchBtn from "@/components/noTemplateComponents/switchBtn"; import request from "@/utils/request"; -import { timeFilter } from '@/utils/filters' +import { timeFilter } from "@/utils/filters"; export default function () { const tableProps = [ - { type: 'index', label: '序号' }, + { type: "index", label: "序号" }, { prop: "createTime", label: "添加时间", filter: timeFilter }, { prop: "name", label: "砖型名称" }, { prop: "code", label: "砖型编码" }, - { prop: "specifications", label: "规格" }, + { prop: "externalCode", label: "砖型ID" }, + { prop: "description", label: "长描述" }, + { prop: "shortDesc", label: "短描述" }, { prop: "remark", label: "备注" }, { prop: "operations", @@ -23,13 +25,13 @@ export default function () { const headFormFields = [ { - prop: 'key', + prop: "key", label: "砖型名称/编码", input: true, default: { value: "" }, bind: { - placeholder: '请输入砖型名称或编码' - } + placeholder: "请输入砖型名称或编码", + }, }, { button: { @@ -41,11 +43,11 @@ export default function () { button: { type: "primary", name: "新增", - permission: "pms:shape:save" + permission: "pms:shape:save", }, bind: { plain: true, - } + }, }, ]; @@ -93,7 +95,19 @@ export default function () { // elparams: { placeholder: "设定TT值（每小时下片数量）" }, // }, // ], - [{ input: true, label: "规格", prop: "specifications", elparams: { placeholder: "规格" } }, { input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], + [ + // { input: true, label: "规格", prop: "specifications", elparams: { placeholder: "规格" } }, + { + input: true, + label: "砖型ID", + prop: "externalCode", + rules: [{ type: 'number', trigger: "blur", message: "请输入数字类型", transform: val => Number(val) }], + elparams: { placeholder: "外部编码" }, + }, + { input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } }, + ], + [{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }], + [{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }], ], operations: [ { name: "add", label: "保存", type: "primary", permission: "pms:shape:save", showOnEdit: false }, diff --git a/src/views/modules/pms/supplier/config.js b/src/views/modules/pms/supplier/config.js index 5942b13..0b86aa8 100644 --- a/src/views/modules/pms/supplier/config.js +++ b/src/views/modules/pms/supplier/config.js @@ -93,42 +93,43 @@ export default function () { // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, elparams: { placeholder: "请输入供应商地址" }, }, - [ - { - input: true, - label: "联系电话", - prop: "tel", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, - elparams: { placeholder: "请输入联系电话" }, - }, - { - input: true, - label: "联系邮箱", - prop: "email", - // rules: { required: true, message: "必填项不能为空", 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: "必填项不能为空", trigger: "change" }, - // }, - // { - // input: true, - // label: "产线TT值", - // prop: "tvalue", - // rules: [ - // { required: true, message: "必填项不能为空", trigger: "blur" }, - // { type: "number", message: "数字", trigger: "blur", transform: (val) => Number(val) }, - // ], - // elparams: { placeholder: "设定TT值（每小时下片数量）" }, - // }, - ], - ], + [ + { + input: true, + label: "联系电话", + prop: "tel", + // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + elparams: { placeholder: "请输入联系电话" }, + }, + { + input: true, + label: "联系邮箱", + prop: "email", + // rules: { required: true, message: "必填项不能为空", 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: "必填项不能为空", trigger: "change" }, + // }, + // { + // input: true, + // label: "产线TT值", + // prop: "tvalue", + // rules: [ + // { required: true, message: "必填项不能为空", 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: "备注" } }], ],