From cb62861019a030081b3bcac3406aa7445060a344 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 02 一月 2024 09:15:40 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index c2b6344..5d6f39e 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.checkOrder.code || '缂栧彿鑷姩鐢熸垚'}}</span>
+ <span>{{ dataForm.checkOrder.code || '缂栧彿鑷姩鐢熸垚' }}</span>
</el-form-item>
</div>
<div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
@@ -16,21 +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.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);">
<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"
@@ -45,14 +47,16 @@
<!-- <el-input v-model="row.checkContent" placeholder="涓昏妫�鏌ュ唴瀹�"></el-input>-->
<!-- </template>-->
</el-table-column>
- <el-table-column prop="checkResult" align="center" width="180" label="妫�鏌ョ粨鏋�">
+ <el-table-column prop="checkResult" align="center" width="200" 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="getDict"
+ :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>
@@ -98,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.checkOrder.processor}}</span>
+ <span>{{ dataForm.checkOrder.processor }}</span>
</el-form-item>
</div>
<div style="width: 84px;text-align: center;font-weight: 600">
@@ -106,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.checkOrder.verifier}}</span>
+ <span>{{ dataForm.checkOrder.verifier }}</span>
</el-form-item>
</div>
</div>
@@ -119,13 +125,20 @@
</template>
<script>
+ import qs from "qs";
+ import Cookies from "js-cookie";
+
export default {
data() {
return {
+ pageCode: '',
stepMarker: '',
configDetailRow: null,
subtitle: '',
- pageName: {plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡'},
+ pageName: {
+ plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
+ contract: '鍚堝悓璇勫闃舵', require: '娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝闃舵', execute: '娴嬭瘯璁捐涓庡疄鐜般�佹墽琛岄樁娈�', summary: '娴嬭瘯鎬荤粨闃舵'
+ },
dataForm: {
id: '',
projectId: '',
@@ -146,21 +159,26 @@
}
}
},
+ computed: {
+ getDict() {
+ if (this.pageCode && (this.pageCode === 'plan' || this.pageCode === 'explain' || this.pageCode === 'record' || this.pageCode === 'report')) {
+ return 'tristate1'
+ } else {
+ return 'tristate2'
+ }
+ }
+ },
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
@@ -169,7 +187,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'
@@ -196,11 +213,21 @@
}
console.log(this.pageCode, "getInfo pageCode")
let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
+ this.pageCode = res.data.checkOrder.pageCode
this.dataForm = {
...this.dataForm,
...res.data
}
- console.log(this.dataForm,'this.dataForm this.dataForm')
+ 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) {
@@ -218,7 +245,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,
@@ -232,6 +262,7 @@
await this.$tip.success()
this.$refs.dialog.close()
this.$emit('recall', res.data, this.configDetailRow)
+ this.$emit('refreshDataList')
}
}
}
--
Gitblit v1.9.1