From 04031b86d12c54dad59ebca8819f03479e87924f Mon Sep 17 00:00:00 2001 From: zhoucong <123456> Date: 星期五, 22 四月 2022 15:25:56 +0800 Subject: [PATCH] fix --- src/views/safetyproduction/review.vue | 82 +++++++++++++++++++++++++++++----------- 1 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/views/safetyproduction/review.vue b/src/views/safetyproduction/review.vue index 277f1b7..ddf24d8 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 ? false : true + list.safetyInspectionItemResult == 1 " > <el-row style="padding: 15px 1%"> @@ -198,10 +198,10 @@ </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> + <el-input :disabled="true" v-model="form.name"></el-input> </el-form-item> <el-form-item label="扣分值"> <el-input v-model="form.point"></el-input> @@ -215,7 +215,7 @@ class="dialog-footer" style="text-align: center; display: block" > - <el-button type="primary" class="btns" @click="dialogVisible = false" + <el-button type="primary" class="btns" @click="addC" >确 定</el-button > <el-button @click="lost()">取 消</el-button> @@ -236,7 +236,9 @@ dialogVisible: false, id: "", form: {}, - list: [], + list: {}, + point:"", + pointDel:"" }; }, created() { @@ -247,25 +249,44 @@ itemInfo(id) { safetySelfInspectionItemInfo({id:id}).then((res) => { this.list = res.data.result; + this.point=res.data.result.point + this.pointDel=res.data.result.point }); }, modItem() { - safetySelfInspectionModItemInfo(this.list).then((res) => { - if (res.data.code == 200) { - this.$notify({ - type: "success", - duration: 2000, - message: "提交成功", - title: "成功", - }); - this.$router.push({ - path: "/gojudging", - query:{ - id:this.id + if(this.list.safetyInspectionItemResult!=null){ + let pointFlag = this.pointDel + for(var i=0;i<this.list.selfDeductionList.length;i++){ + pointFlag=pointFlag-this.list.selfDeductionList[i].point } - }); - } - }); + if(pointFlag>=0){ + safetySelfInspectionModItemInfo(this.list).then((res) => { + if (res.data.code == 200) { + this.$notify({ + type: "success", + duration: 2000, + message: "提交成功", + title: "成功", + }); + this.$router.push({ + path: "/gojudging", + query: { + id: this.id + } + }); + } + }) + }else{ + alert(`扣分不得超过总分${this.point}`) + } + } + else{ + this.$confirm('是否否决项未选择','提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + } }, back() { this.$router.push({ @@ -277,8 +298,21 @@ }, handleClick(data) { this.dialogVisible = true; - this.form = data; - console.log(data); + // this.form = data; + this.form=JSON.parse(JSON.stringify(data)); + }, + addC(){ + if(this.form.point<=this.point){ + for(let i = 0;i<this.list.selfDeductionList.length;i++){ + if (this.form.safetyInspectionItemDeductionId==this.list.selfDeductionList[i].safetyInspectionItemDeductionId){ + this.list.selfDeductionList[i].point = this.form.point + this.list.selfDeductionList[i].remark = this.form.remark + } + } + }else{ + alert(`扣分不得超过总分${this.point}`) + } + this.dialogVisible = false; }, lost() { this.dialogVisible = false; @@ -310,6 +344,8 @@ width: 100%; background-color: white; border-radius: 5px; + height: 850px; + overflow-y:overlay; } .box-right-content { padding: 15px 0; @@ -318,4 +354,4 @@ background-color: #034ea2; border: 1px solid #034ea2; } -</style> \ No newline at end of file +</style> -- Gitblit v1.9.2