Skip to content

C
car-database-web
Commit ab67b80f authored by zhang's avatar zhang
Browse files
Options

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

parents c81e2aaa df47b488
Show whitespace changes
Inline Side-by-side
Showing with 276 additions and 184 deletions
src/views/review/already/index.vue
View file @ ab67b80f
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
size="small" size="small"
:inline="true" :inline="true"
> >
<el-form-item prop="operationSort"> <el-form-item prop="type">
<el-select <el-select
v-model="queryParams.operationSort" v-model="queryParams.type"
placeholder="评审类型" placeholder="检验标准()"
clearable clearable
> >
<el-option <el-option
v-for="dict in dict.type.review_type" v-for="dict in dict.type.cene_type_wait"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="标准要求分类" placeholder="检验类型"
clearable clearable
> >
<el-option <el-option
...@@ -41,6 +41,21 @@ ...@@ -41,6 +41,21 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="operationSort">
<el-select
v-model="queryParams.operationSort"
placeholder="评审类型"
clearable
>
<el-option
v-for="dict in dict.type.review_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="keyword"> <el-form-item prop="keyword">
<el-input <el-input
v-model="queryParams.keyword" v-model="queryParams.keyword"
...@@ -91,7 +106,7 @@ ...@@ -91,7 +106,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准要求分类" label="检验类型"
sortable sortable
min-width="200" min-width="200"
align="left" align="left"
...@@ -138,7 +153,15 @@ ...@@ -138,7 +153,15 @@
prop="taskBeginTime" prop="taskBeginTime"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="是否通过" label="我的评审意见"
sortable
min-width="200"
align="left"
prop="decision"
:formatter="formatDecision"
></el-table-column>
<el-table-column
label="整体评审状态"
sortable sortable
min-width="200" min-width="200"
align="left" align="left"
...@@ -315,9 +338,19 @@ export default { ...@@ -315,9 +338,19 @@ export default {
} }
}, },
formatType(row,column){ formatType(row,column,cellValue){
const typeList= this.typeList.find(item => item.dictValue === row.type) // const typeList= this.typeList.find(item => item.dictValue === row.type)
return typeList ? typeList.dictLabel : '' // return typeList ? typeList.dictLabel : ''
switch(cellValue){
case 'system':
return '体系审查';
case 'car':
return '车型审查';
case 'test':
return '车型检验';
default:
return cellValue
}
}, },
formatReviewStatus(row,column){ formatReviewStatus(row,column){
const reviewStatusList= this.reviewStatusList.find(item => item.dictValue === row.decision) const reviewStatusList= this.reviewStatusList.find(item => item.dictValue === row.decision)
......
src/views/review/createReview/deleteReviewDetails/index.vue
View file @ ab67b80f
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检验类型" prop="jianyanleixing"> <el-form-item label="检验类型" prop="jianyanleixing" >
<el-select <el-select
form-rules="jianyanleixing" form-rules="jianyanleixing"
v-model="formModel.jianyanleixing" v-model="formModel.jianyanleixing"
...@@ -55,30 +55,31 @@ ...@@ -55,30 +55,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <!--
<el-table-column prop="name" label="标准名称"> <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -113,10 +114,7 @@ ...@@ -113,10 +114,7 @@
> >
<!-- <el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> --> </el-table-column> -->
<el-table-column label="选择" width="50">
<el-table-column prop="text" label="要点描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedKeyPoints"> <el-radio-group v-model="selectedKeyPoints">
<el-radio <el-radio
...@@ -126,6 +124,9 @@ ...@@ -126,6 +124,9 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="text" label="审查要点">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -166,12 +167,7 @@ ...@@ -166,12 +167,7 @@
> >
<!-- 表格 --> <!-- 表格 -->
<el-table :data="this.receivedDetails.data" style="width: 100%"> <el-table :data="this.receivedDetails.data" style="width: 100%">
<el-table-column prop="id" label="细则编号" width="100"> <el-table-column label="选择" width="50">
</el-table-column>
<el-table-column prop="text" label="细则描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedDetails"> <el-radio-group v-model="selectedDetails">
<el-radio <el-radio
...@@ -181,6 +177,12 @@ ...@@ -181,6 +177,12 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="id" label="细则编号" width="100">
</el-table-column> -->
<el-table-column prop="text" label="审查细则">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -240,7 +242,7 @@ ...@@ -240,7 +242,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -253,7 +255,7 @@ ...@@ -253,7 +255,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
......
src/views/review/createReview/deleteReviewKeypoints/index.vue
View file @ ab67b80f
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="检验类型" prop="jianyanleixing" v-model="formModel.jianyanleixing"> <el-form-item label="检验类型" prop="jianyanleixing"
>
<el-select <el-select
form-rules="jianyanleixing" form-rules="jianyanleixing"
v-model="formModel.jianyanleixing" v-model="formModel.jianyanleixing"
...@@ -54,30 +55,31 @@ ...@@ -54,30 +55,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<!--
<el-table-column prop="testMethod" label="测试方法"> <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称"> <!-- <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -110,11 +112,7 @@ ...@@ -110,11 +112,7 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<el-table-column prop="text" label="要点描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedKeyPoints"> <el-radio-group v-model="selectedKeyPoints">
<el-radio <el-radio
...@@ -124,6 +122,10 @@ ...@@ -124,6 +122,10 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="text" label="审查要点">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -183,7 +185,7 @@ ...@@ -183,7 +185,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -196,7 +198,7 @@ ...@@ -196,7 +198,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
...@@ -494,6 +496,22 @@ export default { ...@@ -494,6 +496,22 @@ export default {
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
this.newResData.type = this.formModel.reviewType
// 将 item.type 赋值给 this.newResData.type
if (this.newResData.type === '1') {
this.newResData.type = 'system'
this.newResDataAdd.type = 'system'
// console.log(this.newResData.type, 'type1111')
} else if (this.newResData.type === '2') {
this.newResData.type = 'car'
this.newResDataAdd.type = 'car'
} else {
console.log('赋值给 this.newResData.type时出现问题')
}
console.log(this.newResData.type)
this.newResDataAdd.chapter = this.selectedRequirementSave.chapter this.newResDataAdd.chapter = this.selectedRequirementSave.chapter
this.newResDataAdd.standard = this.selectedRequirementSave.name this.newResDataAdd.standard = this.selectedRequirementSave.name
...@@ -504,6 +522,8 @@ export default { ...@@ -504,6 +522,8 @@ export default {
this.newReviewSceneRemark = this.formModel.beizhuxinxi this.newReviewSceneRemark = this.formModel.beizhuxinxi
this.newResDataAdd.newText = this.selectedKeyPoints.text
this.newResDataAdd.remark = this.newReviewSceneRemark this.newResDataAdd.remark = this.newReviewSceneRemark
// this.newResDataAdd.inspectStandardId = this.pageIndexSec.id // this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
...@@ -565,6 +585,7 @@ export default { ...@@ -565,6 +585,7 @@ export default {
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave) console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave)
this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id
this.newResDataAdd.keypoint = this.selectedKeyPoints.text
}, },
selectedDetails(newVal) { selectedDetails(newVal) {
// 当 selectedDetails 改变时，将值赋给 selectedDetailsSave // 当 selectedDetails 改变时，将值赋给 selectedDetailsSave
......
src/views/review/createReview/deleteReviewScene/index.vue
View file @ ab67b80f
...@@ -62,30 +62,31 @@ ...@@ -62,30 +62,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称"> <!-- <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -122,12 +123,7 @@ ...@@ -122,12 +123,7 @@
:data="this.receivedkeypoints.data" :data="this.receivedkeypoints.data"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="id" label="要点编号" width="100"> <el-table-column label="选择" width="50">
</el-table-column>
<el-table-column prop="text" label="要点描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedKeyPoints"> <el-radio-group v-model="selectedKeyPoints">
<el-radio <el-radio
...@@ -137,6 +133,12 @@ ...@@ -137,6 +133,12 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> -->
<el-table-column prop="text" label="审查要点">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -181,12 +183,7 @@ ...@@ -181,12 +183,7 @@
> >
<!-- 表格 --> <!-- 表格 -->
<el-table :data="this.receivedDetails.data" style="width: 100%"> <el-table :data="this.receivedDetails.data" style="width: 100%">
<el-table-column prop="id" label="细则编号" width="100"> <el-table-column label="选择" width="50">
</el-table-column>
<el-table-column prop="text" label="细则描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedDetails"> <el-radio-group v-model="selectedDetails">
<el-radio <el-radio
...@@ -196,6 +193,12 @@ ...@@ -196,6 +193,12 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="id" label="细则编号" width="100">
</el-table-column> -->
<el-table-column prop="text" label="审查细则">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -213,7 +216,7 @@ ...@@ -213,7 +216,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item <el-form-item
label="审查场景" label="审查场景"
prop="shenchachangjing" prop="shenchachangjing"
...@@ -267,7 +270,7 @@ ...@@ -267,7 +270,7 @@
</el-dialog> </el-dialog>
</div> </div>
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="10"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<div class="subtitle">评审成员</div> <div class="subtitle">评审成员</div>
...@@ -296,7 +299,7 @@ ...@@ -296,7 +299,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -309,7 +312,7 @@ ...@@ -309,7 +312,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
......
src/views/review/createReview/deleteUseCase/index.vue
View file @ ab67b80f
...@@ -75,15 +75,12 @@ ...@@ -75,15 +75,12 @@
v-if="item.useCases && item.useCases.length" v-if="item.useCases && item.useCases.length"
> >
<tr class="tr"> <tr class="tr">
<th>操作</th>
<th>用例编号</th> <th>用例编号</th>
<th>用例描述</th> <th>用例描述</th>
<th>操作</th>
</tr> </tr>
<tr v-for="(item, key4) in item.useCases"> <tr v-for="(item, key4) in item.useCases">
<td>{{ item.customizedID }}</td>
<td>
{{ item.description }}
</td>
<td> <td>
<template > <template >
<div> <div>
...@@ -96,6 +93,11 @@ ...@@ -96,6 +93,11 @@
</div> </div>
</template> </template>
</td> </td>
<td>{{ item.customizedID }}</td>
<td>
{{ item.description }}
</td>
</tr> </tr>
</table> </table>
</collapse-item> </collapse-item>
......
src/views/review/createReview/newReviewDetails/index.vue
View file @ ab67b80f
...@@ -54,30 +54,31 @@ ...@@ -54,30 +54,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称"> <!-- <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -111,11 +112,9 @@ ...@@ -111,11 +112,9 @@
style="width: 100%" style="width: 100%"
> >
<!-- <el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> -->
<el-table-column prop="text" label="要点描述"> </el-table-column> -->
</el-table-column> <el-table-column label="选择" width="50">
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedKeyPoints"> <el-radio-group v-model="selectedKeyPoints">
<el-radio <el-radio
...@@ -125,6 +124,9 @@ ...@@ -125,6 +124,9 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="text" label="审查要点">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -202,7 +204,7 @@ ...@@ -202,7 +204,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -216,7 +218,7 @@ ...@@ -216,7 +218,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
......
src/views/review/createReview/newReviewKeypoints/index.vue
View file @ ab67b80f
...@@ -54,30 +54,30 @@ ...@@ -54,30 +54,30 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column prop="chapter" label="标准章节" width="100"> <el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <!--
<el-table-column prop="name" label="标准名称"> <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
......
src/views/review/createReview/newReviewScene/index.vue
View file @ ab67b80f
...@@ -54,30 +54,31 @@ ...@@ -54,30 +54,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称"> <!-- <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -112,10 +113,7 @@ ...@@ -112,10 +113,7 @@
> >
<!-- <el-table-column prop="id" label="要点编号" width="100"> <!-- <el-table-column prop="id" label="要点编号" width="100">
</el-table-column> --> </el-table-column> -->
<el-table-column label="选择" width="50">
<el-table-column prop="text" label="要点描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedKeyPoints"> <el-radio-group v-model="selectedKeyPoints">
<el-radio <el-radio
...@@ -125,6 +123,9 @@ ...@@ -125,6 +123,9 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="text" label="审查要点">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -165,12 +166,7 @@ ...@@ -165,12 +166,7 @@
> >
<!-- 表格 --> <!-- 表格 -->
<el-table :data="this.receivedDetails.data" style="width: 100%"> <el-table :data="this.receivedDetails.data" style="width: 100%">
<el-table-column prop="id" label="细则编号" width="100"> <el-table-column label="选择" width="50">
</el-table-column>
<el-table-column prop="text" label="细则描述">
</el-table-column>
<el-table-column label="选择">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio-group v-model="selectedDetails"> <el-radio-group v-model="selectedDetails">
<el-radio <el-radio
...@@ -180,6 +176,12 @@ ...@@ -180,6 +176,12 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="id" label="细则编号" width="100">
</el-table-column> -->
<el-table-column prop="text" label="审查细则">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
......
src/views/review/createReview/newUseCase/index.vue
View file @ ab67b80f
...@@ -51,30 +51,31 @@ ...@@ -51,30 +51,31 @@
:data="this.receivedRequirements.rows" :data="this.receivedRequirements.rows"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="选择" width="50">
<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-column prop="chapter" label="标准章节" width="100"> <el-table-column prop="chapter" label="标准章节" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="text" label="标准要求"> <el-table-column prop="text" label="标准要求">
</el-table-column> </el-table-column>
<el-table-column prop="testMethod" label="测试方法"> <!-- <el-table-column prop="testMethod" label="测试方法">
</el-table-column> </el-table-column> -->
<!-- <el-table-column prop="name" label="标准名称"> <!-- <el-table-column prop="name" label="标准名称">
</el-table-column> </el-table-column>
<el-table-column prop="standardNo" label="标准号"> <el-table-column prop="standardNo" label="标准号">
</el-table-column> --> </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-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -90,7 +91,7 @@ ...@@ -90,7 +91,7 @@
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao"> <el-form-item label="用例编号" prop="yonglibianhao" v-model="formModel.yonglibianhao">
<el-input <el-input
v-model="formModel.yonglibianhao" v-model="formModel.yonglibianhao"
...@@ -100,12 +101,12 @@ ...@@ -100,12 +101,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu"> <el-form-item label="用例描述" prop="yonglimiaoshu" v-model="formModel.yonglimiaoshu">
<el-input <el-input
v-model="formModel.yonglimiaoshu" v-model="formModel.yonglimiaoshu"
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-col </el-form-item> </el-col
><el-col :span="10"><p></p></el-col> ><el-col :span="3"><p></p></el-col>
</el-row> </el-row>
<div class="subtitle">评审成员</div> <div class="subtitle">评审成员</div>
...@@ -147,7 +148,7 @@ ...@@ -147,7 +148,7 @@
<div class="subtitle">备注信息</div> <div class="subtitle">备注信息</div>
<el-row> <el-row>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
<el-col :span="8"> <el-col :span="18">
<el-form-item label=""> <el-form-item label="">
<el-input <el-input
v-model="formModel.beizhuxinxi" v-model="formModel.beizhuxinxi"
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
> >
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-col :span="10"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-col> </el-col>
<el-col :span="3"><p></p></el-col> <el-col :span="3"><p></p></el-col>
</el-row> </el-row>
......
src/views/review/createReview/updateUseCase/index.vue
View file @ ab67b80f
...@@ -67,15 +67,12 @@ ...@@ -67,15 +67,12 @@
v-if="item.useCases && item.useCases.length" v-if="item.useCases && item.useCases.length"
> >
<tr class="tr"> <tr class="tr">
<th>操作</th>
<th>用例编号</th> <th>用例编号</th>
<th>用例描述</th> <th>用例描述</th>
<th>操作</th>
</tr> </tr>
<tr v-for="(item, key4) in item.useCases"> <tr v-for="(item, key4) in item.useCases">
<td>{{ item.customizedID }}</td>
<td>
{{ item.description }}
</td>
<td> <td>
<template > <template >
<div> <div>
...@@ -88,6 +85,11 @@ ...@@ -88,6 +85,11 @@
</div> </div>
</template> </template>
</td> </td>
<td>{{ item.customizedID }}</td>
<td>
{{ item.description }}
</td>
</tr> </tr>
</table> </table>
</collapse-item> </collapse-item>
......
src/views/review/reviewAlready/index.vue
View file @ ab67b80f
...@@ -292,9 +292,19 @@ export default { ...@@ -292,9 +292,19 @@ export default {
const reviewTypeList= this.reviewTypeList.find(item => item.dictValue === row.operationSort) const reviewTypeList= this.reviewTypeList.find(item => item.dictValue === row.operationSort)
return reviewTypeList ? reviewTypeList.dictLabel : '' return reviewTypeList ? reviewTypeList.dictLabel : ''
}, },
formatType(row,column){ formatType(row,column,cellValue){
const typeList= this.typeList.find(item => item.dictValue === row.type) // const typeList= this.typeList.find(item => item.dictValue === row.type)
return typeList ? typeList.dictLabel : '' // return typeList ? typeList.dictLabel : ''
switch(cellValue){
case 'system':
return '体系审查';
case 'car':
return '车型审查';
case 'test':
return '车型检验';
default:
return cellValue
}
}, },
formatTaskResult(row, column, cellValue){ formatTaskResult(row, column, cellValue){
switch (cellValue) { switch (cellValue) {
......
src/views/review/sceneReview/index.vue
View file @ ab67b80f
...@@ -179,8 +179,7 @@ export default { ...@@ -179,8 +179,7 @@ export default {
}, },
// 字典格式化 type 字段 // 字典格式化 type 字段
formatType(row, column) { formatType(row, column) {
const typeList = this.typeList.find(item => item.dictValue === row.type)
return typeList ? typeList.dictLabel : ''
}, },
handleSubmit() { handleSubmit() {
// 确保在提交时 auditModel 的所有字段都被正确设置 // 确保在提交时 auditModel 的所有字段都被正确设置
......
src/views/review/wait/components/dialog.vue
View file @ ab67b80f
<template> <template>
<page-standard>
<el-dialog <el-dialog
:visible.sync="dialogManger.dialogVisible" :visible.sync="dialogManger.dialogVisible"
:title="modelTitle" :title="modelTitle"
...@@ -71,9 +72,15 @@ ...@@ -71,9 +72,15 @@
<el-button type="primary" @click="handleConfirm()"> 保存</el-button> <el-button type="primary" @click="handleConfirm()"> 保存</el-button>
</div> </div>
</el-dialog> </el-dialog>
</page-standard>
</template> </template>
<script> <script>
import page from '@/mixins/page'
export default { export default {
components:{
},
mixins: [page],
props: { props: {
dialogManger: { dialogManger: {
type: Object, type: Object,
......
src/views/review/wait/index.vue
View file @ ab67b80f
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<el-form-item prop="type"> <el-form-item prop="type">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="标准要求分类" placeholder="检验类型"
clearable clearable
> >
<el-option <el-option
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
> >
<el-table-column type="index" width="55" label="序号" align="center"> <el-table-column type="index" width="155" label="序号" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="标准要求分类" label="检验类型"
sortable sortable
min-width="200" min-width="200"
align="left" align="left"
...@@ -322,11 +322,19 @@ export default { ...@@ -322,11 +322,19 @@ export default {
} }
}, },
formatType(row, column) { formatType(row,column,cellValue){
console.log('row.type:', row.type); // const typeList= this.typeList.find(item => item.dictValue === row.type)
console.log('this.typeList:', this.typeList); // return typeList ? typeList.dictLabel : ''
const typeList = this.typeList.find(item => item.dictValue === row.type) switch(cellValue){
return typeList ? typeList.dictLabel : '' case 'system':
return '体系审查';
case 'car':
return '车型审查';
case 'test':
return '车型检验';
default:
return cellValue
}
}, },
/* 关闭移交弹窗-保存*/ /* 关闭移交弹窗-保存*/
handleClose() { handleClose() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment