From 6bec0d37fdc1397ff600533e99c69ea7257bd3e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Wed, 29 Mar 2023 13:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AE=9E=E6=97=B6=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicData/DictionaryManage/Category.vue | 4 ++-- .../views/basicData/ItemsManage/ItemPack.vue | 20 +++++++++---------- .../basicData/ItemsManage/ItemQuality.vue | 4 ++-- .../views/basicData/WarehouseManage/Area.vue | 4 ++-- .../basicData/WorkshopManage/Workshop.vue | 4 ++-- fe/PC/src/views/systemManage/userManage.vue | 1 + 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/fe/PC/src/views/basicData/DictionaryManage/Category.vue b/fe/PC/src/views/basicData/DictionaryManage/Category.vue index d658a646a..49edee035 100644 --- a/fe/PC/src/views/basicData/DictionaryManage/Category.vue +++ b/fe/PC/src/views/basicData/DictionaryManage/Category.vue @@ -124,13 +124,13 @@ export default { }, editOptions: {}, CreateForm: [ - { type: "input", label: "分类编号", prop: "code", colSpan: 12 }, + { type: "input", label: "分类编号", prop: "code", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "分类名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ - { type: "input", label: "分类编号", prop: "code", disabled:"true", colSpan: 12 }, + { type: "input", label: "分类编号", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "分类名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index 8fa6b7616..64ea1f726 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -155,29 +155,29 @@ export default { }, editOptions: {}, CreateForm: [ - { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12 }, + { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' }, { type: "input", label: "包装名称", prop: "packName", colSpan: 12 }, { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "filterSelect", label: "物料代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物料选择', this.CreateFormData) }, colSpan: 12 }, - { type: "input", label: "包装数量", valueType: Number, prop: "packQty", colSpan: 12 }, - { type: "input", label: "物料单位", prop: "packUom", colSpan: 12 }, + { type: "input", label: "包装数量", prop: "packQty", colSpan: 12, validType:'number' }, + { type: "input", label: "物料单位", prop: "packUom", colSpan: 12, validType:'numberLetter' }, { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12 }, - { type: "input", label: "转换率", valueType: Number, prop: "conversionRate", colSpan: 12 }, + { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12, validType:'numberLetter' }, + { type: "input", label: "转换率", prop: "conversionRate", colSpan: 12, validType:'number' }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ - { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12 }, + { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' }, { type: "input", label: "包装名称", prop: "packName", colSpan: 12 }, { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "input", label: "物料代码", prop: "itemCode", disabled:true, colSpan: 12 }, - { type: "input", label: "包装数量", valueType: Number, prop: "packQty", colSpan: 12 }, - { type: "input", label: "物料单位", prop: "packUom", colSpan: 12 }, + { type: "input", label: "包装数量", prop: "packQty", colSpan: 12, validType:'number' }, + { type: "input", label: "物料单位", prop: "packUom", colSpan: 12, validType:'numberLetter' }, { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12 }, - { type: "input", label: "转换率", valueType: Number, prop: "conversionRate", colSpan: 12 }, + { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12, validType:'numberLetter' }, + { type: "input", label: "转换率", prop: "conversionRate", colSpan: 12, validType:'number' }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue index d2e0ae862..f579a03f0 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue @@ -181,7 +181,7 @@ export default { ], editForm: [ { type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 }, - { type: "input", label: "物料名称", prop: "name", colSpan: 12 }, + { type: "input", label: "物料名称", prop: "name", colSpan: 12,disabled:"true", }, { type: "filterSelect", label: "供应商编号", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 }, @@ -199,7 +199,7 @@ export default { }, editRule: { itemCode: [{ required: true, trigger: "change", message: "不可为空" }], - name: [{ required: true, trigger: "change", message: "不可为空" }], + // name: [{ required: true, trigger: "change", message: "不可为空" }], status: [{ required: true, trigger: "blur", message: "不可为空" }], supplierCode: [{ required: true, trigger: "change", message: "不可为空" }], } diff --git a/fe/PC/src/views/basicData/WarehouseManage/Area.vue b/fe/PC/src/views/basicData/WarehouseManage/Area.vue index d7db64562..5c1e47e62 100644 --- a/fe/PC/src/views/basicData/WarehouseManage/Area.vue +++ b/fe/PC/src/views/basicData/WarehouseManage/Area.vue @@ -130,7 +130,7 @@ export default { }, editOptions: {}, CreateForm: [ - { type: "input", label: "区域代码", prop: "code", colSpan: 12 }, + { type: "input", label: "区域代码", prop: "code", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "区域名称", prop: 'name', colSpan: 12 }, { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, @@ -138,7 +138,7 @@ export default { { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ - { type: "input", label: "区域代码", prop: "code", disabled:"true", colSpan: 12 }, + { type: "input", label: "区域代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "区域名称", prop: 'name', colSpan: 12 }, { type: "select", label: "是否功能区", prop: "isFunctional", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "类型", prop: "areaType", options: "areaType", colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue b/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue index 29854b338..f02d500bb 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/Workshop.vue @@ -124,13 +124,13 @@ export default { }, editOptions: {}, CreateForm: [ - { type: "input", label: "车间代码", prop: "code", colSpan: 12 }, + { type: "input", label: "车间代码", prop: "code", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "车间名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ - { type: "input", label: "车间代码", prop: "code", disabled:"true", colSpan: 12 }, + { type: "input", label: "车间代码", prop: "code", disabled:"true", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "车间名称", prop: 'name', colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, diff --git a/fe/PC/src/views/systemManage/userManage.vue b/fe/PC/src/views/systemManage/userManage.vue index a6522df1c..bd7b40931 100644 --- a/fe/PC/src/views/systemManage/userManage.vue +++ b/fe/PC/src/views/systemManage/userManage.vue @@ -438,6 +438,7 @@ export default { ], password: [ // { required: true, trigger: "blur", validator: validpassword }, + { required: true, trigger: "blur", message: "请输入密码" }, { min: 6, max: 16,