From 40ec1a1fc7c09d5958aa2449ca9f8dbbde912725 Mon Sep 17 00:00:00 2001
From: hhui <13856223047@163.com>
Date: Mon, 6 May 2024 17:34:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=BB=B4=E4=BF=AE=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/repairTest/repair/dialogOneForm.vue  |  8 ++++----
 .../repairTest/repair/dialogThreeForm.vue      |  6 +++---
 .../views/repairTest/repair/dialogTwoForm.vue  |  7 +++----
 sgzb-ui/src/views/repairTest/repair/upload.vue | 18 +++---------------
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
index df37e51d..6c7c5ea7 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
@@ -237,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() {
diff --git a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
index 3d2e7cff..aacd246b 100644
--- a/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
+++ b/sgzb-ui/src/views/repairTest/repair/dialogThreeForm.vue
@@ -65,7 +65,7 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="损坏照片1：">
+          <el-form-item label="损坏照片：">
             <!-- <uploadImage
               style="width: 250px"
               :value="fileList"
@@ -193,10 +193,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 @@
               <el-input v-model="domain.partName" placeholder="请输入" size="small" maxlength="50"
                 style="width: 350px"></el-input>
             </el-form-item>
-            <el-form-item label="是否收费：" required
-              :rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
+            <el-form-item label="是否收费：" required :rules="{ required: true, message: '请选择是否收费', trigger: 'blur', }">
               <el-radio-group style="width: 350px" v-model="domain.partType">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
@@ -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 @@
 <template>
-  <el-upload
-    class="upload-demo"
-    :action="actionUrl"
-    :on-preview="handlePreview"
-    :on-remove="handleRemove"
-    :before-remove="beforeRemove"
-    :multiple="multiple"
-    :limit="limit"
-    :on-exceed="handleExceed"
-    :file-list="fileList"
-    :headers="headers"
-    :on-success="handleSuccess"
-    :data="uploadData"
-    :before-upload="beforeUpload"
-  >
+  <el-upload class="upload-demo" :action="actionUrl" :on-preview="handlePreview" :on-remove="handleRemove"
+    :before-remove="beforeRemove" :multiple="multiple" :limit="limit" :on-exceed="handleExceed" :file-list="fileList"
+    :headers="headers" :on-success="handleSuccess" :data="uploadData" :before-upload="beforeUpload">
     <slot name="default">
       <el-button size="small" type="primary">点击上传</el-button>
     </slot>