diff --git a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue index abc6751a..e40f12b3 100644 --- a/sgzb-ui/src/views/repairTest/brokenExamine/index.vue +++ b/sgzb-ui/src/views/repairTest/brokenExamine/index.vue @@ -1,53 +1,23 @@ diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue index 5fef4495..6c7c5ea7 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue @@ -47,12 +47,10 @@ style="width: 350px" type="textarea"> - - -
添加配件 + 删除
@@ -114,13 +112,10 @@ style="width: 350px" type="textarea"> - - - -
添加配件 + 删除
@@ -242,11 +237,11 @@ export default { }, //正则校验配件数量--维修数量 numberIntegerValidator(rule, value, callback) { - const reg = /^\+?[1-9][0-9]*$/; - if (value === '' || reg.test(value)) { - callback(); + const reg = /^\+?[1-9][0-9]*$/ + if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) { + callback() } else { - callback(new Error('请输入大于0的正整数')); + callback(new Error('请输入大于0的并且小于维修总量的正整数')) } }, getTree() { @@ -320,6 +315,13 @@ export default { key: Date.now() }); }, + delDomain(domain, type) { + if (type == 1) { + this.dynamicValidateForm.premiumList = this.dynamicValidateForm.premiumList.filter(item => item.key != domain.key); + } else { + this.dynamicValidateFormTwo.premiumListTwo = this.dynamicValidateFormTwo.premiumListTwo.filter(item => item.key != domain.key); + } + }, addDomainTwo() { this.dynamicValidateFormTwo.premiumListTwo.push({ selected: "N", diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue index 3d2e7cff..4cfe0162 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue @@ -28,7 +28,7 @@ @fileListChange="fileListChange" > --> 点击上传 @@ -65,7 +65,7 @@ - + 点击上传 @@ -176,11 +176,6 @@ export default { handlePreview(file) { console.log('file') }, - handleExceed(files, fileList) { - this.$message.warning( - `当前限制选择 3 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件` - ) - }, beforeRemove(file, fileList) { // return this.$confirm(`确定移除 ${file.name}?`); }, @@ -193,10 +188,10 @@ export default { //正则校验配件数量--维修数量 numberIntegerValidator(rule, value, callback) { const reg = /^\+?[1-9][0-9]*$/ - if (value === '' || reg.test(value)) { + if ((value === '' || reg.test(value)) && value <= this.rowObj.repairNum) { callback() } else { - callback(new Error('请输入大于0的正整数')) + callback(new Error('请输入大于0的并且小于维修总量的正整数')) } }, getList() { diff --git a/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue index 2cafb588..006c0eaa 100644 --- a/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue +++ b/sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue @@ -92,8 +92,7 @@ - + @@ -272,10 +271,10 @@ export default { //正则校验配件数量--维修数量 numberIntegerValidator(rule, value, callback) { const reg = /^\+?[1-9][0-9]*$/; - if (reg.test(value)) { + if (reg.test(value) && value <= this.rowObj.repairNum) { callback(); } else { - callback(new Error('请输入大于0的正整数')); + callback(new Error('请输入大于0的并且小于维修总量的正整数')); } }, getTree() { diff --git a/sgzb-ui/src/views/repairTest/repair/upload.vue b/sgzb-ui/src/views/repairTest/repair/upload.vue index 69603561..a6e8692a 100644 --- a/sgzb-ui/src/views/repairTest/repair/upload.vue +++ b/sgzb-ui/src/views/repairTest/repair/upload.vue @@ -1,19 +1,7 @@