diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue index 0647b8f..9d4b4d8 100644 --- a/src/views/contract/components/paymentRegistration.vue +++ b/src/views/contract/components/paymentRegistration.vue @@ -224,7 +224,7 @@ message: "必填" }, { - pattern: /^\d+(\.\d+)?$/, + pattern: /(^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d{1,2})?$)/, message: '必须为数字' } ], @@ -233,7 +233,7 @@ message: "必填" }, { - pattern: /^\d+(\.\d+)?$/, + pattern: /(^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d{1,2})?$)/, message: '必须为数字' } ], diff --git a/src/views/statisticalReport/quarterlyStatistics.vue b/src/views/statisticalReport/quarterlyStatistics.vue index 74ecf66..dc4ba55 100644 --- a/src/views/statisticalReport/quarterlyStatistics.vue +++ b/src/views/statisticalReport/quarterlyStatistics.vue @@ -122,10 +122,10 @@ export default { let labels = new Map([ [0, '第一季度'], [1, '第二季度'], - [3, '第三季度'], - [4, '10月'], - [5, '11月'], - [6, '12月'] + [2, '第三季度'], + [3, '10月'], + [4, '11月'], + [5, '12月'] ]) let arr = [] for (let z = 0;z < 6;z ++) {