Commit ab7b7a12 authored by zhang's avatar zhang

fix -修复评审管理逻辑bug

parent f1a416ed
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,8 @@
sortable sortable
min-width="200" min-width="200"
align="left" align="left"
prop="decision" prop="taskStatus"
:formatter="formatDecision" :formatter="formatTaskStatus"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
v-show="total > 0" v-show="total > 0"
:total="total" :total="total"
:background="false" :background="false"
:page.sync="queryParams.page" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.size" :limit.sync="queryParams.pageSize"
@pagination="loadData" @pagination="loadData"
> >
</pagination> </pagination>
...@@ -449,6 +449,15 @@ export default { ...@@ -449,6 +449,15 @@ export default {
} else if (row.decision === 'REJECT') { } else if (row.decision === 'REJECT') {
return '不通过' return '不通过'
} }
},
formatTaskStatus(row, column) {
if (row.taskStatus === 'PENDING') {
return '评审中'
} else if (row.taskStatus === 'FINISH') {
return '已完成'
}else if(row.taskStatus === 'CLOSE'){
return '已取消'
}
} }
}, },
/* 重置*/ /* 重置*/
......
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<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="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
...@@ -97,7 +101,11 @@ ...@@ -97,7 +101,11 @@
<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="shenchayaodian" v-model="formModel.shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button
:disabled="!formModel.jianyanleixing || !formModel.biaozhunyaoqiu"
type="primary"
plain
@click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
<div> <div>
...@@ -145,7 +153,11 @@ ...@@ -145,7 +153,11 @@
<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="shenchaxize" v-model="formModel.shenchaxize"> <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
<el-button type="primary" plain @click="handleReSelectDetails" <el-button
:disabled="!formModel.shenchayaodian || !formModel.biaozhunyaoqiu || !formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
<!-- <el-input <!-- <el-input
...@@ -436,6 +448,13 @@ export default { ...@@ -436,6 +448,13 @@ export default {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ''
this.formModel.shenchayaodian = ''
this.formModel.shenchaxize = ''
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
this.selectedKeyPoints.text = ''
this.selectedDetails.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
...@@ -530,7 +549,7 @@ export default { ...@@ -530,7 +549,7 @@ export default {
}, },
// 按钮-选择审查细则 // 按钮-选择审查细则
handleReSelectDetails() { handleReSelectDetails() {
testDetails({ keypointId: this.newResDataAdd.keypointId }) testDetails({ keypointId: this.selectedKeyPointsSave.id })
.then(response => { .then(response => {
this.receivedDetails = response this.receivedDetails = response
...@@ -612,6 +631,11 @@ export default { ...@@ -612,6 +631,11 @@ export default {
selectedRequirement(newVal) { selectedRequirement(newVal) {
// 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave // 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave
this.selectedRequirementSave = newVal this.selectedRequirementSave = newVal
this.formModel.biaozhunyaoqiu = newVal
this.formModel.shenchayaodian = ''
this.selectedKeyPoints.text = ''
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
console.log( console.log(
'selectedRequirementSave 的新值:', 'selectedRequirementSave 的新值:',
this.selectedRequirementSave this.selectedRequirementSave
...@@ -623,12 +647,16 @@ export default { ...@@ -623,12 +647,16 @@ export default {
selectedKeyPoints(newVal) { selectedKeyPoints(newVal) {
// 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave // 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
this.formModel.shenchayaodian = newVal
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave) console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave)
this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id
}, },
selectedDetails(newVal) { selectedDetails(newVal) {
// 当 selectedDetails 改变时,将值赋给 selectedDetailsSave // 当 selectedDetails 改变时,将值赋给 selectedDetailsSave
this.selectedDetailsSave = newVal this.selectedDetailsSave = newVal
this.formModel.shenchaxize = newVal
console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave) console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave)
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.detailsId = this.selectedDetailsSave.id
} }
......
...@@ -41,7 +41,11 @@ ...@@ -41,7 +41,11 @@
<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="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -97,7 +101,11 @@ ...@@ -97,7 +101,11 @@
<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="shenchayaodian" v-model="formModel.shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button
:disabled="!formModel.jianyanleixing || !formModel.biaozhunyaoqiu"
type="primary"
plain
@click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
<div> <div>
...@@ -381,6 +389,11 @@ export default { ...@@ -381,6 +389,11 @@ export default {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ''
this.formModel.shenchayaodian = ''
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
this.selectedKeyPoints.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
...@@ -570,6 +583,9 @@ export default { ...@@ -570,6 +583,9 @@ export default {
selectedRequirement(newVal) { selectedRequirement(newVal) {
// 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave // 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave
this.selectedRequirementSave = newVal this.selectedRequirementSave = newVal
this.formModel.biaozhunyaoqiu = newVal
this.formModel.shenchayaodian = ''
this.selectedKeyPoints.text = ''
console.log( console.log(
'selectedRequirementSave 的新值:', 'selectedRequirementSave 的新值:',
this.selectedRequirementSave this.selectedRequirementSave
...@@ -581,6 +597,7 @@ export default { ...@@ -581,6 +597,7 @@ export default {
selectedKeyPoints(newVal) { selectedKeyPoints(newVal) {
// 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave // 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
this.formModel.shenchayaodian = 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 this.newResDataAdd.keypoint = this.selectedKeyPoints.text
......
...@@ -48,7 +48,11 @@ ...@@ -48,7 +48,11 @@
prop="biaozhunyaoqiu" prop="biaozhunyaoqiu"
v-model="formModel.biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"
> >
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -108,7 +112,11 @@ ...@@ -108,7 +112,11 @@
prop="shenchayaodian" prop="shenchayaodian"
v-model="formModel.shenchayaodian" v-model="formModel.shenchayaodian"
> >
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button
:disabled="!formModel.biaozhunyaoqiu || !formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
<div> <div>
...@@ -161,7 +169,11 @@ ...@@ -161,7 +169,11 @@
prop="shenchaxize" prop="shenchaxize"
v-model="formModel.shenchaxize" v-model="formModel.shenchaxize"
> >
<el-button type="primary" plain @click="handleReSelectDetails" <el-button
:disabled="!formModel.shenchayaodian || !formModel.biaozhunyaoqiu || !formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
<!-- <el-input <!-- <el-input
...@@ -222,7 +234,11 @@ ...@@ -222,7 +234,11 @@
prop="shenchachangjing" prop="shenchachangjing"
v-model="formModel.shenchachangjing" v-model="formModel.shenchachangjing"
> >
<el-button type="primary" plain @click="handleReSelectScene" <el-button
:disabled="!formModel.shenchaxize ||!formModel.shenchayaodian || !formModel.biaozhunyaoqiu || !formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectScene"
>选择审查场景</el-button >选择审查场景</el-button
><span>{{ selectedScene.text }}</span> ><span>{{ selectedScene.text }}</span>
<!-- <el-input <!-- <el-input
...@@ -244,12 +260,7 @@ ...@@ -244,12 +260,7 @@
> >
<!-- 表格 --> <!-- 表格 -->
<el-table :data="this.receivedScene.data" style="width: 100%"> <el-table :data="this.receivedScene.data" style="width: 100%">
<el-table-column prop="id" label="场景编号" width="100"> <el-table-column label="选择" width="100">
</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="selectedScene"> <el-radio-group v-model="selectedScene">
<el-radio <el-radio
...@@ -259,6 +270,11 @@ ...@@ -259,6 +270,11 @@
</el-radio-group> </el-radio-group>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="id" label="场景编号">
</el-table-column>
<el-table-column prop="text" label="场景描述">
</el-table-column>
</el-table> </el-table>
<!-- 弹窗底部 --> <!-- 弹窗底部 -->
...@@ -515,6 +531,15 @@ export default { ...@@ -515,6 +531,15 @@ export default {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ''
this.formModel.shenchayaodian = ''
this.formModel.shenchaxize = ''
this.formModel.shenchachangjing = ''
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
this.selectedKeyPoints.text = ''
this.selectedDetails.text = ''
this.selectedScene.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
...@@ -566,7 +591,6 @@ export default { ...@@ -566,7 +591,6 @@ export default {
testType(this.newResData) testType(this.newResData)
.then(response => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
...@@ -609,7 +633,7 @@ export default { ...@@ -609,7 +633,7 @@ export default {
}, },
// 按钮-选择审查细则 // 按钮-选择审查细则
handleReSelectDetails() { handleReSelectDetails() {
testDetails({ keypointId: this.newResDataAdd.keypointId }) testDetails({ keypointId: this.selectedKeyPointsSave.id })
.then(response => { .then(response => {
this.receivedDetails = response this.receivedDetails = response
...@@ -628,7 +652,7 @@ export default { ...@@ -628,7 +652,7 @@ export default {
}, },
// 按钮-选择审查场景 // 按钮-选择审查场景
handleReSelectScene() { handleReSelectScene() {
testScene({ detailsId: this.newResDataAdd.detailsId }) testScene({ detailsId: this.selectedDetailsSave.id })
.then(response => { .then(response => {
this.receivedScene = response this.receivedScene = response
this.newResDataAdd.newText = this.receivedScene.scene this.newResDataAdd.newText = this.receivedScene.scene
...@@ -639,6 +663,18 @@ export default { ...@@ -639,6 +663,18 @@ export default {
console.log('testReSelectScene方法出错', error) console.log('testReSelectScene方法出错', error)
}) })
}, },
// handleCloseDialog(item,openSwitch){
// console.log(item)
// if(item.id!== ''){
// console.log(openSwitch)
// openSwitch = false
// }else{
// this.$message({
// message: '请选择一项',
// type: 'warning'
// });
// }
// },
// 按钮-确认发起 // 按钮-确认发起
handleConfirm() { handleConfirm() {
console.log('this.value = ', this.formModel) console.log('this.value = ', this.formModel)
...@@ -706,6 +742,13 @@ export default { ...@@ -706,6 +742,13 @@ export default {
selectedRequirement(newVal) { selectedRequirement(newVal) {
// 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave // 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave
this.selectedRequirementSave = newVal this.selectedRequirementSave = newVal
this.formModel.biaozhunyaoqiu = newVal
this.formModel.shenchayaodian = ''
this.selectedKeyPoints.text = ''
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
this.formModel.shenchachangjing = ''
this.selectedScene.text = ''
console.log( console.log(
'selectedRequirementSave 的新值:', 'selectedRequirementSave 的新值:',
this.selectedRequirementSave this.selectedRequirementSave
...@@ -715,22 +758,33 @@ export default { ...@@ -715,22 +758,33 @@ export default {
}, },
// //
selectedKeyPoints(newVal) { selectedKeyPoints(newVal) {
console.log(newVal)
// 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave // 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
this.formModel.shenchayaodian = newVal
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
this.formModel.shenchachangjing = ''
this.selectedScene.text = ''
console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave) console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave)
this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id
}, },
selectedDetails(newVal) { selectedDetails(newVal) {
// 当 selectedDetails 改变时,将值赋给 selectedDetailsSave // 当 selectedDetails 改变时,将值赋给 selectedDetailsSave
this.selectedDetailsSave = newVal this.selectedDetailsSave = newVal
this.formModel.shenchaxize = newVal
this.formModel.shenchachangjing = ''
this.selectedScene.text = ''
console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave) console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave)
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.detailsId = this.selectedDetailsSave.id
}, },
selectedScene(newVal) { selectedScene(newVal) {
this.selectedSceneSave = newVal this.selectedSceneSave = newVal
this.formModel.shenchachangjing = newVal
console.log('selectedSceneSave的新值', this.selectedSceneSave) console.log('selectedSceneSave的新值', this.selectedSceneSave)
// this.newResDataAdd.oldText = this.selectedSceneSave.text // this.newResDataAdd.oldText = this.selectedSceneSave.text
} },
} }
} }
</script> </script>
......
...@@ -420,10 +420,6 @@ export default { ...@@ -420,10 +420,6 @@ export default {
this.selected = this.standardList[0].id this.selected = this.standardList[0].id
this.pageIndexSec.inspectStandardId = this.standardList[0].id this.pageIndexSec.inspectStandardId = this.standardList[0].id
this.pageIndexSec.standardNo = this.standardList[0].standardNo this.pageIndexSec.standardNo = this.standardList[0].standardNo
// console.log(response, '1111') // console.log(response, '1111')
}) })
.catch(error => { .catch(error => {
......
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<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="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -96,7 +100,11 @@ ...@@ -96,7 +100,11 @@
<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="shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button
:disabled="!formModel.jianyanleixing || !formModel.biaozhunyaoqiu"
type="primary"
plain
@click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
<div> <div>
...@@ -375,6 +383,7 @@ ...@@ -375,6 +383,7 @@
mounted() { mounted() {
console.log('selected vif3 this.pageIndexSec = ', this.pageIndexSec) console.log('selected vif3 this.pageIndexSec = ', this.pageIndexSec)
this.newResDataAdd.chapter = this.pageIndexSec this.newResDataAdd.chapter = this.pageIndexSec
testReviewer() testReviewer()
.then(res => { .then(res => {
this.receivedReviewer = res.data this.receivedReviewer = res.data
...@@ -392,6 +401,12 @@ ...@@ -392,6 +401,12 @@
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ''
this.formModel.shenchayaodian = ''
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
this.selectedKeyPoints.text = ''
this.selectedDetails.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
...@@ -443,7 +458,6 @@ ...@@ -443,7 +458,6 @@
testType(this.newResData) testType(this.newResData)
.then(response => { .then(response => {
this.receivedRequirements = response this.receivedRequirements = response
this.newResDataAdd.inspectStandardId = this.pageIndexSec.id this.newResDataAdd.inspectStandardId = this.pageIndexSec.id
this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo this.newResDataAdd.inspectStandardNo = this.pageIndexSec.standardNo
this.newResDataAdd.operationSort = this.pageIndexSec.operationSort this.newResDataAdd.operationSort = this.pageIndexSec.operationSort
...@@ -564,6 +578,9 @@ ...@@ -564,6 +578,9 @@
selectedRequirement(newVal) { selectedRequirement(newVal) {
// 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave // 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave
this.selectedRequirementSave = newVal this.selectedRequirementSave = newVal
this.formModel.biaozhunyaoqiu = newVal
this.formModel.shenchayaodian = ''
this.selectedKeyPoints.text = ''
console.log( console.log(
'selectedRequirementSave 的新值:', 'selectedRequirementSave 的新值:',
this.selectedRequirementSave this.selectedRequirementSave
...@@ -575,6 +592,7 @@ ...@@ -575,6 +592,7 @@
selectedKeyPoints(newVal) { selectedKeyPoints(newVal) {
// 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave // 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
this.formModel.shenchayaodian = newVal
console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave) console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave)
this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id
}, },
......
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<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="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -348,6 +352,7 @@ export default { ...@@ -348,6 +352,7 @@ export default {
this.newResData.standardNo = this.pageIndexSec.standardNo this.newResData.standardNo = this.pageIndexSec.standardNo
this.newResData.standardId = this.pageIndexSec.id this.newResData.standardId = this.pageIndexSec.id
this.newResData.name = this.pageIndexSec.name this.newResData.name = this.pageIndexSec.name
//this.formModel.jianyanleixing = this.dict.type.sys_scene_type[0].value
}, },
methods: { methods: {
// 表单提交验证 // 表单提交验证
...@@ -362,6 +367,9 @@ export default { ...@@ -362,6 +367,9 @@ export default {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ' '
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
......
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<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="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu"> <el-form-item label="标准要求" prop="biaozhunyaoqiu" v-model="formModel.biaozhunyaoqiu">
<el-button type="primary" plain @click="handleReSelectRequirements" <el-button
:disabled="!formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectRequirements"
>选择标准要求</el-button >选择标准要求</el-button
><span> ><span>
{{ selectedRequirement.chapter }} {{ selectedRequirement.chapter }}
...@@ -96,7 +100,11 @@ ...@@ -96,7 +100,11 @@
<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="shenchayaodian" v-model="formModel.shenchayaodian"> <el-form-item label="审查要点" prop="shenchayaodian" v-model="formModel.shenchayaodian">
<el-button type="primary" plain @click="handleReSelectKeypoints" <el-button
:disabled="!formModel.jianyanleixing || !formModel.biaozhunyaoqiu "
type="primary"
plain
@click="handleReSelectKeypoints"
>选择审查要点</el-button >选择审查要点</el-button
><span>{{ selectedKeyPoints.text }}</span> ><span>{{ selectedKeyPoints.text }}</span>
<div> <div>
...@@ -144,7 +152,11 @@ ...@@ -144,7 +152,11 @@
<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="shenchaxize" v-model="formModel.shenchaxize"> <el-form-item label="审查细则" prop="shenchaxize" v-model="formModel.shenchaxize">
<el-button type="primary" plain @click="handleReSelectDetails" <el-button
:disabled="!formModel.shenchayaodian || !formModel.biaozhunyaoqiu || !formModel.jianyanleixing"
type="primary"
plain
@click="handleReSelectDetails"
>选择审查细则</el-button >选择审查细则</el-button
><span>{{ selectedDetails.text }}</span> ><span>{{ selectedDetails.text }}</span>
<!-- <el-input <!-- <el-input
...@@ -446,6 +458,12 @@ export default { ...@@ -446,6 +458,12 @@ export default {
const selectedItem = this.dict.type.sys_scene_type.find( const selectedItem = this.dict.type.sys_scene_type.find(
item => item.value === selected item => item.value === selected
) )
this.formModel.biaozhunyaoqiu = ''
this.formModel.shenchayaodian = ''
this.selectedRequirement.chapter = ''
this.selectedRequirement.text = ''
this.selectedKeyPoints.text = ''
this.selectedDetails.text = ''
if (selectedItem) { if (selectedItem) {
// 将 item.type 赋值给 this.newResData.type // 将 item.type 赋值给 this.newResData.type
this.newResData.type = selectedItem.value this.newResData.type = selectedItem.value
...@@ -540,7 +558,7 @@ export default { ...@@ -540,7 +558,7 @@ export default {
}, },
// 按钮-选择审查细则 // 按钮-选择审查细则
handleReSelectDetails() { handleReSelectDetails() {
testDetails({ keypointId: this.newResDataAdd.keypointId }) testDetails({ keypointId: this.selectedKeyPointsSave.id })
.then(response => { .then(response => {
this.receivedDetails = response this.receivedDetails = response
...@@ -615,6 +633,12 @@ export default { ...@@ -615,6 +633,12 @@ export default {
selectedRequirement(newVal) { selectedRequirement(newVal) {
// 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave // 当 selectedRequirement 改变时,将值赋给 selectedRequirementSave
this.selectedRequirementSave = newVal this.selectedRequirementSave = newVal
this.formModel.biaozhunyaoqiu = newVal
this.selectedRequirementSave = newVal
this.formModel.shenchayaodian = ''
this.selectedKeyPoints.text = ''
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
console.log( console.log(
'selectedRequirementSave 的新值:', 'selectedRequirementSave 的新值:',
this.selectedRequirementSave this.selectedRequirementSave
...@@ -626,12 +650,16 @@ export default { ...@@ -626,12 +650,16 @@ export default {
selectedKeyPoints(newVal) { selectedKeyPoints(newVal) {
// 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave // 当 selectedKeyPoints 改变时,将值赋给 selectedKeyPointsSave
this.selectedKeyPointsSave = newVal this.selectedKeyPointsSave = newVal
this.formModel.shenchayaodian = newVal
this.formModel.shenchaxize = ''
this.selectedDetails.text = ''
console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave) console.log('selectedKeyPointsSave 的新值:', this.selectedKeyPointsSave)
this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id this.newResDataAdd.keypointId = this.selectedKeyPointsSave.id
}, },
selectedDetails(newVal) { selectedDetails(newVal) {
// 当 selectedDetails 改变时,将值赋给 selectedDetailsSave // 当 selectedDetails 改变时,将值赋给 selectedDetailsSave
this.selectedDetailsSave = newVal this.selectedDetailsSave = newVal
this.formModel.shenchaxize = newVal
console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave) console.log('selectedDetailsSave 的新值:', this.selectedDetailsSave)
this.newResDataAdd.detailsId = this.selectedDetailsSave.id this.newResDataAdd.detailsId = this.selectedDetailsSave.id
} }
......
...@@ -344,10 +344,9 @@ export default { ...@@ -344,10 +344,9 @@ export default {
case 'REJECT': case 'REJECT':
return '不通过'; return '不通过';
case null: case null:
return '评审中'; return '--';
default: default:
return cellValue return cellValue
} }
}, },
formatTaskStatus(row, column, cellValue){ formatTaskStatus(row, column, cellValue){
......
<template> <template>
<page-standard class="view-review"> <page-standard class="view-review">
<div class="title"> <div style="background-color: white; padding-bottom: 100px;">
<el-image
v-if="pageData.taskStatus == 'CLOSE'"
style="
width: 150px;
height: 150px;
position: absolute;
right: 200px;
top: 100px;
"
:src="require('@/assets/images/review/yiquxiao@2x.png')"
></el-image>
<el-image
v-else-if="pageData.taskResult == 'PASS'"
style="
width: 150px;
height: 150px;
position: absolute;
right: 200px;
top: 100px;
"
:src="require('@/assets/images/review/yitongguo@3x.png')"
></el-image>
<el-image
v-else-if="pageData.taskResult == 'REJECT'"
style="
width: 150px;
height: 150px;
position: absolute;
right: 200px;
top: 100px;
"
:src="require('@/assets/images/review/weitongguo_1@3x.png')"
></el-image>
<el-image
v-else
style="
width: 150px;
height: 150px;
position: absolute;
right: 200px;
top: 100px;
"
:src="require('@/assets/images/review/pingshenzhong@3x.png')"
></el-image>
<div
style="
display: flex;
width: 100%;
padding: 5px 10px;
font-size: 15px;
background-color: #d1d5db;
align-items: center;
justify-content: space-between;
"
>
<span style=" font-weight: bold;">查看评审(+ {{ formatAction(this.pageData) }}</span>
<span style="align-items: center;">
<span style="margin-right: 150px;font-size: 13px;">参与评审人员: {{ this.pageData.reviewer }}</span>
<el-button type="text" style="font-size: 15px;" @click="handleBack"> <- 返回 </el-button>
</span>
</div>
<div style="padding: 0 20px;">
<div class="title" style="justify-content: space-between">
<span <span
>检验标准: {{ this.pageData.inspectStandardNo }} >检验标准: {{ this.pageData.inspectStandardNo }}
{{ this.pageData.standard }}</span {{ this.pageData.standard }}</span
> >
</div> </div>
<div class="subtitle">评审对象</div> <div class="subtitle">评审对象</div>
<el-row <el-row
:gutter="20" :gutter="20"
justify="center" justify="center"
type="flex" type="flex"
style="margin-bottom: 30px" style="margin-bottom: 30px;"
> >
<el-col :span="20"> <el-col :span="20">
<div> <div>
...@@ -273,6 +340,8 @@ ...@@ -273,6 +340,8 @@
<message-item></message-item> <message-item></message-item>
</el-col> </el-col>
</el-row> --> </el-row> -->
</div>
</div>
</page-standard> </page-standard>
</template> </template>
...@@ -281,8 +350,6 @@ import MessageItem from '@/components/MessageItem' ...@@ -281,8 +350,6 @@ import MessageItem from '@/components/MessageItem'
import { alreadyReviewer } from '@/api/reviewer/reviewer.js' import { alreadyReviewer } from '@/api/reviewer/reviewer.js'
import { getDicts } from '@/api/system/dict/data' import { getDicts } from '@/api/system/dict/data'
import request from '@/utils/request' import request from '@/utils/request'
import { method } from 'lodash'
import { comment } from 'postcss'
export default { export default {
name: 'Index', name: 'Index',
dicts: ['sys_scene_type', 'review_status'], dicts: ['sys_scene_type', 'review_status'],
...@@ -308,7 +375,7 @@ export default { ...@@ -308,7 +375,7 @@ export default {
alreadyReviewer({ id: this.id }) alreadyReviewer({ id: this.id })
.then(response => { .then(response => {
this.pageData = response.data || {} // 确保数据存在 this.pageData = response.data || {} // 确保数据存在
console.log(this.pageData) console.log(this.pageData.taskStatus == 'CLOSE')
}) })
.catch(error => { .catch(error => {
console.error('Error loading review data:', error) console.error('Error loading review data:', error)
...@@ -359,13 +426,44 @@ export default { ...@@ -359,13 +426,44 @@ export default {
// return type ? type.dictLabel : '' // return type ? type.dictLabel : ''
// } // }
formatDecison(decision) { formatDecison(decision) {
return decision == 'PASS'? '通过': decision == 'REJECT'? '拒绝' : '暂未评审' return decision == 'PASS'
? '通过'
: decision == 'REJECT'
? '拒绝'
: '暂未评审'
}, },
formatType(type) { formatType(type) {
const foundType = this.dict.type.sys_scene_type.find( const foundType = this.dict.type.sys_scene_type.find(
item => item.value === type item => item.value === type
) )
return foundType ? foundType.label : '未知分类' return foundType ? foundType.label : '未知分类'
},
formatAction(action) {
switch (action.operationSort) {
case 'ADD_KEYPOINT':
return '新增审查要点'
case 'DELETE_KEYPOINT':
return '删除审查要点'
case 'ADD_DETAILS':
return '新增审查细则'
case 'DELETE_DETAILS':
return '删除审查细则'
case 'ADD_SCENE':
return '新增审查场景'
case 'DELETE_SCENE':
return '删除审查场景'
case 'ADD_USECASE':
return '新增测试用例'
case 'UPDATE_USECASE':
return '修改测试用例'
case 'DELETE_USECASE':
return '删除测试用例'
default:
return '未知类型'
}
},
handleBack(){
this.$router.push({ path: '/review/initiatedReview' })
} }
} }
} }
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
:default-sort="{ prop: 'createTime', order: 'descending' }" :default-sort="{ prop: 'createTime', order: 'descending' }"
:data="tableData" :data="tableData"
> >
<el-table-column type="index" width="155" label="序号" align="center" > <el-table-column type="index" width="55" label="序号" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
<el-table-column <el-table-column
label="评审内容" label="评审内容"
sortable sortable
min-width="200" width="360"
align="left" align="left"
prop="newText" prop="newText"
> >
......
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