Showing
2 changed files
with
47 additions
and
30 deletions
| ... | @@ -312,20 +312,38 @@ export default { | ... | @@ -312,20 +312,38 @@ export default { |
| 312 | } | 312 | } |
| 313 | }; | 313 | }; |
| 314 | var checkQty = (rule, value, callback) => { | 314 | var checkQty = (rule, value, callback) => { |
| 315 | - if (!Number.isInteger(value)) { | 315 | + if (value === undefined || value === null || value === "") { |
| 316 | - callback(new Error("请输入整数值")); | 316 | + callback(new Error("请输入数值")); |
| 317 | - } else { | 317 | + return; |
| 318 | - if (value < 0) { | 318 | + } |
| 319 | - callback(new Error("数值不能为负")); | 319 | + |
| 320 | - } else { | 320 | + if (isNaN(value)) { |
| 321 | - const valueStr = value.toString(); | 321 | + callback(new Error("请输入有效的数字")); |
| 322 | - if (valueStr.length > 14) { | 322 | + return; |
| 323 | - callback(new Error("最多14位")); | 323 | + } |
| 324 | - } else { | 324 | + |
| 325 | - callback(); | 325 | + if (value < 0) { |
| 326 | - } | 326 | + callback(new Error("数值不能为负")); |
| 327 | - } | 327 | + return; |
| 328 | } | 328 | } |
| 329 | + | ||
| 330 | + const valueStr = value.toString(); | ||
| 331 | + | ||
| 332 | + const parts = valueStr.split("."); | ||
| 333 | + const integerPart = parts[0]; | ||
| 334 | + const decimalPart = parts[1] || ""; | ||
| 335 | + | ||
| 336 | + if (integerPart.length > 14) { | ||
| 337 | + callback(new Error("整数部分最多14位")); | ||
| 338 | + return; | ||
| 339 | + } | ||
| 340 | + | ||
| 341 | + if (decimalPart.length > 5) { | ||
| 342 | + callback(new Error("小数部分最多5位")); | ||
| 343 | + return; | ||
| 344 | + } | ||
| 345 | + | ||
| 346 | + callback(); | ||
| 329 | }; | 347 | }; |
| 330 | return { | 348 | return { |
| 331 | tableRowformData: {}, | 349 | tableRowformData: {}, | ... | ... |
| ... | @@ -55,23 +55,6 @@ | ... | @@ -55,23 +55,6 @@ |
| 55 | </el-row> | 55 | </el-row> |
| 56 | <el-row :gutter="5" type="flex" justify="center"> | 56 | <el-row :gutter="5" type="flex" justify="center"> |
| 57 | <el-col :span="10"> | 57 | <el-col :span="10"> |
| 58 | - <Formitem label="创建时间" prop="time"> | ||
| 59 | - <el-date-picker | ||
| 60 | - class="inputInner--time" | ||
| 61 | - id="inputInner--time" | ||
| 62 | - v-model="formData.time" | ||
| 63 | - type="daterange" | ||
| 64 | - format="yyyy-MM-dd" | ||
| 65 | - prefix-icon="none" | ||
| 66 | - value-format="yyyy-MM-dd" | ||
| 67 | - range-separator="至" | ||
| 68 | - @change="dateChange" | ||
| 69 | - style="background-color: #f2f2f2" | ||
| 70 | - /> | ||
| 71 | - </Formitem> | ||
| 72 | - </el-col> | ||
| 73 | - | ||
| 74 | - <el-col :span="10"> | ||
| 75 | <Formitem label="申报方式" prop="declareType"> | 58 | <Formitem label="申报方式" prop="declareType"> |
| 76 | <el-select | 59 | <el-select |
| 77 | type="text" | 60 | type="text" |
| ... | @@ -89,6 +72,22 @@ | ... | @@ -89,6 +72,22 @@ |
| 89 | </el-select> | 72 | </el-select> |
| 90 | </Formitem> | 73 | </Formitem> |
| 91 | </el-col> | 74 | </el-col> |
| 75 | + <el-col :span="10"> | ||
| 76 | + <Formitem label="创建时间" prop="time"> | ||
| 77 | + <el-date-picker | ||
| 78 | + class="inputInner--time" | ||
| 79 | + id="inputInner--time" | ||
| 80 | + v-model="formData.time" | ||
| 81 | + type="daterange" | ||
| 82 | + format="yyyy-MM-dd" | ||
| 83 | + prefix-icon="none" | ||
| 84 | + value-format="yyyy-MM-dd" | ||
| 85 | + range-separator="至" | ||
| 86 | + @change="dateChange" | ||
| 87 | + style="background-color: #f2f2f2" | ||
| 88 | + /> | ||
| 89 | + </Formitem> | ||
| 90 | + </el-col> | ||
| 92 | </el-row> | 91 | </el-row> |
| 93 | <el-row :gutter="5" type="flex" justify="center"> | 92 | <el-row :gutter="5" type="flex" justify="center"> |
| 94 | <el-col :span="10"> | 93 | <el-col :span="10"> | ... | ... |
-
Please register or login to post a comment