From ebab2501fa485c8d62d90b67aabe6f6d81847636 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 06 十二月 2023 16:12:05 +0800
Subject: [PATCH] 6
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 141 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 65 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index b4aa87c..beb4740 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>
@@ -24,7 +24,7 @@
</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.checkOrderList"
@@ -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>
@@ -99,7 +99,7 @@
楠岃瘉浜�
</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-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>
@@ -114,22 +114,19 @@
<script>
export default {
- props:{
- pageCode: {
- type: String,
- default: ''
- },
- },
data() {
return {
+ configDetailRow: null,
+ subtitle: '',
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
dataForm: {
id: '',
projectId: '',
- project:{
- softwareIdentity:'',
- softwareName:'',
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
},
- testCheckOrder:{
+ testCheckOrder: {
code: '',
examiner: '',
examDate: '',
@@ -138,33 +135,43 @@
processor: '',
verifier: '',
},
- checkOrderList:{}
+ 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 params = {
checkId: this.dataForm.id,
projectId: this.dataForm.projectId,
- pageCode:this.pageCode
+ pageCode: this.pageCode
}
+ console.log(this.pageCode, "getInfo pageCode")
let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
this.dataForm = {
...this.dataForm,
@@ -177,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