From 8d6b00893e1e729621b2d09393e151eb1d9a5617 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期三, 06 十二月 2023 17:30:25 +0800
Subject: [PATCH] 项目表
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 181 +++++++++++++++++++++++---------------------
1 files changed, 94 insertions(+), 87 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 299b3d8..a348f1f 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" column="2" @confirm="formSubmit">
+ <zt-dialog ref="dialog" column="2" @confirm="formSubmit" :append-to-body="true">
<el-form :model="dataForm" :inline="true" ref="dataForm" style="padding-top: 0" :disabled="dataForm.disabled"
label-width="120px" class="testCheckFormAuto">
<div>
@@ -10,38 +10,38 @@
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="testCheckContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鏍囪瘑" style="width: 49%">
- <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鏍囪瘑"></el-input>
+ <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 49%">
- <el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鍚嶇О"></el-input>
+ <el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%">
- <el-input v-model="dataForm.project.softwareIdentity" placeholder="妫�鏌ヤ汉"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
- <el-input v-model="dataForm.project.isContract" placeholder="妫�鏌ユ椂闂�"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.examDate" placeholder="妫�鏌ユ椂闂�"></el-input>
</el-form-item>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
<div style="padding-left:5px;padding-right:5px;">
- <div style="padding: 5px">娴嬭瘯璁″垝锛�</div>
+ <div style="padding: 5px">{{subtitle}}</div>
<div class="table-container">
<el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
- :data="dataForm.technicalList"
+ :data="dataForm.checkOrderList"
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="infoName" min-width="180" label="涓昏妫�鏌ュ唴瀹�">
+ <el-table-column prop="checkContent" min-width="180" label="涓昏妫�鏌ュ唴瀹�">
<template v-slot="{ row }">
- <el-input v-model="row.name" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>
+ <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>
</template>
</el-table-column>
- <el-table-column prop="identify" align="center" width="150" label="妫�鏌ョ粨鏋�">
+ <el-table-column prop="checkResult" align="center" width="150" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
- <zt-dict v-model="row.identify" dict="is_or_not" :radio="true"></zt-dict>
+ <zt-dict v-model="row.checkResult" dict="is_or_not" :radio="true"></zt-dict>
</template>
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
@@ -49,18 +49,18 @@
<el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
</template>
</el-table-column>
-<!-- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
- <template v-slot="{ row }">
- <!– <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>–>
- <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
- v-model="row.files"/>
- </template>
- </el-table-column>-->
+ <!-- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
+ <template v-slot="{ row }">
+ <!– <zt-table-button @click="files(row.id)">涓婁紶闄勪欢</zt-table-button>–>
+ <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
+ v-model="row.files"/>
+ </template>
+ </el-table-column>-->
</el-table>
-<!-- <div class="icon-container" @click="addCirculatRow()">-->
-<!-- <!– 鏀剧疆鍥哄畾鐨勫浘鏍� –>-->
-<!-- <i class="el-icon-plus"></i>-->
-<!-- </div>-->
+ <!-- <div class="icon-container" @click="addCirculatRow()">-->
+ <!-- <!– 鏀剧疆鍥哄畾鐨勫浘鏍� –>-->
+ <!-- <i class="el-icon-plus"></i>-->
+ <!-- </div>-->
</div>
</div>
</div>
@@ -71,7 +71,7 @@
<div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<el-input type="textarea"
- :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="闂鎻忚堪..."></el-input>
+ :rows="3" v-model="dataForm.testCheckOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
</el-form-item>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
<el-input type="textarea"
- :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="闂澶勭悊..."></el-input>
+ :rows="3" v-model="dataForm.testCheckOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
</el-form-item>
</div>
</div>
@@ -92,15 +92,15 @@
</div>
<div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="澶勭悊浜�"></el-input>
+ <el-input v-model="dataForm.testCheckOrder.processor" placeholder="澶勭悊浜�"></el-input>
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
楠岃瘉浜�
</div>
<div class="el-border-left acceptDate1" style="width: 40%;height: 40px;">
- <el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
- <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="楠岃瘉浜�"></el-input>
+ <el-form-item label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
+ <el-input v-model="dataForm.testCheckOrder.verifier" placeholder="楠岃瘉浜�"></el-input>
</el-form-item>
</div>
</div>
@@ -114,62 +114,65 @@
<script>
export default {
- props:{
- pageCode: {
- type: String,
- default: ''
- },
- },
data() {
return {
+ configDetailRow: null,
+ subtitle: '',
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
dataForm: {
id: '',
projectId: '',
- project:{
- softwareIdentity:'',
- softwareName:'',
- softwareType:'',
- isContract:'',
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
},
- testCheckOrder:{
+ testCheckOrder: {
code: '',
examiner: '',
examDate: '',
problemDescription: '',
problemProcess: '',
processor: '',
- processorId: '',
- processDate: '',
verifier: '',
- verifierId: '',
- verifyDate: '',
- year: ''
},
- testAgencyInfo:{
- agencyName:''
- }
+ checkOrderList: []
}
}
},
methods: {
init(id, row) {
- console.log(id,row,'杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
- if (id) {
+ this.configDetailRow = row
+ if (row.checkId) {
+ this.dataForm.id = row.checkId
+ } else if (id) {
this.dataForm.id = id
} else {
this.dataForm.id = row.id
}
- if(row.projectId){
- this.dataForm.projectId =row.projectId
- }
+ this.pageCode = row.pageCode
+ this.subtitle = this.pageName[this.pageCode]
- // this.dataForm.disabled
+ if (row.projectId) {
+ this.dataForm.projectId = row.projectId
+ }
+ console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
+
+ //this.dataForm.disabled
this.getInfo()
- console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
+ //console.log(this.dataForm.id, this.dataForm.projectId, this.stepMarker, 'this.dataForm.id, this.dataForm.projectId,this.stepMarker')
+ },
+ indexFormat(index) {
+ return index += 1
},
// 鑾峰彇淇℃伅
async getInfo() {
- let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/${this.dataForm.id}`)
+ let params = {
+ checkId: this.dataForm.id,
+ projectId: this.dataForm.projectId,
+ pageCode: this.pageCode
+ }
+ console.log(this.pageCode, "getInfo pageCode")
+ let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
...res.data
@@ -181,46 +184,50 @@
if (res.success) {
await this.$tip.success()
this.$refs.dialog.close()
- this.$emit('refreshDataList')
+ this.$emit('recall', res.data, this.configDetailRow)
}
}
}
}
</script>
<style>
-.el-flexCirculationDialog {
- display: flex;
- align-items: center
-}
+ .el-flexCirculationDialog {
+ display: flex;
+ align-items: center
+ }
-.testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
- width: 100%;
-}
-.testCheckFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
- width: 100%;
-}
-.testCheckFormAuto .marginTopAndMarginBottom {
- margin-top: 10px !important;
- margin-bottom: 0 !important;
-}
+ .testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
-.testCheckFormAuto .marginTopAndMarginBottom2 {
- margin-top: -10px !important;
- margin-bottom: 10px !important;
-}
+ .testCheckFormAuto .acceptDate1 > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
-.testCheckFormAuto .marginTopAndMarginBottom3 {
- margin-top: 0 !important;
- margin-bottom: 10px !important;
-}
+ .testCheckFormAuto .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+ }
-.testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
- line-height: 78px;
-}
-.testCheckContentWidth > .el-form-item > .el-form-item__content {
- width: calc(100% - 120px);
-}
-.testCheckFormAuto .el-radio {
- margin-right: 10px;
-}
+ .testCheckFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+ }
+
+ .testCheckFormAuto .marginTopAndMarginBottom3 {
+ margin-top: 0 !important;
+ margin-bottom: 10px !important;
+ }
+
+ .testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ line-height: 78px;
+ }
+
+ .testCheckContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+ }
+
+ .testCheckFormAuto .el-radio {
+ margin-right: 10px;
+ }
</style>
--
Gitblit v1.9.1