From 7740e8d2fbfc70608575b22d6eded9a439ab4750 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期一, 18 十二月 2023 09:17:57 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 0ba54c4..f16a699 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -16,16 +16,18 @@
<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.checkOrder.examiner"
+ <el-input v-if="stepMarker=='csjcd_first'" v-model="dataForm.checkOrder.examiner"
placeholder="妫�鏌ヤ汉"></el-input>
+ <span v-else>{{dataForm.checkOrder.examiner}}</span>
</el-form-item>
<el-form-item class="marginTopAndMarginBottom3" label="妫�鏌ユ椂闂�" style="width: 49%">
<el-date-picker
- :disabled="stepMarker!=='csjcd_first'"
+ v-if="stepMarker=='csjcd_first'"
v-model="dataForm.checkOrder.examDate"
type="date"
placeholder="璇烽�夋嫨妫�鏌ユ椂闂�">
</el-date-picker>
+ <span v-else>{{dataForm.checkOrder.examDate}}</span>
</el-form-item>
</div>
<div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -47,12 +49,14 @@
</el-table-column>
<el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�">
<template v-slot="{ row }">
- <zt-dict v-model="row.checkResult" dict="tristate1" :radio="true"></zt-dict>
+ <zt-dict :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" dict="tristate1"
+ :radio="true"></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>
+ <el-input v-if="stepMarker=='csjcd_first'" v-model="row.remark" placeholder="澶囨敞"></el-input>
+ <span v-else>{{row.remark}}</span>
</template>
</el-table-column>
<!-- <el-table-column fixed="right" prop="files" label="涓婁紶闄勪欢" width="300" align="center">
@@ -76,8 +80,9 @@
</div>
<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"
+ <el-input v-if="stepMarker=='csjcd_first'" type="textarea"
:rows="3" v-model="dataForm.checkOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
+ <span v-else>{{dataForm.checkOrder.problemDescription}}</span>
</el-form-item>
</div>
</div>
@@ -87,8 +92,9 @@
</div>
<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"
+ <el-input v-if="stepMarker=='csjcd_wtcl'" type="textarea"
:rows="3" v-model="dataForm.checkOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
+ <span v-else>{{dataForm.checkOrder.problemProcess}}</span>
</el-form-item>
</div>
</div>
@@ -131,7 +137,8 @@
stepMarker: '',
configDetailRow: null,
subtitle: '',
- pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
+ contract: '鍚堝悓璇勫闃舵', require:'娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝'},
dataForm: {
id: '',
projectId: '',
@@ -154,19 +161,15 @@
},
methods: {
init(id, row) {
- console.log(row,'TestCheckOrder-AddOrUpdate.vue init row')
this.configDetailRow = row
if (row.checkId) {
console.log('閰嶇疆椤瑰叆搴撳鏍歌繘鏉ョ殑 TestCheckOrder-AddOrUpdate.vue init row.checkId')
if (row.checkId != -1) {
- console.log('TestCheckOrder-AddOrUpdate.vue init row.checkId!=-1')
this.dataForm.id = row.checkId
}
} else if (id) {
- console.log(this.dataForm,'浠庢鏌ュ崟杩涙潵鐨� TestCheckOrder-AddOrUpdate.vue init this.dataForm')
this.dataForm.id = id
} else {
- console.log(this.dataForm,'浠庢鏌ュ崟杩涙潵鐨� TestCheckOrder-AddOrUpdate.vue init this.dataForm')
this.dataForm.id = row.id
}
this.pageCode = row.pageCode
@@ -175,7 +178,6 @@
if (row.projectId) {
this.dataForm.projectId = row.projectId
}
- console.log(id, row, this.subtitle, '杞欢娴嬭瘯璁″垝妫�鏌ュ崟')
if (this.configDetailRow) {
if (!row.stepMarker) {
this.stepMarker = 'csjcd_first'
@@ -206,12 +208,12 @@
...this.dataForm,
...res.data
}
- console.log(this.dataForm,'this.dataForm this.dataForm')
+ console.log(this.dataForm, 'this.dataForm this.dataForm')
},
- async print(){
+ async print() {
var params = qs.stringify({
token: Cookies.get('token'),
- id:this.dataForm.id,
+ id: this.dataForm.id,
pageCode: this.pageCode
})
let apiURL = `/testCheckOrder/TestCheckOrder/exportCheckOrder`
@@ -233,7 +235,10 @@
submitType == ''
}
}
- if (submitType == 'tj' || submitType == 'bl') {
+ if (submitType == 'bl') {
+ isFlow = true
+ }
+ if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
let flowInfo = {
flowCode: 'csjcd',
stepIdMark: this.stepMarker,
@@ -247,6 +252,7 @@
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('recall', res.data, this.configDetailRow)
+ this.$emit('refreshDataList')
}
}
}
--
Gitblit v1.9.1