Merge branch 'master' of http://gitlab.91isoft.com:90/car-database/car-database-web

src/views/review/createReview/deleteReviewDetails/index.vue

@@ -2,6 +2,7 @@
   <div class="review-data">
     <el-form
       :model="formModel"
+      ref="formItemName"
       :rules="formRules"
       label-width="200px"
       label-position="top"
@@ -10,19 +11,19 @@
         class="standard-text"
         style="margin-top: 20px; font-size: 24px; font-weight: bold"
       >
-        检验标准：{{this.pageIndexSec.standardNo}}
+        检验标准：{{ this.pageIndexSec.standardNo }}
       </div>
       <div class="subtitle">评审对象</div>
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item label="检验类型" prop="jianyanleixing">
             <el-select
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option
                 v-for="dict in dict.type.sys_scene_type"
@@ -38,8 +39,9 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
             <el-button type="primary" plain @click="handleReSelectRequirements"
+     
               >选择标准要求</el-button
             ><span>
               {{ selectedRequirement.chapter }}
@@ -61,7 +63,7 @@
 
                   <el-table-column prop="testMethod" label="测试方法">
                   </el-table-column>
-<!-- 
+                  <!-- 
                   <el-table-column prop="name" label="标准名称">
                   </el-table-column>
 
@@ -93,7 +95,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查要点" prop="shenchayaodian">
+          <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
             <el-button type="primary" plain @click="handleReSelectKeypoints"
               >选择审查要点</el-button
             ><span>{{ selectedKeyPoints.text }}</span>
@@ -141,7 +143,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查细则" prop="shenchaxize">
+          <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
             <el-button type="primary" plain @click="handleReSelectDetails"
               >选择审查细则</el-button
             ><span>{{ selectedDetails.text }}</span>
@@ -193,7 +195,7 @@
         </el-col>
         <el-col :span="3"><p></p></el-col>
       </el-row>
-<!-- 
+      <!-- 
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="8">
@@ -242,7 +244,6 @@
           <el-form-item label="">
             <el-input
               v-model="formModel.beizhuxinxi"
-
               type="textarea"
               placeholder="请输入备注信息"
               maxlength="100"
