From d813339081185b17cfbb6f60e0b3c09e75441e49 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 11 五月 2022 17:26:33 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/safetyproduction/review.vue | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/views/safetyproduction/review.vue b/src/views/safetyproduction/review.vue
index 4a471fb..f46fa78 100644
--- a/src/views/safetyproduction/review.vue
+++ b/src/views/safetyproduction/review.vue
@@ -124,7 +124,7 @@
<el-col :span="24">
<el-form-item label="是否否决项">
<el-radio-group v-model="list.safetyInspectionItemResult">
- <el-radio :label="0">是</el-radio>
+ <el-radio :label="0" v-if="list.veto!='' && list.veto!=null">是</el-radio>
<el-radio :label="1">否</el-radio>
</el-radio-group>
</el-form-item></el-col
@@ -253,41 +253,41 @@
this.pointDel=res.data.result.point
});
},
- modItem() {
- if(this.list.safetyInspectionItemResult!=null){
- console.log(this.list)
- for(var i=0;i<this.list.selfDeductionList.length;i++){
- this.pointDel=this.pointDel-this.list.selfDeductionList[i].point
- }
-
- safetySelfInspectionModItemInfo(this.list).then((res) => {
- if (res.data.code == 200) {
- if(this.pointDel>=0){
- 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'
- })
- }
- },
+ modItem() {
+ 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({
path: "/gojudging",
@@ -301,19 +301,19 @@
// 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.id==this.list.selfDeductionList[i].id){
- this.list.selfDeductionList[i].point = this.form.point
- this.list.selfDeductionList[i].remark = this.form.remark
- }
- }
- }else{
- alert(`扣分不得超过总分${this.point}`)
+ 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
+ }
}
- this.dialogVisible = false;
- },
+ }else{
+ alert(`扣分不得超过总分${this.point}`)
+ }
+ this.dialogVisible = false;
+ },
lost() {
this.dialogVisible = false;
this.itemInfo(this.id);
--
Gitblit v1.9.2