From 1cc4eb09ce38f1f0db114b7d3570f92ceaf1d470 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 06 四月 2022 08:51:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/safetyproduction/review.vue | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/views/safetyproduction/review.vue b/src/views/safetyproduction/review.vue
index 80d9bdc..0af1751 100644
--- a/src/views/safetyproduction/review.vue
+++ b/src/views/safetyproduction/review.vue
@@ -201,7 +201,7 @@
<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,7 @@
dialogVisible: false,
id: "",
form: {},
- list: [],
+ list: {},
};
},
created() {
@@ -251,6 +251,7 @@
},
modItem() {
if(this.list.safetyInspectionItemResult!=null){
+ console.log(this.list)
safetySelfInspectionModItemInfo(this.list).then((res) => {
if (res.data.code == 200) {
this.$notify({
@@ -285,7 +286,21 @@
},
handleClick(data) {
this.dialogVisible = true;
- this.form = data;
+ // this.form = data;
+ this.form=JSON.parse(JSON.stringify(data));
+ },
+ addC(){
+ if(this.form.point<=50){
+ 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("扣分不得超过总分50")
+ }
+ this.dialogVisible = false;
},
lost() {
this.dialogVisible = false;
@@ -325,4 +340,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2