From a49ae63a6f96d10b8ec9fa479a0c28c5df4537e7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 31 三月 2022 16:45:59 +0800
Subject: [PATCH] fix
---
src/views/safetyproduction/feature.vue | 121 +++++++++++++++++++++++++++-------------
1 files changed, 82 insertions(+), 39 deletions(-)
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index b9212c3..a435c47 100644
--- a/src/views/safetyproduction/feature.vue
+++ b/src/views/safetyproduction/feature.vue
@@ -30,11 +30,9 @@
<span v-if="scope.row.type == 1">B级要素</span>
</template>
</el-table-column>
- <el-table-column label="父要素" align="center">
- <template slot-scope="scope">
- <span v-if="scope.row.parentId == 0">法律法规和标准</span>
- <span v-if="scope.row.parentId == 1">机构和职责</span>
- </template>
+ <el-table-column label="父要素" prop="parentName" align="center">
+ </el-table-column>
+ <el-table-column label="得分" prop="point" align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
</el-table-column>
@@ -76,6 +74,7 @@
<el-dialog
:title="title"
:visible.sync="dialogVisible"
+ :close-on-click-modal="false"
width="40%"
>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">
@@ -86,11 +85,12 @@
</el-form-item>
</el-col>
<el-col :span="11" :offset="2">
- <el-form-item label="级别" prop="type">
+ <el-form-item label="级别" prop="type">
<el-select
v-model="form.type"
placeholder="请选择"
style="width: 100%"
+ :disabled="title=='编辑'?true:false"
>
<el-option
v-for="item in options"
@@ -103,23 +103,29 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-if="form.type==0?false:true">
<el-col :span="11">
- <el-form-item label="父要素" prop="parentId">
+ <el-form-item label="父要素" prop="parentId">
<el-select
v-model="form.parentId"
placeholder="请选择"
style="width: 100%"
+ :disabled="title=='编辑'?true:false"
>
<el-option
v-for="item in parent"
:key="item.value"
- :label="item.label"
- :value="item.value"
+ :label="item.name"
+ :value="item.id"
>
</el-option>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="11" :offset="2">
+ <el-form-item label="得分" prop="point">
+ <el-input v-model.number="form.point"></el-input>
+ </el-form-item>
</el-col>
</el-row>
<el-form-item label="备注">
@@ -135,7 +141,7 @@
<el-button type="primary" class="btns" @click="AddelementManagement()"
>确 定</el-button
>
- <el-button @click="dialogVisible = false">取 消</el-button>
+ <el-button @click="cancel()">取 消</el-button>
</span>
</el-dialog>
</div>
@@ -146,6 +152,7 @@
elementManagementAdd,
elementManagementMod,
elementManagementDel,
+ getParentElement
} from "@/api/elementManagement.js";
export default {
data() {
@@ -156,6 +163,7 @@
name: "",
type: "",
parentId: "",
+ point:"",
remark: "",
},
pageSize: 10,
@@ -179,28 +187,19 @@
label: "B级要素",
},
],
- parent: [
- {
- value: 0,
- label: "法律法规和标准",
- },
- {
- value: 1,
- label: "机构和职责",
- },
- ],
+ parent: [],
rules: {
name: [
- { required: true, message: "预案名称不能为空", trigger: "change" },
+ { required: true, message: "要素名称不能为空", trigger: "change" },
],
type: [
- { required: true, message: "预案名称不能为空", trigger: "change" },
+ { required: true, message: "级别不能为空", trigger: "change" },
],
parentId: [
- { required: true, message: "预案名称不能为空", trigger: "change" },
+ { required: true, message: "父要素不能为空", trigger: "change" },
],
- remark: [
- { required: true, message: "责任人不能为空", trigger: "blur" },
+ point: [
+ { required: true, message: "得分不能为空", trigger: "change" },
],
},
};
@@ -224,6 +223,10 @@
this.$nextTick(() => {
this.$refs["form"].clearValidate();
});
+ getParentElement().then(res=>{
+ // console.log('父类：',res)
+ this.parent=res.data.result
+ })
if (type == "新增") {
this.title = "新增";
this.form = {
@@ -241,6 +244,8 @@
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.title == "新增") {
+ if(this.form.type==0){
+ this.form.parentId=''
elementManagementAdd(this.form).then((res) => {
if (res.data.code == 200) {
this.dialogVisible = false;
@@ -258,6 +263,25 @@
});
}
});
+ }else{
+ elementManagementAdd(this.form).then((res) => {
+ if (res.data.code == 200) {
+ this.dialogVisible = false;
+ this.elementManagementL();
+ this.$notify({
+ type: "success",
+ duration: 2000,
+ message: "新增成功",
+ title: "成功",
+ });
+ } else {
+ this.$message({
+ type: "warning",
+ message: res.data.message,
+ });
+ }
+ });
+ }
} else {
elementManagementMod(this.form).then((res) => {
if (res.data.code == 200) {
@@ -270,7 +294,7 @@
title: "成功",
});
} else {
- his.$message({
+ this.$message({
type: "warning",
message: res.data.message,
});
@@ -281,18 +305,37 @@
});
},
deleteById(val) {
- elementManagementDel({id:val}).then((res) => {
- if (res.data.code == 200) {
- this.elementManagementL();
- this.$notify({
- title: "成功",
- message: "删除成功",
- type: "success",
- duration: 2000,
- });
- }
- });
+ this.$confirm('确认删除吗','提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(()=>{
+ elementManagementDel({id:val}).then((res) => {
+ if (res.data.code == 200) {
+ this.elementManagementL();
+ this.$notify({
+ title: "成功",
+ message: "删除成功",
+ type: "success",
+ duration: 2000,
+ });
+ }else {
+ this.$message({
+ type: "warning",
+ // message: res.data.message,
+ message: "当前A级要素仍然有已绑定的B级要素,无法删除"
+ });
+ }
+ });
+ })
+ .catch(error =>{
+ });
},
+ cancel(){
+ this.elementManagementL();
+ this.dialogVisible = false;
+ },
find(){
this.elementManagementL();
},
@@ -312,4 +355,4 @@
background-color: #034ea2;
border: 1px solid #034ea2;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2