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

fe/PC/src/views/basicData/ItemsManage/AQL.vue

@@ -164,10 +164,10 @@ export default {
         { 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.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "数量下限", valueType: Number, prop: "floorQty", colSpan: 12 },
-        { type: "input", label: "数量上限", valueType: Number, prop: "ceilingQty", colSpan: 12 },
-        { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 },
-        { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 },
+        { type: "input", label: "数量下限", prop: "floorQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
@@ -179,10 +179,10 @@ export default {
         { 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', 'SupplierBasic', '供应商选择', this.editFormData) }, colSpan: 12 },
-        { type: "input", label: "数量下限", valueType: Number, prop: "floorQty", colSpan: 12 },
-        { type: "input", label: "数量上限", valueType: Number, prop: "ceilingQty", colSpan: 12 },
-        { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 },
-        { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 },
+        { type: "input", label: "数量下限", prop: "floorQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检百分比%", prop: "samplePercent", validType:'number', colSpan: 12 },
+        { type: "input", label: "抽检数量", prop: "sampleQty", validType:'number', colSpan: 12 },
         { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },

fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue

@@ -216,7 +216,7 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", colSpan: 12 },
+        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
         { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
@@ -248,7 +248,7 @@ export default {
         { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 },
         { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 },
         // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 },
-        { type: "input", label: "有效值", prop: "validity", colSpan: 12 },
+        { type: "input", label: "有效值", prop: "validity", validType:'number', colSpan: 12 },
         { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
         { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 

fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue

@@ -136,14 +136,6 @@ export default {
         status: 1,
         description: null,
         inspectType: 1,
-        // inspFrequency: 0,
-        // inspFreqDays: 0,
-        // sampleQty: 0,
-        // samplePercent: 0,
-        // destructive: true,
-        // sampleByBatch: true,
-        // returnMethod: true,
-        company: null
       },
       //编辑
       editFormData: {
@@ -154,13 +146,6 @@ export default {
         status: 1,
         description: "",
         inspectType: 1,
-        // inspFrequency: 0,
-        // inspFreqDays: 0,
-        // sampleQty: 0,
-        // samplePercent: 0,
-        // destructive: true,
-        // sampleByBatch: true,
-        // returnMethod: true,
         concurrencyStamp: ""
       },
       editOptions: {},