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

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

@@ -48,8 +48,8 @@
       :loading="Loading.importLoading"
       :show="displayDialog.importDialog"
       :URL="URL"
-      :disabledMethod = {method1:false,method2:false,method3:false}
-      :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false}
+      :disabledMethod={method1:false,method2:false,method3:false}
+      :disabledIsAllowPartImport={isAllowPartImport1:false,isAllowPartImport2:false}
       methodValue="0"
       isAllowPartImportValue="1"
       @importClick="postImportMergeClick(arguments)"
@@ -114,6 +114,13 @@ export default {
     },
   },
   data () {
+    const validateQty = (rule, value, callback) => {
+      if (value <= 0) {
+        callback(new Error('最小值为1'))
+      } else {
+        callback()
+      }
+    }
     return {
       URL: 'basedata/item-pack',
       //常用按钮数据
@@ -131,7 +138,7 @@ export default {
         packName: null,
         packType: "EA",
         basicUom: null,
-        qty: 0,
+        qty: null,
         packCode: null,
         itemCode: null,
       },
@@ -143,7 +150,7 @@ export default {
         packName: null,
         packType: "EA",
         basicUom: null,
-        qty: 0,
+        qty: null,
         concurrencyStamp: null,
       },
       editOptions: {},
@@ -154,7 +161,7 @@ export default {
         { 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: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
+        { type: "inputNumber", label: "包装数量", prop: "qty", colSpan: 12, min:1 },
         { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -163,7 +170,7 @@ export default {
         { 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: "包装数量", prop: "qty", colSpan: 12, validType:'number' },
+        { type: "inputNumber", label: "包装数量", prop: "qty", colSpan: 12, min:1 },
         { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
@@ -173,6 +180,10 @@ export default {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
           packQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           packUom: [{ required: true, trigger: "blur", message: "不可为空" }],
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空且最小值为1" },
+            { required: true, trigger: 'blur', validator: validateQty }
+          ],
           conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }],
         },
         editRule: {
@@ -180,6 +191,10 @@ export default {
           itemCode: [{ required: true, trigger: "change", message: "不可为空" }],
           packQty: [{ required: true, trigger: "blur", message: "不可为空" }],
           packUom: [{ required: true, trigger: "blur", message: "不可为空" }],
+          qty: [
+            { required: true, trigger: "blur", message: "不可为空且最小值为1" },
+            { required: true, trigger: 'blur', validator: validateQty }
+          ],
           conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }],
         }
       },