From 7a0c5479c363a10f573aa15a54dc8130eabd47ff Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 29 一月 2024 11:47:53 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate.vue | 186 +++++++++++++++++++++++++---------------------
1 files changed, 101 insertions(+), 85 deletions(-)
diff --git a/web/src/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate.vue b/web/src/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate.vue
index 0396dac..c02c7c0 100644
--- a/web/src/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate.vue
+++ b/web/src/views/modules/qaAuditReport/QaAuditReport-AddOrUpdate.vue
@@ -10,10 +10,10 @@
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="QaAuditContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.testAgencyInfo.agencyName" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
+ <el-input v-model="dataForm.project.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鏍囪瘑" style="width: 49%">
- <el-input v-model="dataForm.testAgencyInfo.labContactNum" placeholder="璇疯緭鍏ラ」鐩爣璇�"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="璇疯緭鍏ラ」鐩爣璇�"></el-input>
</el-form-item>
</div>
<div class="el-flexQaAuditDialog el-border-bottom">
@@ -22,13 +22,13 @@
</div>
<div class="el-border-left" style="width: calc(100% - 120px);min-height: 40px">
<el-form-item style="width: 50%;padding: 0 5px">
- <span>椤圭洰璐熻矗浜猴細{{dataForm.contractReview.technicalDirector || '椤圭洰璐熻矗浜�'}} </span>
+ <span>椤圭洰璐熻矗浜猴細{{dataForm.project.projectLeader || '椤圭洰璐熻矗浜�'}} </span>
</el-form-item>
<el-form-item style="width: 40%;padding: 0 5px">
- <span>娴嬭瘯浜哄憳锛歿{dataForm.contractReview.technicalDirector || '娴嬭瘯浜哄憳'}} </span>
+ <span>娴嬭瘯浜哄憳锛歿{dataForm.project.projectTesters || '娴嬭瘯浜哄憳'}} </span>
</el-form-item>
- <el-form-item style="width: 100%;padding: 0 5px">
- <span>閰嶇疆绠＄悊鍛橈細{{dataForm.contractReview.technicalDirector || '閰嶇疆绠＄悊鍛�'}} </span>
+ <el-form-item style="width: 40%;padding: 0 5px">
+ <span>閰嶇疆浜哄憳锛歿{dataForm.project.projectConfiger || '閰嶇疆浜哄憳'}} </span>
</el-form-item>
</div>
</div>
@@ -37,6 +37,10 @@
宸插畬鎴愮殑妫�鏌�
</div>
<div class="el-border-left" style="width: calc(100% - 120px);min-height: 40px">
+ <el-form-item class="el-QaTextarea" label-width="20px" style="width: 100%;padding: 5px">
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="dataForm.auditReport.completedCheck"></el-input>
+ </el-form-item>
</div>
</div>
<div class=" el-border-bottom">
@@ -46,22 +50,46 @@
<div>
<div class="table-container">
<el-table ref="tableConfigItemList" class="el-software el-margin-top-bot"
- style="width: 99%;margin-left: 5px" border :data="dataForm.reviewItemList"
+ style="width: 99%;margin-left: 5px" border :data="dataForm.incongruentList"
stripe>
<el-table-column prop="no" align="center" width="60" label="搴忓彿">
<template slot-scope="scope">
<span v-html="indexFormat(scope.$index)"></span>
</template>
</el-table-column>
- <el-table-column prop="item" min-width="400" label="璇勫椤�">
+ <el-table-column prop="oddNum" min-width="350" label="涓嶇鍚堥」鍗曞彿">
<template v-slot="{ row }">
- <el-input v-model="row.item" placeholder="璇勫椤�"></el-input>
+ <el-input v-model="row.oddNum" placeholder="涓嶇鍚堥」鍗曞彿"></el-input>
</template>
</el-table-column>
- <el-table-column prop="result" width="220" align="center" label="璇勫缁撴灉">
+ <el-table-column prop="notTrueDescribe" width="220" align="center" label="涓嶇鍚堥」鎻忚堪">
<template v-slot="{ row }">
- <zt-dict v-model="row.result" placeholder="璇勫缁撴灉" dict="tristate1" :radio="true"
- clearable></zt-dict>
+ <el-input v-model="row.notTrueDescribe" placeholder="涓嶇鍚堥」鎻忚堪"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="workProcess" width="100" align="center" label="鎵�灞炲伐浣滀骇鍝�/杩囩▼">
+ <template v-slot="{ row }">
+ <el-input v-model="row.workProcess" placeholder="鎵�灞炲伐浣滀骇鍝�/杩囩▼"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="discoveryPhase" width="80" align="center" label="鍙戠幇闃舵">
+ <template v-slot="{ row }">
+ <el-input v-model="row.discoveryPhase" placeholder="鍙戠幇闃舵"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="chargePerson" width="80" align="center" label="璐ｄ换浜�">
+ <template v-slot="{ row }">
+ <el-input v-model="row.chargePerson" placeholder="璐ｄ换浜�"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="status" width="80" align="center" label="鐘舵��">
+ <template v-slot="{ row }">
+ <el-input v-model="row.status" placeholder="鐘舵��"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" width="100" align="center" label="澶囨敞">
+ <template v-slot="{ row }">
+ <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
</el-table>
@@ -73,32 +101,34 @@
QA鎬荤粨
</div>
<div class="el-border-bottom">
- <el-form-item class="el-QaTextarea" label-width="20px" style="width: 100%;padding: 5px">
- <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="dataForm.contractReview.reviewRecord"></el-input>
- </el-form-item>
- <el-form-item label="妫�鏌ヤ汉(绛惧瓧)锛�" label-width="160px" style="width: 48%;padding: 5px;">
- <el-input v-model="dataForm.contractReview.technicalDirector"></el-input>
- </el-form-item>
- <el-form-item style="width: 48%;padding: 5px;">
- {{ dataForm.contractReview.reviewDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
- </el-form-item>
+ <el-form-item class="el-QaTextarea" label-width="20px" style="width: 100%;padding: 5px">
+ <el-input v-if="stepMarker=='qashbg_first'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="dataForm.auditReport.qaSummary"></el-input>
+ <span v-else>{{ dataForm.auditReport.qaSummary}}</span>
+ </el-form-item>
+ <el-form-item label="妫�鏌ヤ汉(绛惧瓧)锛�" label-width="160px" style="width: 48%;padding: 5px;">
+ {{ dataForm.auditReport.checker }}
+ </el-form-item>
+ <el-form-item style="width: 48%;padding: 5px;">
+ {{ dataForm.auditReport.checkDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ </el-form-item>
</div>
<div>
<el-form-item label="璐ㄩ噺鐩戠潱鍛樻剰瑙侊細" class="el-QaTextarea1" label-width="160px" style="width: 100%;padding: 5px">
- <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="dataForm.contractReview.technicalDirector"></el-input>
+ <el-input v-if="stepMarker=='qashbg_zljd'" type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�"
+ v-model="dataForm.auditReport.supervisorOpinion"></el-input>
+ <span v-else>{{ dataForm.auditReport.supervisorOpinion}}</span>
</el-form-item>
<el-form-item label="璐ㄩ噺鐩戠潱鍛�(绛惧瓧)锛�" label-width="160px" style="width: 48%;padding: 5px;">
- <el-input v-model="dataForm.contractReview.technicalDirector"></el-input>
+ {{ dataForm.auditReport.supervisorSign }}
</el-form-item>
- <el-form-item style="width: 48%;padding: 5px;">
- {{ dataForm.contractReview.reviewDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ <el-form-item style="width: 48%;padding: 5px;">
+ {{ dataForm.auditReport.superviseDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</el-form-item>
</div>
</div>
</div>
- <div class="el-flex review-sc" style="height: 60px">
+ <div class="el-flex qa-sc" style="height: 60px">
<el-form-item class="marginTopAndMarginBottom" style="width: 100%">
<config-uploader :lineHeight="true" busi-type="qa_audit_report" model-name="dataForm" :dataForm="dataForm"
v-model="dataForm.files"/>
@@ -133,49 +163,13 @@
id: '',
project: {
softwareIdentity: '',
- softwarName: '',
+ softwareName: '',
projectLeader: '',
- projectTesters: ''
+ projectTesters: '',
+ projectConfiger: ''
},
- contractReview: {
- code: '',
- orderCode: '',
- reviewType: '',
- reviewRecord: '',
- specialRequire: '',
- subcontract: '',
- reviewConclusion: '',
- technicalDirector: '',
- reviewDate: '',
- reviewPanelMember: '',
- },
- incongruentList: [],
- testAgencyInfo: {
- agencyName: '',
- labContactNum: ''
- },
+ incongruentList: []
}
- // dataForm: {
- // id: '',
- // files:'',
- // contractReview: {
- // code: '',
- // orderCode: '',
- // reviewType: '',
- // reviewRecord: '',
- // specialRequire: '',
- // subcontract: '',
- // reviewConclusion: '',
- // technicalDirector: '',
- // reviewDate: '',
- // reviewPanelMember: '',
- // },
- // testAgencyInfo: {
- // agencyName: '',
- // labContactNum: ''
- // },
- // reviewItemList: []
- // }
}
},
methods: {
@@ -204,7 +198,19 @@
indexFormat(index) {
return index += 1
},
-
+ async getNameById() {
+ let params = {
+ projectLeaderId: this.dataForm.project.projectLeader,
+ projectTestersId: this.dataForm.project.projectTesters,
+ projectConfigerId: this.dataForm.project.projectConfiger
+ }
+ let res = await this.$http.get(`/qaAuditReport/QaAuditReport/getNameById`, {params: params})
+ if (res.success) {
+ this.dataForm.project.projectLeader = res.data.projectLeaderName
+ this.dataForm.project.projectTesters = res.data.projectTestersName
+ this.dataForm.project.projectConfiger = res.data.projectConfigerName
+ }
+ },
addCirculatRow() {
this.dataForm.technicalList.push({})
this.$nextTick(() => {
@@ -223,6 +229,7 @@
...this.dataForm,
...res.data
}
+ this.getNameById()
if (this.dataForm.project === null) {
this.dataForm.project = {}
}
@@ -261,20 +268,29 @@
}
</script>
<style>
-.el-flexQaAuditDialog{
- display: flex;
- align-items: center;
-}
-.QaFormWidth{
- width: 120px;
-}
-.QaAuditContentWidth > .el-form-item > .el-form-item__content {
- width: calc(100% - 120px);
-}
-.el-form-item.el-QaTextarea > .el-form-item__content {
- width: 100%;
-}
-.el-form-item.el-QaTextarea1 > .el-form-item__content {
- width: calc(100% - 160px);
-}
+ .el-flexQaAuditDialog {
+ display: flex;
+ align-items: center;
+ }
+
+ .QaFormWidth {
+ width: 120px;
+ }
+
+ .QaAuditContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+ }
+
+ .el-form-item.el-QaTextarea > .el-form-item__content {
+ width: 100%;
+ }
+
+ .el-form-item.el-QaTextarea1 > .el-form-item__content {
+ width: calc(100% - 160px);
+ }
+</style>
+<style>
+ .qa-sc > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
</style>
--
Gitblit v1.9.1