From a38a1ac77bb6ac9ea8bf0cf5f5f6b68d0e6e6974 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 08:44:10 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue | 116 +++++++++++++++++++++++----------------------------------
1 files changed, 47 insertions(+), 69 deletions(-)
diff --git a/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue b/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
index d8a2415..3c0d894 100644
--- a/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
+++ b/web/src/views/modules/configAuditReport/ConfigAuditReport-AddOrUpdate.vue
@@ -4,13 +4,13 @@
label-width="120px" class="configAuditFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
- <span>{{dataForm.circulatOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
+ <span>{{dataForm.auditReport.code || '缂栧彿鑷姩鐢熸垚'}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
<div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="configAuditContentWidth">
<el-form-item class="marginTopAndMarginBottom" label="椤圭洰鍚嶇О" style="width: 48%">
- <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: 48%">
<el-input v-model="dataForm.project.softwareIdentity" placeholder="椤圭洰鏍囪瘑"></el-input>
@@ -20,37 +20,31 @@
<div>
<div style="text-align: center;font-weight: 600;border-bottom:1px solid rgba(0,0,0,.2);height: 40px;line-height: 40px;font-size: 18px">瀹℃牳鍐呭</div>
<el-form-item label="鐘舵�佹爣璁�" label-width="150px" style="width:100%;padding-left:20px;margin-bottom:0">
- <zt-dict v-model="dataForm.circulatOrder.itemRequire" :radio="true"
- dict="is_or_not"></zt-dict>
+ 鈭氬悎鏍� 脳涓嶅悎鏍� NA涓嶉�傜敤
</el-form-item>
<div class="table-container">
<el-table ref="tableConfigAuditList" class="el-software el-margin-top-bot" border
- :data="dataForm.technicalList"
+ :data="dataForm.contentList"
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="auditContent" min-width="180" label="瀹℃牳鍐呭">
<template v-slot="{ row }">
- <el-input v-model="row.name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
+ <el-input v-model="row.auditContent" placeholder="瀹℃牳鍐呭"></el-input>
</template>
</el-table-column>
- <el-table-column prop="identify" align="center" width="150" label="鏍囪瘑">
+ <el-table-column prop="auditResult" align="center" width="150" label="瀹℃牳缁撴灉">
<template v-slot="{ row }">
- <el-input v-model="row.version" placeholder="鏍囪瘑"></el-input>
+ <zt-dict v-model="row.auditResult" placeholder="瀹℃牳缁撴灉" dict="status_tag"
+ clearable></zt-dict>
</template>
</el-table-column>
<el-table-column prop="remark" label="澶囨敞" width="100" align="center">
<template v-slot="{ row }">
<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 }">
- <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
- v-model="row.files"/>
</template>
</el-table-column>
</el-table>
@@ -60,32 +54,32 @@
<div style="text-align: center;font-weight: 600;height: 40px;line-height: 40px;font-size: 18px">鍙戠幇鐨勯棶棰�</div>
<div class="table-container">
<el-table ref="tableConfigAuditList" class="el-software el-margin-top-bot" border
- :data="dataForm.technicalList"
+ :data="dataForm.problemList"
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="problemDescription" min-width="180" label="闂鎻忚堪">
<template v-slot="{ row }">
- <el-input v-model="row.name" placeholder="鎶�鏈祫鏂欏悕绉�"></el-input>
+ <el-input v-model="row.problemDescription" placeholder="闂鎻忚堪"></el-input>
</template>
</el-table-column>
- <el-table-column prop="identify" align="center" width="150" label="鏍囪瘑">
+ <el-table-column prop="isNotTrue" align="center" width="150" label="鏄惁涓轰笉绗﹀悎椤�">
<template v-slot="{ row }">
- <el-input v-model="row.version" placeholder="鏍囪瘑"></el-input>
+ <zt-dict v-model="row.isNotTrue" placeholder="鏄惁涓轰笉绗﹀悎椤�" dict="is_or_not" :radio="true"
+ clearable></zt-dict>
</template>
</el-table-column>
- <el-table-column prop="remark" label="澶囨敞" width="100" align="center">
+ <el-table-column prop="problemRectification" label="闂鏁存敼鎯呭喌" width="100" align="center">
<template v-slot="{ row }">
- <el-input v-model="row.remark" placeholder="澶囨敞"></el-input>
+ <el-input v-model="row.problemRectification" placeholder="闂鏁存敼鎯呭喌"></el-input>
</template>
</el-table-column>
- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
+ <el-table-column prop="discoveryPhase" label="鍙戠幇闃舵" width="100" align="center">
<template v-slot="{ row }">
- <table-uploader busi-type="circulat_order" model-name="row" :dataForm="row"
- v-model="row.files"/>
+ <el-input v-model="row.discoveryPhase" placeholder="鍙戠幇闃舵"></el-input>
</template>
</el-table-column>
</el-table>
@@ -102,7 +96,9 @@
</div>
<div class="el-border-left-right" style="width: 20%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- {{dataForm.circulatOrder.calibratDetector}}
+ <el-input type="textarea" :rows="1" placeholder="璇疯緭鍏ュ鏍镐汉鍛�"
+ v-model="dataForm.auditReport.auditor"></el-input>
+ <!--{{dataForm.configAuditReport.auditor}}-->
</el-form-item>
</div>
<div style="width: 52px;text-align: center;font-weight: 600">
@@ -110,11 +106,21 @@
</div>
<div class="el-border-left" style="width: 20%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <!-- {{dataForm.circulatOrder.detectDate}}-->
- {{ dataForm.circulatOrder.detectDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ <el-date-picker
+ v-model="dataForm.auditReport.auditorDate"
+ type="date"
+ placeholder="璇烽�夋嫨鏃ユ湡">
+ </el-date-picker>
+ <!--{{ dataForm.configAuditReport.auditorDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}-->
</el-form-item>
</div>
</div>
+ </div>
+ <div class="el-flex report-sc" style="height: 60px">
+ <el-form-item class="marginTopAndMarginBottom" style="width: 100%">
+ <config-uploader :lineHeight="true" busi-type="config_audit_report" model-name="dataForm" :dataForm="dataForm"
+ v-model="dataForm.files"/>
+ </el-form-item>
</div>
</el-form>
<template v-slot:footer>
@@ -130,51 +136,19 @@
export default {
data() {
return {
- // dataForm: {
- // id: '',
- // configAuditReport:{
- // code: '',
- // auditor: '',
- // auditorDate: '',
- // },
- // project: {
- // softwareIdentity: '',
- // softwareName: ''
- // },
- // problemList:[],
- // contentList:[]
- // },
dataForm: {
id: '',
- circulatOrder: {
- code: '1',
- itemAccept: '',
- itemRequire: '',
- itemOther: '',
- acceptSituation: '',
- acceptDate: '',
- calibratDetector: '',
- detectDate: '',
- detectSituation: '',
- warehouse: '',
- warehouseDate: '',
- warehouseSituation: '',
- itemIssuer: '',
- issueDate: '',
- issueSituation: '',
- remark: '',
- virusLibraryVersion:'',
- itemAcceptor:''
+ auditReport:{
+ code: '',
+ auditor: '',
+ auditorDate: '',
},
project: {
softwareIdentity: '',
- softwareName: '',
+ softwareName: ''
},
- testAgencyInfo: {
- agencyName: '',
- },
- technicalList: [],
- flowInfoDto: {}
+ problemList:[],
+ contentList:[]
}
}
},
@@ -211,7 +185,7 @@
console.log(this.dataForm, "getInfo this.dataForm")
},
addConfigAuditRow() {
- this.dataForm.technicalList.push({})
+ this.dataForm.problemList.push({})
this.$nextTick(() => {
const tableBody = this.$refs.tableConfigAuditList.$el.querySelector('.el-table__body-wrapper')
tableBody.scrollTop = tableBody.scrollHeight;
@@ -222,11 +196,12 @@
token: Cookies.get('token'),
id:this.dataForm.id
})
- let apiURL = `/configAuditReport/ConfigAuditReport/exportReport`
+ let apiURL = `/configAuditReport/ConfigAuditReport/exportConfigAudit`
window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
// 琛ㄥ崟鎻愪氦
async formSubmit() {
+ console.log(this.dataForm,"formSubmit")
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/configAuditReport/ConfigAuditReport/', this.dataForm)
if (res.success) {
await this.$tip.success()
@@ -267,4 +242,7 @@
.configAuditFormAuto .el-radio {
margin-right: 10px;
}
+.report-sc > .el-form-item > .el-form-item__content {
+ width:100%;
+}
</style>
--
Gitblit v1.9.1