From 1fce0b643b1b8bd5d443efb3ff0074caab3c5dba Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期四, 31 三月 2022 17:07:56 +0800 Subject: [PATCH] Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf --- src/views/safetyproduction/review.vue | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/views/safetyproduction/review.vue b/src/views/safetyproduction/review.vue index 372143b..80d9bdc 100644 --- a/src/views/safetyproduction/review.vue +++ b/src/views/safetyproduction/review.vue @@ -132,7 +132,7 @@ </el-row> <div v-if=" - list.safetyInspectionItemResult == '0' || null ? false : true + list.safetyInspectionItemResult == 1 " > <el-row style="padding: 15px 1%"> @@ -198,7 +198,7 @@ </div> </div> - <el-dialog title="扣分详情" :visible.sync="dialogVisible" width="30%"> + <el-dialog title="扣分详情" :visible.sync="dialogVisible" :close-on-click-modal="false" width="30%"> <el-form ref="form" :model="form" label-width="54px"> <el-form-item label="说明"> <el-input disabled="true" v-model="form.name"></el-input> @@ -240,16 +240,17 @@ }; }, created() { - this.id = this.$route.query; - this.itemInfo(this.$route.query); + this.id = this.$route.query.id; + this.itemInfo(this.$route.query.idC); }, methods: { itemInfo(id) { - safetySelfInspectionItemInfo(id).then((res) => { + safetySelfInspectionItemInfo({id:id}).then((res) => { this.list = res.data.result; }); }, modItem() { + if(this.list.safetyInspectionItemResult!=null){ safetySelfInspectionModItemInfo(this.list).then((res) => { if (res.data.code == 200) { this.$notify({ @@ -260,19 +261,31 @@ }); this.$router.push({ path: "/gojudging", + query:{ + id:this.id + } }); } }); + }else{ + this.$confirm('是否否决项未选择','提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + } }, back() { this.$router.push({ path: "/gojudging", + query:{ + id:this.id + } }); }, handleClick(data) { this.dialogVisible = true; this.form = data; - console.log(data); }, lost() { this.dialogVisible = false; -- Gitblit v1.9.2