@@ -327,9 +328,9 @@ export default {
         reviewSceneId: '',
         reviewStandardId: '',
 
-        usecaseId:'',
-        usecaseDescribe:'',
-        reviewUsecaseId:'',
+        usecaseId: '',
+        usecaseDescribe: '',
+        reviewUsecaseId: ''
       },
       selectedRequirement: {
         id: '',
@@ -355,30 +356,62 @@ export default {
       receivedRequirements: {},
       receivedkeypoints: {},
       receivedDetails: {},
-      receivedReviewer:{},
+      receivedReviewer: {},
       dialogVisible: false,
       dialogVisibleKeypoints: false,
       dialogVisibleDetails: false,
-      newReviewSceneText:'',
-      newReviewSceneRemark:'',
+      newReviewSceneText: '',
+      newReviewSceneRemark: '',
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
+        jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
         ],
-        biaozhuntiuaokuan: [
-          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchayaodian: [
-          { required: true, message: '请输入审查要点', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchachangjing: [
-          { required: true, message: '请输入审查场景', trigger: 'blur' }
+          { required: true, message: '请填写审查场景', trigger: 'change' }
         ]
-      },
-      
+      }
     }
   },
   mounted() {
@@ -391,9 +424,9 @@ export default {
       .catch(error => {
         console.log('testReviewer方法出错', error)
       })
-      this.newResData.standardNo = this.pageIndexSec.standardNo
-      this.newResData.standardId = this.pageIndexSec.id
-      this.newResData.name = this.pageIndexSec.name
+    this.newResData.standardNo = this.pageIndexSec.standardNo
+    this.newResData.standardId = this.pageIndexSec.id
+    this.newResData.name = this.pageIndexSec.name
   },
   methods: {
     //下拉框 选择检验类型
@@ -515,39 +548,57 @@ export default {
     // 按钮-确认发起
     handleConfirm() {
       console.log('this.value = ', this.formModel)
-      this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
-      this.newResDataAdd.standard = this.selectedRequirementSave.name
-      this.newResDataAdd.details = this.selectedDetailsSave.text
-      this.newResDataAdd.detailsId = this.selectedDetailsSave.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
-      
-      
+      if (this.selectedRequirementSave) {
+        this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
+        this.newResDataAdd.standard = this.selectedRequirementSave.name
+        this.formModel.biaozhunyaoqiu = this.selectedRequirementSave.text
+      }
+      if (this.selectedDetailsSave) {
+        this.newResDataAdd.details = this.selectedDetailsSave.text
+      }
+      if (this.selectedDetailsSave) {
+        this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+      }
+
+      if (this.selectedKeyPointsSave) {
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
-      
-      this.newResDataAdd.newText =  this.selectedDetailsSave.text
+      if (this.selectedDetailsSave) {
+        this.newResDataAdd.newText = this.selectedDetailsSave.text
+      }
+
       this.newResDataAdd.remark = this.newReviewSceneRemark
-      
 
-      console.log(this.newResDataAdd,'提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
-        .then(response => {
-          const aa = response
-          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
-            this.timer = setTimeout(() => {
-              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
-          } else {
-            this.$message({
-              message: '提交失败',
-              type: 'error'
+      console.log(this.newResDataAdd, '提交之前')
+      this.$refs.formItemName.validate(valid => {
+        if (valid) {
+          testInitatereviewAdd(this.newResDataAdd)
+            .then(response => {
+              const aa = response
+              if (aa) {
+                this.$message.success('提交成功 页面将在5秒后跳转')
+                this.timer = setTimeout(() => {
+                  this.$router.push({ path: '/review/initiatedReview' })
+                }, 5000)
+              } else {
+                this.$message({
+                  message: '提交失败',
+                  type: 'error'
+                })
+              }
             })
-          }
-        })
-        .catch(error => {
-          console.log('testInitatereviewAdd方法出错', error)
+            .catch(error => {
+              console.log('testInitatereviewAdd方法出错', error)
+            })
+        } else {
+          this.$message({
+            message: '提交失败,请填写所有必填项目',
+            type: 'error'
+          })
+        }
+      })
 
-        })
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText
@@ -604,26 +655,26 @@ export default {
     }
   }
   .assessor-text {
-  background: #f5f5f5;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  padding: 7px 10px;
-  font-family: Microsoft YaHei, Microsoft YaHei-400;
-  font-weight: 400;
-  text-align: left;
-  color: #606266;
-  line-height: 16px;
-  .review-member {
-    display: flex;
-    flex-wrap: wrap; /* 可选，允许自动换行 */
-    gap: 10px; /* 控制每个 span 之间的间距 */
-    .review-member-text {
-      display: inline-block; /* 或者使用 inline */
-      margin-right: 10px; /* 设定各个 span 之间的间距 */
-      width: 200px;
+    background: #f5f5f5;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    padding: 7px 10px;
+    font-family: Microsoft YaHei, Microsoft YaHei-400;
+    font-weight: 400;
+    text-align: left;
+    color: #606266;
+    line-height: 16px;
+    .review-member {
+      display: flex;
+      flex-wrap: wrap; /* 可选，允许自动换行 */
+      gap: 10px; /* 控制每个 span 之间的间距 */
+      .review-member-text {
+        display: inline-block; /* 或者使用 inline */
+        margin-right: 10px; /* 设定各个 span 之间的间距 */
+        width: 200px;
+      }
     }
   }
-}
   ::v-deep.el-form-item.is-required:not(.is-no-asterisk)
     > .el-form-item__label:before,
   .el-form-item.is-required:not(.is-no-asterisk)

src/views/review/createReview/deleteReviewKeypoints/index.vue

@@ -3,6 +3,7 @@
     <el-form
       :model="formModel"
       :rules="formRules"
+      ref="formItemName"
       label-width="200px"
       label-position="top"
     >
@@ -16,13 +17,13 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
             <el-select
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option
                 v-for="dict in dict.type.sys_scene_type"
@@ -38,7 +39,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
@@ -93,7 +94,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查要点" prop="shenchayaodian">
+          <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
             <el-button type="primary" plain @click="handleReSelectKeypoints"
               >选择审查要点</el-button
             ><span>{{ selectedKeyPoints.text }}</span>
@@ -307,20 +308,53 @@ export default {
       newReviewKeypointText:'',
       newReviewDetailText:'',
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
+        jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
         ],
-        biaozhuntiuaokuan: [
-          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchayaodian: [
-          { required: true, message: '请输入审查要点', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchachangjing: [
-          { required: true, message: '请输入审查场景', trigger: 'blur' }
+          { required: true, message: '请填写审查场景', trigger: 'change' }
         ]
       }
     }
@@ -462,6 +496,7 @@ export default {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
+
       this.newResDataAdd.details = this.newReviewDetailText
       
      
@@ -472,9 +507,14 @@ export default {
       this.newResDataAdd.remark = this.newReviewSceneRemark
 
       // this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      if(this.selectedKeyPointsSave){
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
+     
       console.log(this.newResDataAdd.inspectStandardId, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -493,6 +533,14 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
+      
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText

src/views/review/createReview/deleteReviewScene/index.vue

@@ -3,6 +3,7 @@
     <el-form
       :model="formModel"
       :rules="formRules"
+      ref="formItemName"
       label-width="200px"
       label-position="top"
     >
@@ -16,13 +17,17 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item
+            label="检验类型"
+            prop="jianyanleixing"
+            v-model="formModel.jianyanleixing"
+          >
             <el-select
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option
                 v-for="dict in dict.type.sys_scene_type"
@@ -38,7 +43,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+          <el-form-item
+            label="标准要求"
+            prop="biaozhunyaoqiu"
+            v-model="formModel.biaozhunyaoqiu"
+          >
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
@@ -93,7 +102,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查要点" prop="shenchayaodian">
+          <el-form-item
+            label="审查要点"
+            prop="shenchayaodian"
+            v-model="formModel.shenchayaodian"
+          >
             <el-button type="primary" plain @click="handleReSelectKeypoints"
               >选择审查要点</el-button
             ><span>{{ selectedKeyPoints.text }}</span>
@@ -141,7 +154,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查细则" prop="shenchaxize">
+          <el-form-item
+            label="审查细则"
+            prop="shenchaxize"
+            v-model="formModel.shenchaxize"
+          >
             <el-button type="primary" plain @click="handleReSelectDetails"
               >选择审查细则</el-button
             ><span>{{ selectedDetails.text }}</span>
@@ -197,7 +214,11 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="8">
-          <el-form-item label="审查场景" prop="shenchachangjing">
+          <el-form-item
+            label="审查场景"
+            prop="shenchachangjing"
+            v-model="formModel.shenchachangjing"
+          >
             <el-button type="primary" plain @click="handleReSelectScene"
               >选择审查场景</el-button
             ><span>{{ selectedScene.text }}</span>
@@ -313,6 +334,7 @@ import {
   testScene,
   testReviewer
 } from '@/api/task/test'
+
 // import dialogVue from '../../../processing/checkFileLibrary/components/dialog.vue'
 
 export default {
@@ -365,9 +387,9 @@ export default {
         reviewSceneId: '',
         reviewStandardId: '',
 
-        usecaseId:'',
-        usecaseDescribe:'',
-        reviewUsecaseId:'',
+        usecaseId: '',
+        usecaseDescribe: '',
+        reviewUsecaseId: ''
       },
       selectedRequirement: {
         id: '',
@@ -400,7 +422,7 @@ export default {
       receivedkeypoints: {},
       receivedDetails: {},
       receivedScene: {},
-      receivedReviewer:{},
+      receivedReviewer: {},
       dialogVisible: false,
       dialogVisibleKeypoints: false,
       dialogVisibleDetails: false,
@@ -408,20 +430,64 @@ export default {
       newReviewSceneText: '',
       newReviewSceneRemark: '',
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
+        jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
         ],
-        biaozhuntiuaokuan: [
-          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchayaodian: [
-          { required: true, message: '请输入审查要点', trigger: 'blur' }
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchachangjing: [
-          { required: true, message: '请输入审查场景', trigger: 'blur' }
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedScene.text) {
+                callback(new Error('请选择审查场景'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ]
       }
     }
@@ -436,9 +502,9 @@ export default {
       .catch(error => {
         console.log('testReviewer方法出错', error)
       })
-      this.newResData.standardNo = this.pageIndexSec.standardNo
-      this.newResData.standardId = this.pageIndexSec.id
-      this.newResData.name = this.pageIndexSec.name
+    this.newResData.standardNo = this.pageIndexSec.standardNo
+    this.newResData.standardId = this.pageIndexSec.id
+    this.newResData.name = this.pageIndexSec.name
   },
   methods: {
     //下拉框 选择检验类型
@@ -575,37 +641,57 @@ export default {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
-      this.newResDataAdd.details = this.selectedDetailsSave.text
-      this.newResDataAdd.detailsId = this.selectedDetailsSave.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      if (this.selectedDetailsSave) {
+        this.newResDataAdd.details = this.selectedDetailsSave.text
+      }
+      if (this.selectedDetailsSave) {
+        this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+      }
+      if (this.selectedKeyPointsSave) {
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
 
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
-
-      this.newResDataAdd.newText = this.newReviewSceneText
+      if (this.selectedScene) {
+        this.newResDataAdd.newText =
+          this.selectedScene.text
+      }
       this.newResDataAdd.remark = this.newReviewSceneRemark
-
-      this.newResDataAdd.reviewSceneId = this.selectedSceneSave.id
+      if (this.selectedSceneSave) {
+        this.newResDataAdd.reviewSceneId = this.selectedSceneSave.id
+      }
+      this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+          this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
+          this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
 
       console.log(this.newResDataAdd, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
-        .then(response => {
-          const aa = response
-          if (aa) {
-            this.$message.success('提交成功 页面将在5秒后跳转')
-            this.timer = setTimeout(() => {
-              this.$router.push({ path: '/review/initiatedReview' })
-            }, 5000)
-          } else {
-            this.$message({
-              message: '提交失败',
-              type: 'error'
+      this.$refs.formItemName.validate(valid => {
+        if (valid) {
+          testInitatereviewAdd(this.newResDataAdd)
+            .then(response => {
+              const aa = response
+              if (aa) {
+                this.$message.success('提交成功 页面将在5秒后跳转')
+                this.timer = setTimeout(() => {
+                  this.$router.push({ path: '/review/initiatedReview' })
+                }, 5000)
+              } else {
+                this.$message({
+                  message: '提交失败',
+                  type: 'error'
+                })
+              }
             })
-          }
-        })
-        .catch(error => {
-          console.log('testInitatereviewAdd方法出错', error)
-
-        })
+            .catch(error => {
+              console.log('testInitatereviewAdd方法出错', error)
+            })
+        } else {
+          this.$message({
+            message: '提交失败,请填写所有必填项目',
+            type: 'error'
+          })
+        }
+      })
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText
@@ -667,26 +753,26 @@ export default {
     }
   }
   .assessor-text {
-  background: #f5f5f5;
-  border: 1px solid #d9d9d9;
-  border-radius: 4px;
-  padding: 7px 10px;
-  font-family: Microsoft YaHei, Microsoft YaHei-400;
-  font-weight: 400;
-  text-align: left;
-  color: #606266;
-  line-height: 16px;
-  .review-member {
-    display: flex;
-    flex-wrap: wrap; /* 可选，允许自动换行 */
-    gap: 10px; /* 控制每个 span 之间的间距 */
-    .review-member-text {
-      display: inline-block; /* 或者使用 inline */
-      margin-right: 10px; /* 设定各个 span 之间的间距 */
-      width: 200px;
+    background: #f5f5f5;
+    border: 1px solid #d9d9d9;
+    border-radius: 4px;
+    padding: 7px 10px;
+    font-family: Microsoft YaHei, Microsoft YaHei-400;
+    font-weight: 400;
+    text-align: left;
+    color: #606266;
+    line-height: 16px;
+    .review-member {
+      display: flex;
+      flex-wrap: wrap; /* 可选，允许自动换行 */
+      gap: 10px; /* 控制每个 span 之间的间距 */
+      .review-member-text {
+        display: inline-block; /* 或者使用 inline */
+        margin-right: 10px; /* 设定各个 span 之间的间距 */
+        width: 200px;
+      }
     }
   }
-}
   ::v-deep.el-form-item.is-required:not(.is-no-asterisk)
     > .el-form-item__label:before,
   .el-form-item.is-required:not(.is-no-asterisk)

src/views/review/createReview/deleteUseCase/index.vue

@@ -17,18 +17,21 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="jianyanleixing">
+          <el-form-item label="检验类型" prop="jianyanleixing" >
             <el-select
               form-rules="jianyanleixing"
-              v-model="formModel.tiaokuanfenlei"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
               disabled
+              @change="handleSelectType(formModel.jianyanleixing)"
               placeholder="车型检验"
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
             >
               <el-option
-                :value = '车型检验'
+                v-for="dict in dict.type.sys_scene_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
               />
             </el-select>
           </el-form-item>
@@ -38,50 +41,70 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="测试用例" prop="ceshiyongli">
-            <el-button type="primary" plain @click="handleReSelectRequirements"
+          <el-form-item label="测试用例" prop="ceshiyongli" v-model="formModel.ceshiyongli">
+            <el-button type="primary" plain @click="handleSelectUseCase"
               >选择测试用例</el-button
             ><span>
-              {{ selectedRequirement.chapter }}
-              {{ selectedRequirement.text }}</span
+              </span
             >
             <div>
-              <!-- 选择标准要求弹窗 -->
-              <el-dialog title="" :visible.sync="dialogVisible" width="70%">
-                <!-- 表格 -->
-                <el-table
-                  :data="this.receivedRequirements.rows"
-                  style="width: 100%"
-                >
-                  <el-table-column prop="chapter" label="标准章节" width="100">
-                  </el-table-column>
-
-                  <el-table-column prop="text" label="标准要求">
-                  </el-table-column>
-
-                  <el-table-column prop="testMethod" label="测试方法">
-                  </el-table-column>
-
-                  <!-- <el-table-column prop="name" label="标准名称">
-                  </el-table-column>
-
-                  <el-table-column prop="standardNo" label="标准号">
-                  </el-table-column> -->
-                  <el-table-column label="选择">
-                    <template slot-scope="scope">
-                      <el-radio-group v-model="selectedRequirement">
-                        <el-radio
-                          :label="scope.row"
-                          class="hidden-lable"
-                        ></el-radio>
-                      </el-radio-group>
-                    </template>
-                  </el-table-column>
-                </el-table>
-
+              <!-- 选择测试用例弹窗 -->
+              <el-dialog
+                title=""
+                :visible.sync="dialogVisibleUseCase"
+                width="70%"
+                ><!-- 循环生成表格 表格内循环展示数据 -->
+                <collapse v-model="activeNames" class="mt10">
+                  <collapse-item
+                    v-for="(item, key3) in receivedUseCase.useCases"
+                    :key="key3"
+                    :name="item.serialNumber"
+                  >
+                    <span slot="title" style="width: 100%">
+                      <div class="standard-box">
+                        <div class="standard-left">
+                          <div class="standard-title">
+                            <div class="standard">标准要求：</div>
+                            {{ item.serialNumber + item.requirements }}
+                          </div>
+                        </div>
+                      </div>
+                    </span>
+                    <table
+                      class="table"
+                      v-if="item.useCases && item.useCases.length"
+                    >
+                      <tr class="tr">
+                        <th>用例编号</th>
+                        <th>用例描述</th>
+                        <th>操作</th>
+                      </tr>
+                      <tr v-for="(item, key4) in item.useCases">
+                        <td>{{ item.customizedID }}</td>
+                        <td>
+                          {{ item.description }}
+                        </td>
+                        <td>
+                          <template >
+                            <div>
+                              <el-radio-group v-model="selectedUseCase">
+                                <el-radio
+                                :label="item"
+                                class="hidden-lable">选择
+                              </el-radio>
+                              </el-radio-group>
+                            </div>
+                          </template>
+                        </td>
+                      </tr>
+                    </table>
+                  </collapse-item>
+                </collapse>
                 <!-- 弹窗底部 -->
                 <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisible = false">确认</el-button>
+                  <el-button @click="dialogVisibleUseCase = false"
+                    >确认</el-button
+                  >
                 </div>
               </el-dialog>
             </div>
@@ -94,7 +117,7 @@
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
           <el-form-item label="标准要求:" prop="biaozhunyaoqiu">
-            {{ 标准要求 }}
+            {{ this.selectedUseCase.customizedID.slice(0,-2) }}
           </el-form-item>
         </el-col>
 
@@ -105,7 +128,7 @@
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
           <el-form-item label="用例编号:" prop="yonglibianhao" style="color: red;">
-           {{ 用例编号 }}
+            {{ this.selectedUseCase.customizedID }}
           </el-form-item>
         </el-col>
 
@@ -117,7 +140,7 @@
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
           <el-form-item label="用例描述:" prop="yonglimiaoshu" style="color: red;">
-           {{ 用例描述 }}
+            {{ this.selectedUseCase.description }}
           </el-form-item> </el-col
         ><el-col :span="3"><p></p></el-col>
       </el-row>
@@ -186,10 +209,18 @@ import {
   testDetails,
   testInitatereviewAdd,
   testReviewer,
-  testUseCase
+  testUseCase,
+  testUseCaseListAll
 } from '@/api/task/test'
+import collapse from '@/components/Collapse/collapse'
+import collapseItem from '@/components/Collapse/collapse-item'
+import { slice } from 'lodash';
 
 export default {
+  components: {
+    collapse: collapse,
+    'collapse-item': collapseItem
+  },
   name: 'ReviewData',
   dicts: ['sys_scene_type'],
 
@@ -204,6 +235,7 @@ export default {
   },
   data() {
     return {
+      activeNames: [],
       standardId: '',
       keypointId: '',
       detailsId: '',
@@ -264,18 +296,37 @@ export default {
         text: ''
       },
       selectedDetailsSave: null,
+      selectedUseCase:{
+        id: '',
+        description: '',
+        customizedID: '',
+      },
+      selectedUseCaseSave:null,
       receivedRequirements: {},
       receivedkeypoints: {},
       receivedDetails: {},
       receivedReviewer: {},
+      receivedUseCase: {
+        standardId: null,
+        standardNo: '',
+        useCaseResponseDTOList: [
+          {
+            id: 0,
+            usecaseId: '',
+            usecaseDescribe: '',
+            reviewStandardId: 0
+          }
+        ]
+      },
       dialogVisible: false,
       dialogVisibleKeypoints: false,
       dialogVisibleDetails: false,
+      dialogVisibleUseCase: false,
       newReviewSceneText: '',
       newReviewSceneRemark: '',
       formRules: {
         tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
+          { required: true, message: '请选择条款分类', trigger: 'change' }
         ],
         // jianyanleixing: [
         //   { required: true, message: '请选择标准条款', trigger: 'blur' }
@@ -284,18 +335,28 @@ export default {
         //   { required: true, message: '请输入用例编号', trigger: 'blur' }
         // ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+          { required: true, message: '请输入审查细则', trigger: 'change' }
         ],
         // yonglimiaoshu: [
         //   { required: true, message: '请输入用例描述', trigger: 'blur' }
         // ]
         ceshiyongli: [
-          { required: true, message: '请选择测试用例', trigger: 'blur' }
+          {   validator: (rule, value, callback) => {
+              
+              if (!this.selectedUseCase) {
+                callback(new Error('请选择测试用例'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true }
         ]
       },
       formItemName: {
-        biaozhunyaoqiu: '',
-        biaozhuntiaokuan: '',
+        tiaokuanfenlei:'',
+        // biaozhunyaoqiu: '',
+        // biaozhuntiaokuan: '',
         // yonglibianhao: '',
         shenchaxize: '',
         ceshiyongli:'',
@@ -432,28 +493,60 @@ export default {
 
       //oldText => 不用填直接为默认的‘’就行
       //reviewSceneId => 不用填直接默认不给值就行，
+    },
+     // 按钮-选择测试用例
+     handleSelectUseCase() {
+      this.dialogVisibleUseCase = true
+
+      testUseCaseListAll({
+        offset: {
+          offset: 0,
+          limit: 9999
+        },
+        name: this.pageIndexSec.name
+      })
+        .then(res => {
+          this.receivedUseCase = res.data
+          return
+        })
+        .catch(error => {
+          console.log('testUseCase方法出错', error)
+        })
     },
     // 按钮-确认发起
     handleConfirm() {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
-      this.newResDataAdd.details = this.selectedDetailsSave.text
-      this.newResDataAdd.detailsId = this.selectedDetailsSave.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.details = this.selectedDetailsSave.text
+      }
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+      }
+      
+      if(this.selectedKeyPointsSave){
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
+
 
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
 
-      this.newResDataAdd.newText = this.formModel.yonglibianhao
+      this.newResDataAdd.newText = this.selectedUseCase.customizedID
       this.newResDataAdd.remark = this.newReviewSceneRemark
       this.newResDataAdd.type = 'car'
-
-        this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
-        this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
-        this.newResDataAdd.reviewUsecaseId = ''
+      this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+          this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
+          this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
+   
+      this.newResDataAdd.usecaseId = ''
+      this.newResDataAdd.usecaseDescribe = this.selectedUseCase.description
+      this.newResDataAdd.reviewUsecaseId = ''
 
       console.log(this.newResDataAdd, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -472,6 +565,14 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
+      
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText
@@ -502,6 +603,10 @@ export default {
       this.selectedDetailsSave = newVal
       console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave)
       this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+    },
+    selectedUseCase(newVal){
+      this.selectedUseCaseSave = newVal
+      console.log('selectedUseCase的新值:',this.selectedUseCaseSave)
     }
   }
 }

src/views/review/createReview/index.vue

@@ -340,7 +340,6 @@ import DeleteScene from './deleteReviewScene'
 import UseCase from './newUseCase'
 import DeleteUseCase from './deleteUseCase'
 import UpdateUseCase from './updateUseCase'
-
 import { testInitatereview } from '@/api/task/test'
 
 export default {
@@ -376,7 +375,10 @@ export default {
       formModel: {
         ask: '1',
         reviewType: '0',
-        reviewSubtype: '0'
+        reviewSubtype: '0',
+        biaozhunyaoqiu: '',
+        yonglibianhao: '',
+        yonglimiaoshu: ''
         // pageNum: 1,
         // pageSize: 10,
         // standardNo: '',

src/views/review/createReview/newReviewDetails/index.vue

@@ -3,6 +3,7 @@
       <el-form
         :model="formModel"
         :rules="formRules"
+        ref="formItemName"
         label-width="200px"
         label-position="top"
       >
@@ -16,13 +17,13 @@
         <el-row>
           <el-col :span="3"><p></p></el-col>
           <el-col :span="18">
-            <el-form-item label="检验类型" prop="biaozhunyaoqiu">
+            <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
               <el-select
-                form-rules="biaozhunyaoqiu"
-                v-model="formModel.biaozhunyaoqiu"
+                form-rules="jianyanleixing"
+                v-model="formModel.jianyanleixing"
                 style="width: 421px"
                 clearable
-                @change="handleSelectType(formModel.biaozhunyaoqiu)"
+                @change="handleSelectType(formModel.jianyanleixing)"
               >
                 <el-option
                   v-for="dict in dict.type.sys_scene_type"
@@ -38,7 +39,7 @@
         <el-row>
           <el-col :span="3"><p></p></el-col>
           <el-col :span="18">
-            <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+            <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
               <el-button type="primary" plain @click="handleReSelectRequirements"
                 >选择标准要求</el-button
               ><span>
@@ -325,17 +326,42 @@
         newReviewSceneText:'',
         newReviewSceneRemark:'',
         formRules: {
-          biaozhunyaoqiu: [
-            { required: true, message: '请选择检验类型', trigger: 'blur' }
-          ],
+          jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
+        ],
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
+        ],
+        shenchayaodian: [
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
+        ],
           biaozhuntiuaokuan: [
-            { required: true, message: '请选择标准要求', trigger: 'blur' }
-          ],
-          shenchayaodian: [
-            { required: true, message: '请输入审查要点', trigger: 'blur' }
+            { required: true, message: '请选择标准要求', trigger: 'change' }
           ],
           shenchaxize: [
-            { required: true, message: '请输入审查细则', trigger: 'blur' }
+            { required: true, message: '请输入审查细则', trigger: 'change' }
           ],
           // shenchachangjing: [
           //   { required: true, message: '请输入审查场景', trigger: 'blur' }
@@ -480,18 +506,25 @@
         console.log('this.value = ', this.formModel)
         this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
         this.newResDataAdd.standard = this.selectedRequirementSave.name
-        
-        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+        if(this.selectedKeyPointsSave){
+          this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+        }
+       
         
         this.newResDataAdd.newText = this.formModel.shenchaxize
         this.newReviewSceneRemark = this.formModel.beizhuxinxi
         
         this.newResDataAdd.details = this.formModel.shenchaxize
         this.newResDataAdd.remark = this.newReviewSceneRemark
-        this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+        if(this.pageIndexSec){
+          this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+        }
+       
   
         console.log(this.newResDataAdd,'提交之前')
-        testInitatereviewAdd(this.newResDataAdd)
+        this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -510,6 +543,14 @@
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
+      
         //newText => 由填写的时候赋值
         //remark => 由填写的时候赋值
         // this.newResDataAdd.newText = newText

src/views/review/createReview/newReviewKeypoints/index.vue

@@ -17,13 +17,13 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhunyaoqiu">
+          <el-form-item label="检验类型" prop="jianyanleixing">
             <el-select
-              form-rules="biaozhunyaoqiu"
-              v-model="formModel.biaozhunyaoqiu"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
-              @change="handleSelectType(formModel.biaozhunyaoqiu)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option
                 v-for="dict in dict.type.sys_scene_type"
@@ -39,7 +39,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiaokuan">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
@@ -289,17 +289,42 @@ export default {
         shenchachangjing: ''
       },
       formRules: {
+        jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
+        ],
         biaozhunyaoqiu: [
-          { required: true, message: '请选择检验类型', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         biaozhuntiaokuan: [
           { required: true, message: '请选择标准要求', trigger: 'blur' }
         ],
         shenchayaodian: [
-          { required: true, message: '请输入审查要点', trigger: 'blur' }
+        {
+            message:'请填写审查要点',
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        {
+            message:'请填写审查细则',
+            trigger: 'change',
+            required: true
+          }
+        ],
+        shenchachangjing: [
+          { required: true, message: '请输入审查场景', trigger: 'change' }
         ]
         // shenchachangjing: [
         //   { required: true, message: '请输入审查场景', trigger: 'blur' }
@@ -465,7 +490,9 @@ export default {
       // this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
 
       console.log(this.newResDataAdd.inspectStandardId, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -484,6 +511,14 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
+      
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText

src/views/review/createReview/newReviewScene/index.vue

@@ -17,13 +17,13 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
             <el-select
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option
                 v-for="dict in dict.type.sys_scene_type"
@@ -39,7 +39,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
@@ -94,7 +94,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查要点" prop="shenchayaodian">
+          <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
             <el-button type="primary" plain @click="handleReSelectKeypoints"
               >选择审查要点</el-button
             ><span>{{ selectedKeyPoints.text }}</span>
@@ -142,7 +142,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="审查细则" prop="shenchaxize">
+          <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
             <el-button type="primary" plain @click="handleReSelectDetails"
               >选择审查细则</el-button
             ><span>{{ selectedDetails.text }}</span>
@@ -198,7 +198,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="8">
-          <el-form-item label="审查场景" prop="shenchachangjing">
+          <el-form-item label="审查场景" prop="shenchachangjing" v-model="formModel.shenchachangjing">
             <el-input
               v-model="formModel.shenchachangjing"
               type="textarea"
@@ -366,20 +366,53 @@ export default {
       newReviewSceneText: '',
       newReviewSceneRemark: '',
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
+        jianyanleixing: [
+          { required: true, message: '请选择检验类型', trigger: 'change' }
         ],
-        biaozhuntiuaokuan: [
-          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchayaodian: [
-          { required: true, message: '请输入审查要点', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchachangjing: [
-          { required: true, message: '请输入审查场景', trigger: 'blur' }
+          { required: true, message: '请填写审查场景', trigger: 'change' }
         ]
       },
       formItemName: {
@@ -529,17 +562,24 @@ export default {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
-      this.newResDataAdd.details = this.selectedDetailsSave.text
-      this.newResDataAdd.detailsId = this.selectedDetailsSave.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
-
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.details = this.selectedDetailsSave.text
+      }
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+      }
+      if(this.selectedKeyPointsSave){
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
 
       this.newResDataAdd.newText = this.formModel.shenchachangjing
       this.newResDataAdd.remark = this.newReviewSceneRemark
 
       console.log(this.newResDataAdd, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -558,6 +598,13 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText

src/views/review/createReview/newUseCase/index.vue

@@ -17,15 +17,15 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
             <el-select
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
               disabled
               placeholder="车型检验"
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
               <el-option :value="'test'" />
             </el-select>
@@ -36,7 +36,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhuntiuaokuan">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
             <el-button type="primary" plain @click="handleReSelectRequirements"
               >选择标准要求</el-button
             ><span>
@@ -91,7 +91,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="8">
-          <el-form-item label="用例编号" prop="yonglibianhao">
+          <el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao">
             <el-input
               v-model="formModel.yonglibianhao"
               placeholder="请输入用例编号"
@@ -106,7 +106,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="8">
-          <el-form-item label="用例描述" prop="yonglimiaoshu">
+          <el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu">
             <el-input
               v-model="formModel.yonglimiaoshu"
               type="textarea"
@@ -181,13 +181,12 @@
 
 <script>
 import {
-  testTypeUse,
+  testType,
   testKeypoint,
   testDetails,
   testInitatereviewAdd,
   testReviewer
 } from '@/api/task/test'
-import { stringify } from 'postcss'
 
 export default {
   name: 'ReviewData',
@@ -285,21 +284,61 @@ export default {
       newReviewSceneText: '',
       newReviewSceneRemark: '',
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
-        ],
-        // biaozhuntiuaokuan: [
-        //   { required: true, message: '请选择标准条款', trigger: 'blur' }
+        // jianyanleixing: [
+        //   { required: true, message: '请选择检验类型', trigger: 'change' }
         // ],
-        yonglibianhao: [
-          { required: true, message: '请输入用例编号', trigger: 'blur' }
+        biaozhunyaoqiu: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedRequirement.text) {
+                callback(new Error('请选择标准要求'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
+        ],
+        shenchayaodian: [
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+        {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
+        ],
+        shenchachangjing: [
+          { required: true, message: '请填写审查场景', trigger: 'change' }
+        ],
+        yonglibianhao:[
+        { required: true, message: '请填写用例编号', trigger: 'change' }
         ],
-        yonglimiaoshu: [
-          { required: true, message: '请输入用例描述', trigger: 'blur' }
+        yonglimiaoshu:[
+        { required: true, message: '请填写用例描述', trigger: 'change' }
         ]
+      
       },
       formItemName: {
         biaozhunyaoqiu: '',
@@ -369,9 +408,18 @@ export default {
     },
     // 按钮-选择标准要求
     handleReSelectRequirements() {
-      this.stringifyNewResDataUse = JSON.stringify(this.newResDataUse)
+      // this.newResData.standardNo = this.pageIndexSec.standardNo
+      // this.newResData.standardId = this.pageIndexSec.id
+      // this.newResData.name = this.pageIndexSec.name
+      //根据  inspectStandardId => standard/findStandardList 的id
+      //      inspectStandardNo => standard/findStandardList 的standardNo
+      // //operationSort => 这个在点击下一步的界面  通过选择新增场景时就已经设置好了 为新增 ADD_SENCE 或删除
+      // this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+      // this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
+      // this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
+      // //这里newResData有type name inspectstandardNo inspectStandardId
 
-      testTypeUse(this.stringifyNewResDataUse)
+      testType(this.newResData)
         .then(response => {
           this.receivedRequirements = response
 
@@ -382,7 +430,7 @@ export default {
           this.dialogVisible = true
         })
         .catch(error => {
-          console.log('testTypeUse方法出错', error)
+          console.log('testType方法出错', error)
         })
       //弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
     },
@@ -454,7 +502,9 @@ export default {
       this.newResDataAdd.type = 'car'
 
       console.log(this.newResDataAdd, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -473,6 +523,13 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText

src/views/review/createReview/updateUseCase/index.vue

@@ -17,15 +17,15 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="检验类型" prop="biaozhuntiuaokuan">
+          <el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing">
             <el-input
-              form-rules="biaozhuntiuaokuan"
-              v-model="formModel.tiaokuanfenlei"
+              form-rules="jianyanleixing"
+              v-model="formModel.jianyanleixing"
               style="width: 421px"
               clearable
               disabled
               placeholder="车型检验"
-              @change="handleSelectType(formModel.tiaokuanfenlei)"
+              @change="handleSelectType(formModel.jianyanleixing)"
             >
             </el-input>
           </el-form-item>
@@ -35,7 +35,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="测试用例" prop="ceshiyongli">
+          <el-form-item label="测试用例" prop="ceshiyongli" v-model="formModel.ceshiyongli">
             <el-button type="primary" plain @click="handleSelectUseCase"
               >选择测试用例</el-button
             ><span> </span>
@@ -94,7 +94,7 @@
                 </collapse>
                 <!-- 弹窗底部 -->
                 <div slot="footer" class="dialog-footer">
-                  <el-button @click="dialogVisibleUseCase = false"
+                  <el-button @click="handleSelectedUseCase()"
                     >确认</el-button
                   >
                 </div>
@@ -107,7 +107,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="标准要求" prop="biaozhunyaoqiu">
+          <el-form-item label="标准要求" prop="biaozhunyaoqiu" >
             <el-input
               v-model="formModel.biaozhunyaoqiu"
               placeholder="选择测试用例后显示"
@@ -122,7 +122,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="用例编号" prop="yonglibianhao">
+          <el-form-item label="用例编号" prop="yonglibianhao" >
             <el-input
               v-model="formModel.yonglibianhao"
               placeholder="请输入用例编号"
@@ -137,7 +137,7 @@
       <el-row>
         <el-col :span="3"><p></p></el-col>
         <el-col :span="18">
-          <el-form-item label="用例描述" prop="yonglimiaoshu">
+          <el-form-item label="用例描述" prop="yonglimiaoshu" >
             <el-input
               v-model="formModel.yonglimiaoshu"
               type="textarea"
@@ -146,8 +146,7 @@
               show-word-limit
               :autosize="{ minRows: 6, maxRows: 12 }"
               resize="none"
-            >
-            </el-input>
+            ></el-input>
           </el-form-item> </el-col
         ><el-col :span="3"><p></p></el-col>
       </el-row>
@@ -232,9 +231,11 @@ export default {
   props: {
     formModel: {
       type: Object,
-      default: () => {
-        return {}
-      }
+      default: () => ({
+        biaozhunyaoqiu: '',
+        yonglibianhao: '',
+        yonglimiaoshu: ''
+      })
     },
     pageIndexSec: {}
   },
@@ -326,36 +327,85 @@ export default {
       dialogVisibleUseCase: false,
       newReviewSceneText: '',
       newReviewSceneRemark: '',
+
       formRules: {
-        tiaokuanfenlei: [
-          { required: true, message: '请选择条款分类', trigger: 'blur' }
-        ],
-        biaozhuntiuaokuan: [
-          { required: true, message: '请选择标准条款', trigger: 'blur' }
+        // jianyanleixing: [
+        //   { required: true, message: '请选择检验类型', trigger: 'change' }
+        // ],
+        biaozhunyaoqiu: [
+          {
+            message:'请输入标准要求',
+            trigger: 'change',
+            required: true
+          }
         ],
-        yonglibianhao: [
-          { required: true, message: '请输入用例编号', trigger: 'blur' }
+        shenchayaodian: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedKeyPoints.text) {
+                callback(new Error('请选择审查要点'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
-        // biaozhunyaoqiu: [
-        //   {
-        //     required: true,
-        //     message: '选择测试用例后即可显示标准要求',
-        //     trigger: 'blur'
-        //   }
-        // ],
         shenchaxize: [
-          { required: true, message: '请输入审查细则', trigger: 'blur' }
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedDetails.text) {
+                callback(new Error('请选择审查细则'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
         ],
-        yonglimiaoshu: [
-          { required: true, message: '请输入用例描述', trigger: 'blur' }
-        ]
+        shenchachangjing: [
+          {
+            validator: (rule, value, callback) => {
+              // 检查 selectedRequirement.text 是否有值
+              if (!this.selectedScene.text) {
+                callback(new Error('请选择审查场景'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true
+          }
+        ],
+        ceshiyongli: [
+          {   validator: (rule, value, callback) => {
+              
+              if (!this.selectedUseCase) {
+                callback(new Error('请选择测试用例'))
+              } else {
+                callback()
+              }
+            },
+            trigger: 'change',
+            required: true }
+        ],
+        yonglibianhao:[
+         { required: true, message: '请输入用例编号', trigger: 'change' }
+        ],
+        yonglimiaoshu:[
+         { required: true, message: '请输入用例描述', trigger: 'change' }
+          ],
       },
       formItemName: {
         biaozhunyaoqiu: '',
         biaozhuntiaokuan: '',
         yonglibianhao: '',
         shenchaxize: '',
-        biaozhunyaoqiu: '',
+      
         // shenchachangjing: '',
         yonglimiaoshu: ''
       },
@@ -393,6 +443,7 @@ export default {
         // 将 item.type 赋值给 this.newResData.type
         this.newResData.type = selectedItem.value
         this.newResDataAdd.type = selectedItem.value
+
         if (this.newResData.type === '1') {
           this.newResData.type = 'system'
           this.newResDataAdd.type = 'system'
@@ -519,28 +570,45 @@ export default {
           console.log('testUseCase方法出错', error)
         })
     },
-    // 按钮-操作
-
+    // 按钮-确认选择测试用例
+    handleSelectedUseCase() {
+      this.dialogVisibleUseCase = false
+      this.formModel.biaozhunyaoqiu = this.pageIndexSec.name
+      this.formModel.yonglibianhao = this.selectedUseCase.customizedID
+      this.formModel.yonglimiaoshu = this.selectedUseCase.description
+    },
     // 按钮-确认发起
     handleConfirm() {
       console.log('this.value = ', this.formModel)
       this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
       this.newResDataAdd.standard = this.selectedRequirementSave.name
-      this.newResDataAdd.details = this.selectedDetailsSave.text
-      this.newResDataAdd.detailsId = this.selectedDetailsSave.id
-      this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
-
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.details = this.selectedDetailsSave.text
+      }
+      if(this.selectedDetailsSave){
+        this.newResDataAdd.detailsId = this.selectedDetailsSave.id
+      }
+      if(this.selectedKeyPointsSave){
+        this.newResDataAdd.keypoint = this.selectedKeyPointsSave.text
+      }
+     
+      this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
+          this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
+          this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
       this.newReviewSceneRemark = this.formModel.beizhuxinxi
 
       this.newResDataAdd.newText = this.formModel.yonglibianhao
       this.newResDataAdd.remark = this.newReviewSceneRemark
+      this.newResDataAdd.type= 'car'
 
       this.newResDataAdd.usecaseId = this.formModel.yonglibianhao
       this.newResDataAdd.usecaseDescribe = this.formModel.yonglimiaoshu
       // this.newResDataAdd.reviewUsecaseId = ''
 
       console.log(this.newResDataAdd, '提交之前')
-      testInitatereviewAdd(this.newResDataAdd)
+      this.$refs.formItemName.validate(valid =>{
+        if(valid){
+          testInitatereviewAdd(this.newResDataAdd)
         .then(response => {
           const aa = response
           if (aa) {
@@ -559,6 +627,13 @@ export default {
           console.log('testInitatereviewAdd方法出错', error)
 
         })
+        }else{
+          this.$message({
+            message:'提交失败,请填写所有必填项目',
+            type:'error'
+          })
+        }
+      })
       //newText => 由填写的时候赋值
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText