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 | 76 ++++++++++++++++++++++++++-----------
1 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 5fe0cab..f16a699 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,20 +16,23 @@
<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 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-model="dataForm.testCheckOrder.examDate"
+ 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);">
<div style="padding-left:5px;padding-right:5px;">
- <div style="padding: 5px">{{subtitle}}</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"
@@ -40,18 +43,20 @@
</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 }">
- <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">
@@ -75,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"
- :rows="3" v-model="dataForm.testCheckOrder.problemDescription" placeholder="闂鎻忚堪..."></el-input>
+ <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>
@@ -86,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"
- :rows="3" v-model="dataForm.testCheckOrder.problemProcess" placeholder="闂澶勭悊..."></el-input>
+ <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>
@@ -97,7 +104,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 +112,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>
@@ -114,17 +121,24 @@
<template v-slot:footer>
<el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
</template>
+ <template v-slot:footer>
+ <el-button v-if="dataForm.disabled" type="primary" @click="print()">鎵撳嵃</el-button>
+ </template>
</zt-dialog>
</template>
<script>
+ import qs from "qs";
+ import Cookies from "js-cookie";
+
export default {
data() {
return {
stepMarker: '',
configDetailRow: null,
subtitle: '',
- pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
+ pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
+ contract: '鍚堝悓璇勫闃舵', require:'娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝'},
dataForm: {
id: '',
projectId: '',
@@ -132,7 +146,7 @@
softwareIdentity: '',
softwareName: '',
},
- testCheckOrder: {
+ checkOrder: {
code: '',
examiner: '',
examDate: '',
@@ -149,7 +163,10 @@
init(id, row) {
this.configDetailRow = row
if (row.checkId) {
- this.dataForm.id = row.checkId
+ console.log('閰嶇疆椤瑰叆搴撳鏍歌繘鏉ョ殑 TestCheckOrder-AddOrUpdate.vue init row.checkId')
+ if (row.checkId != -1) {
+ this.dataForm.id = row.checkId
+ }
} else if (id) {
this.dataForm.id = id
} else {
@@ -161,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'
@@ -192,11 +208,21 @@
...this.dataForm,
...res.data
}
+ console.log(this.dataForm, 'this.dataForm this.dataForm')
+ },
+ async print() {
+ var params = qs.stringify({
+ token: Cookies.get('token'),
+ id: this.dataForm.id,
+ pageCode: this.pageCode
+ })
+ let apiURL = `/testCheckOrder/TestCheckOrder/exportCheckOrder`
+ window.location.href = `${window.SITE_CONFIG['apiURL']}${apiURL}?${params}`
},
// 琛ㄥ崟鎻愪氦
async formSubmit(submitType) {
+ let isFlow = false
if (submitType == 'tj') {
- let isFlow = false
for (let item of this.dataForm.checkOrderList) {
if (!item.checkResult) {
this.$alert("鏈夋湭濉啓鐨勬暟鎹�")
@@ -209,7 +235,10 @@
submitType == ''
}
}
- if (submitType == 'tj' || submitType == 'bl' && isFlow) {
+ if (submitType == 'bl') {
+ isFlow = true
+ }
+ if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
let flowInfo = {
flowCode: 'csjcd',
stepIdMark: this.stepMarker,
@@ -217,12 +246,13 @@
}
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()
this.$refs.dialog.close()
this.$emit('recall', res.data, this.configDetailRow)
+ this.$emit('refreshDataList')
}
}
}
--
Gitblit v1.9.1