Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

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 },

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: {

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: "不可为空" }],
         }

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 },

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 },

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,