我的已审我的待审页面展示修改

src/api/task/test.js

@@ -50,6 +50,17 @@ export function testType(query) {
       data: query
   })
 }
+// 发起评审页面 用例查标准
+export function testTypeUse(query) {
+  return request({
+      url: '/system/testCase/getStandardList',
+      method: 'post',
+      headers:{
+          'Content-Type': 'application/json',
+      },
+      data: query
+  })
+}
 // 发起评审页面 点击选择审查要点按钮后 调用接口 查询审查要点
 export function testKeypoint(query) {
   return request({

src/views/review/already/index.vue

@@ -78,14 +78,7 @@
               <span>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="评审单编号"
-            sortable
-            min-width="200"
-            align="left"
-            prop="id"
-          >
-          </el-table-column>          
+         
           <el-table-column
             label="检验标准"
             sortable
@@ -289,9 +282,30 @@ export default {
     this.reviewStatusList = response.data || []
   })
     },
-    formatOperationSort(row,column) {
-      const reviewTypeList= this.reviewTypeList.find(item => item.dictValue === row.operationSort)
-      return reviewTypeList ? reviewTypeList.dictLabel : ''
+    formatOperationSort(row, column,cellValue) {
+      switch (cellValue) {
+        case 'ADD_SCENE':
+          return '+新增审查场景';
+        case 'ADD_DETAILS':
+          return '+新增审查细则';
+        case 'ADD_KEYPOINT':
+          return '+新增审查要点';
+        case 'DELETE_SCENE':
+          return '×删除审查场景';
+        case 'DELETE_DETAILS':
+          return '×删除审查细则';
+        case 'DELETE_KEYPOINT':
+          return '×删除审查要点';
+        case 'ADD_USECASE':
+          return '+新增测试用例';
+        case 'DELETE_USECASE':
+          return '×删除测试用例';
+        case 'UPDATE_USECASE':
+          return '修改测试用例';
+        default:
+          return cellValue
+      
+        }
     },
     formatType(row,column){
       const typeList= this.typeList.find(item => item.dictValue === row.type)

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

@@ -219,12 +219,26 @@
         <el-col :span="18">
           <el-form-item label="">
             <div class="assessor-text">
+              评审人员:
               <div
                 v-for="(reviewer, index) in this.receivedReviewer"
                 :key="index"
-                style="margin-bottom: 10px"
+                style="
+                  margin-bottom: 30px;
+                  display: flex;
+                  position: relative;
+                  flex-flow: row;
+                "
               >
-                {{ reviewer.dept.deptName }}:{{ reviewer.dept.leader }}
+                <p
+                  style="
+                    display: inline-block;
+                    white-space: normal;
+                    word-wrap: break-word;
+                  "
+                >
+                  {{ reviewer.nickName }} ({{ reviewer.dept.deptName }})
+                </p>
               </div>
             </div>
           </el-form-item>
@@ -315,7 +329,7 @@ export default {
         standard: '',
         type: '',
 
-        keypointId:'',
+        keypointId: '',
         keypoint: '',
         detailsId: '',
         details: '',
@@ -396,9 +410,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: {
     //下拉框 选择检验类型
@@ -487,7 +501,7 @@ export default {
           this.receivedkeypoints = response
           //keypointId =>	/review/scene/change/task/getKeyPointList
           //keypoint => /review/scene/change/task/getKeyPointList
-          
+
           this.newResDataAdd.keypointId = this.receivedkeypoints.data.keypointId
           this.newResDataAdd.keypoint = this.receivedkeypoints.data.keypoint
           this.dialogVisibleKeypoints = true

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

@@ -27,7 +27,7 @@
               placeholder="车型检验"
               @change="handleSelectType(formModel.tiaokuanfenlei)"
             >
-              <el-option :value="车型检验" />
+              <el-option :value="'test'" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -176,12 +176,13 @@
 
 <script>
 import {
-  testType,
+  testTypeUse,
   testKeypoint,
   testDetails,
   testInitatereviewAdd,
   testReviewer
 } from '@/api/task/test'
+import { stringify } from 'postcss';
 
 export default {
   name: 'ReviewData',
@@ -201,6 +202,17 @@ export default {
       standardId: '',
       keypointId: '',
       detailsId: '',
+      newResDataUse: {
+        offset: {
+          offset: 0,
+          limit: 9999
+        },
+        searchFields: {
+          serialNumber: '',
+          requirements: ''
+        }
+      },
+      stringifyNewResDataUse: '',
       newResData: {
         pageNum: '1',
         pageSize: '10',
@@ -352,18 +364,10 @@ export default {
     },
     // 按钮-选择标准要求
     handleReSelectRequirements() {
-      // 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
+      this.stringifyNewResDataUse = JSON.stringify(this.newResDataUse)
 
-      testType(this.newResData)
+
+      testTypeUse(this.stringifyNewResDataUse)
         .then(response => {
           this.receivedRequirements = response
 
@@ -374,7 +378,7 @@ export default {
           this.dialogVisible = true
         })
         .catch(error => {
-          console.log('testType方法出错', error)
+          console.log('testTypeUse方法出错', error)
         })
       //弹窗展示ReceivedRequirements内容 并且可以选择更改为哪一条标准要求
     },
@@ -463,6 +467,10 @@ export default {
       //remark => 由填写的时候赋值
       // this.newResDataAdd.newText = newText
       // this.newResDataAdd.remark = remark
+    },
+    //字符串化
+    stringify(obj) {
+      return JSON.stringify(obj)
     }
   },
   watch: {

src/views/review/initiatedReview/index.vue

@@ -299,14 +299,29 @@ export default {
           return '×删除审查细则';
         case 'DELETE_KEYPOINT':
           return '×删除审查要点';
+        case 'ADD_USECASE':
+          return '+新增测试用例';
+        case 'DELETE_USECASE':
+          return '×删除测试用例';
+        case 'UPDATE_USECASE':
+          return '修改测试用例';
         default:
           return cellValue
       
         }
     },
-    formatType(row, column) {
-      const typeList = this.typeList.find(item => item.dictValue === row.type)
-      return typeList ? typeList.dictLabel : ''
+    formatType(row, column,cellValue) {
+      switch(cellValue){
+        case'car':
+          return '车型审查';
+        case'system':
+          return '体系审查';
+        case'test':
+          return '车型检验';
+        default:
+        return cellValue  
+      }
+      
     },
     formatTaskResult(row, column, cellValue) {
       switch (cellValue) {

src/views/review/wait/index.vue

@@ -78,14 +78,7 @@
               <span>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column
-            label="评审单编号"
-            sortable
-            min-width="200"
-            align="left"
-            prop="id"
-          >
-          </el-table-column>
+
           <el-table-column
             label="检验标准"
             sortable
@@ -301,11 +294,30 @@ export default {
         this.typeList = response.data || []
       })
     },
-    formatOperationSort(row, column) {
-      const reviewTypeList = this.reviewTypeList.find(
-        item => item.dictValue === row.operationSort
-      )
-      return reviewTypeList ? reviewTypeList.dictLabel : ''
+    formatOperationSort(row, column,cellValue) {
+      switch (cellValue) {
+        case 'ADD_SCENE':
+          return '+新增审查场景';
+        case 'ADD_DETAILS':
+          return '+新增审查细则';
+        case 'ADD_KEYPOINT':
+          return '+新增审查要点';
+        case 'DELETE_SCENE':
+          return '×删除审查场景';
+        case 'DELETE_DETAILS':
+          return '×删除审查细则';
+        case 'DELETE_KEYPOINT':
+          return '×删除审查要点';
+        case 'ADD_USECASE':
+          return '+新增测试用例';
+        case 'DELETE_USECASE':
+          return '×删除测试用例';
+        case 'UPDATE_USECASE':
+          return '修改测试用例';
+        default:
+          return cellValue
+      
+        }
     },
     formatType(row, column) {
       console.log('row.type:', row.type);