From efc529af784bf35daf6e8d1d6108467cdcf8f663 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 07 十二月 2023 16:25:39 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index c08ac2d..f5a4aa4 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -4,7 +4,7 @@
label-width="120px" class="testCheckFormAuto">
<div>
<el-form-item label-width="60px" label="缂栧彿:" style="width:100%;margin-bottom: -5px">
- <span>{{dataForm.testCheckOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
+ <span>{{dataForm.checkOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -16,12 +16,13 @@
<el-input v-model="dataForm.project.softwareName" placeholder="椤圭洰鍚嶇О"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ヤ汉" style="width: 49%">
- <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.testCheckOrder.examiner" placeholder="妫�鏌ヤ汉"></el-input>
+ <el-input :disabled="stepMarker!=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
+ placeholder="妫�鏌ヤ汉"></el-input>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
<el-date-picker
:disabled="stepMarker!=='csjcd_first'"
- v-model="dataForm.testCheckOrder.examDate"
+ v-model="dataForm.checkOrder.examDate"
type="date"
placeholder="璇烽�夋嫨妫�鏌ユ椂闂�">
</el-date-picker>
@@ -40,9 +41,9 @@
</template>
</el-table-column>
<el-table-column prop="checkContent" min-width="180" label="涓昏妫�鏌ュ唴瀹�">
-<!-- <template v-slot="{ row }">-->
-<!-- <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>-->
-<!-- </template>-->
+ <!-- <template v-slot="{ row }">-->
+ <!-- <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>-->
+ <!-- </template>-->
</el-table-column>
<el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
@@ -76,7 +77,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.problemDescription" placeholder="闂鎻忚堪..."></el-input>
+ :rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
</el-form-item>
</div>
</div>
@@ -87,7 +88,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.problemProcess" placeholder="闂澶勭悊..."></el-input>
+ :rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
</el-form-item>
</div>
</div>
@@ -97,7 +98,7 @@
</div>
<div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
<el-form-item style="width: 100%;padding-left:20px;margin:0;">
- <span>{{dataForm.testCheckOrder.processor}}</span>
+ <span>{{dataForm.checkOrder.processor}}</span>
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -105,7 +106,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">
- <span>{{dataForm.testCheckOrder.verifier}}</span>
+ <span>{{dataForm.checkOrder.verifier}}</span>
</el-form-item>
</div>
</div>
@@ -132,7 +133,7 @@
softwareIdentity: '',
softwareName: '',
},
- testCheckOrder: {
+ checkOrder: {
code: '',
examiner: '',
examDate: '',
@@ -149,7 +150,9 @@
init(id, row) {
this.configDetailRow = row
if (row.checkId) {
- this.dataForm.id = row.checkId
+ if (row.checkId != -1) {
+ this.dataForm.id = row.checkId
+ }
} else if (id) {
this.dataForm.id = id
} else {
@@ -196,8 +199,8 @@
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
+ let isFlow = false
if (submitType == 'tj') {
- let isFlow = false
for (let item of this.dataForm.checkOrderList) {
if (!item.checkResult) {
this.$alert("鏈夋湭濉啓鐨勬暟鎹�")
@@ -210,7 +213,7 @@
submitType == ''
}
}
- if (submitType == 'tj' || submitType == 'bl' && isFlow) {
+ if (submitType == 'tj' || submitType == 'bl') {
let flowInfo = {
flowCode: 'csjcd',
stepIdMark: this.stepMarker,
@@ -218,7 +221,7 @@
}
this.dataForm.flowInfoDto = flowInfo;
}
-
+ console.log(this.dataForm, "this.dataForm formSubmit(submitType)")
let res = await this.$http[!this.dataForm.id ? 'post' : 'put']('/testCheckOrder/TestCheckOrder/', this.dataForm)
if (res.success) {
await this.$tip.success()
--
Gitblit v1.9.1