maliang 2 semanas atrás
pai
commit
52f2b24b61

+ 2 - 2
jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -328,13 +328,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           {

+ 2 - 2
jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -312,7 +312,7 @@ export default {
             width: '120px',
             type: FormTypes.normal,
           },
-          // { title: '销售价', key: 'wholesaleDecimal', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }] },
+          // { title: '销售价', key: 'wholesaleDecimal', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }] },
           {
             title: '出库数量',
             key: 'operNumber',
@@ -320,7 +320,7 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           {
             title: '出库人',

+ 6 - 6
jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -494,13 +494,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           {
@@ -547,20 +547,20 @@ export default {
         changeAmount: {
           rules: [
             { required: true, message: '请输入金额,如果为空请填0!' },
-            { pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
+            { pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
           ],
         },
         depotId: {
           rules: [{ required: true, message: '请选择仓库名!' }],
         },
         discount: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         discountMoney: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         otherMoney: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
       },
       url: {

+ 5 - 5
jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -485,13 +485,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true, },
           {
@@ -526,13 +526,13 @@ export default {
           rules: [{ required: true, message: '请选择结算账户!' }],
         },
         price: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         discount: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         discountMoney: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
       },
       url: {

+ 5 - 5
jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -528,7 +528,7 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           {
             title: '税额',
@@ -568,18 +568,18 @@ export default {
           rules: [{ required: true, message: '请选择结算账户!' }],
         },
         discount: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         discountMoney: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         otherMoney: {
-          rules: [{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
         },
         changeAmount: {
           rules: [
             { required: true, message: '请输入金额,如果为空请填0!' },
-            { pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
+            { pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
           ],
         },
         depotId: {

+ 2 - 2
jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -589,10 +589,10 @@ export default {
           rules: [{ required: true, message: '请选择类别!' }],
         },
         defaultWholesaleDecimal: {
-          rules: [{ required: true, message: '请输入默认销售价!' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
+          rules: [{ required: true, message: '请输入默认销售价!' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
         },
         defaultPurchaseDecimal: {
-          rules: [{ required: true, message: '请输入默认采购价!' },{ pattern: /^(?!0+(\.0{1,4})?$)(?:[1-9]\d*|0)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
+          rules: [{ required: true, message: '请输入默认采购价!' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
         },
       },
       url: {