From 1772fc5e211f9e9e0ab4cdc6c29b436aac178c2a Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 23 二月 2024 12:19:55 +0800
Subject: [PATCH] 修改
---
web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue | 314 ++++++++++++++++++++++++++--------------------------
1 files changed, 156 insertions(+), 158 deletions(-)
diff --git a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
index 0acd047..5d6f39e 100644
--- a/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue
@@ -47,7 +47,7 @@
<!-- <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 :disabled="stepMarker!=='csjcd_first'" v-model="row.checkResult" :dict="getDict"
:radio="true"></zt-dict>
@@ -121,193 +121,191 @@
<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";
+ import qs from "qs";
+ import Cookies from "js-cookie";
-export default {
- data() {
- return {
- pageCode: '',
- stepMarker: '',
- configDetailRow: null,
- subtitle: '',
- pageName: {
- plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
- contract: '鍚堝悓璇勫闃舵', require: '娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝'
- },
- dataForm: {
- id: '',
- projectId: '',
- project: {
- softwareIdentity: '',
- softwareName: '',
+ export default {
+ data() {
+ return {
+ pageCode: '',
+ stepMarker: '',
+ configDetailRow: null,
+ subtitle: '',
+ pageName: {
+ plan: '杞欢娴嬭瘯璁″垝', explain: '杞欢娴嬭瘯璇存槑', record: '杞欢娴嬭瘯璁板綍', report: '杞欢娴嬭瘯鎶ュ憡',
+ contract: '鍚堝悓璇勫闃舵', require: '娴嬭瘯闇�姹傚垎鏋愪笌绛栧垝闃舵', execute: '娴嬭瘯璁捐涓庡疄鐜般�佹墽琛岄樁娈�', summary: '娴嬭瘯鎬荤粨闃舵'
},
- checkOrder: {
- code: '',
- examiner: '',
- examDate: '',
- problemDescription: '',
- problemProcess: '',
- processor: '',
- verifier: '',
- },
- checkOrderList: []
+ dataForm: {
+ id: '',
+ projectId: '',
+ project: {
+ softwareIdentity: '',
+ softwareName: '',
+ },
+ checkOrder: {
+ code: '',
+ examiner: '',
+ examDate: '',
+ problemDescription: '',
+ problemProcess: '',
+ processor: '',
+ verifier: '',
+ },
+ checkOrderList: []
+ }
}
- }
- },
- computed: {
- getDict() {
- if (this.pageCode && (this.pageCode === 'plan' || this.pageCode === 'explain' || this.pageCode === 'record' || this.pageCode === 'report')) {
+ },
+ 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) {
- this.configDetailRow = row
- if (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 {
- this.dataForm.id = row.id
- }
- this.pageCode = row.pageCode
- this.subtitle = this.pageName[this.pageCode]
-
- if (row.projectId) {
- this.dataForm.projectId = row.projectId
- }
- if (this.configDetailRow) {
- if (!row.stepMarker) {
- this.stepMarker = 'csjcd_first'
- this.title = '鍙戣捣娴嬭瘯妫�鏌ュ崟'
+ },
+ methods: {
+ init(id, row) {
+ this.configDetailRow = row
+ if (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 {
- this.title = row.stepName
- this.stepMarker = row.stepMarker
+ this.dataForm.id = row.id
}
- }
- //this.dataForm.disabled
- this.getInfo()
+ this.pageCode = row.pageCode
+ this.subtitle = this.pageName[this.pageCode]
- //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
- }
- console.log(this.pageCode, "getInfo pageCode")
- let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
- this.dataForm = {
- ...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') {
- for (let item of this.dataForm.checkOrderList) {
- if (!item.checkResult) {
- this.$alert("鏈夋湭濉啓鐨勬暟鎹�")
- return
- } else if (item.checkResult == "2") {
- isFlow = true
+ if (row.projectId) {
+ this.dataForm.projectId = row.projectId
+ }
+ if (this.configDetailRow) {
+ if (!row.stepMarker) {
+ this.stepMarker = 'csjcd_first'
+ this.title = '鍙戣捣娴嬭瘯妫�鏌ュ崟'
+ } else {
+ this.title = row.stepName
+ this.stepMarker = row.stepMarker
}
}
- if (submitType == 'tj' && !isFlow) {
- submitType == ''
+ //this.dataForm.disabled
+ this.getInfo()
+
+ //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
}
- }
- if (submitType == 'bl') {
- isFlow = true
- }
- if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
- let flowInfo = {
- flowCode: 'csjcd',
- stepIdMark: this.stepMarker,
- submitType: submitType
+ 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
}
- 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')
+ 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') {
+ for (let item of this.dataForm.checkOrderList) {
+ if (!item.checkResult) {
+ this.$alert("鏈夋湭濉啓鐨勬暟鎹�")
+ return
+ } else if (item.checkResult == "2") {
+ isFlow = true
+ }
+ }
+ if (submitType == 'tj' && !isFlow) {
+ submitType == ''
+ }
+ }
+ if (submitType == 'bl') {
+ isFlow = true
+ }
+ if (submitType == 'tj' && isFlow || submitType == 'bl' && isFlow) {
+ let flowInfo = {
+ flowCode: 'csjcd',
+ stepIdMark: this.stepMarker,
+ submitType: submitType
+ }
+ 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')
+ }
}
}
}
-}
</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 .acceptDate > .el-form-item > .el-form-item__content {
+ width: 100%;
+ }
-.testCheckFormAuto .acceptDate1 > .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 .marginTopAndMarginBottom {
+ margin-top: 10px !important;
+ margin-bottom: 0 !important;
+ }
-.testCheckFormAuto .marginTopAndMarginBottom2 {
- margin-top: -10px !important;
- margin-bottom: 10px !important;
-}
+ .testCheckFormAuto .marginTopAndMarginBottom2 {
+ margin-top: -10px !important;
+ margin-bottom: 10px !important;
+ }
-.testCheckFormAuto .marginTopAndMarginBottom3 {
- margin-top: 0 !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;
-}
+ .testCheckFormAuto .acceptDate > .el-form-item > .el-form-item__content {
+ line-height: 78px;
+ }
-.testCheckContentWidth > .el-form-item > .el-form-item__content {
- width: calc(100% - 120px);
-}
+ .testCheckContentWidth > .el-form-item > .el-form-item__content {
+ width: calc(100% - 120px);
+ }
-.testCheckFormAuto .el-radio {
- margin-right: 10px;
-}
+ .testCheckFormAuto .el-radio {
+ margin-right: 10px;
+ }
</style>
--
Gitblit v1.9.1