From fcc1ea2bf3ce3efe1f927bd087e4cd6cf2116c32 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Wed, 30 Mar 2022 16:21:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master
---
src/views/safetyproduction/feature.vue | 74 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 26 deletions(-)
diff --git a/src/views/safetyproduction/feature.vue b/src/views/safetyproduction/feature.vue
index b9212c3..8ab28c8 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>
@@ -86,11 +84,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,9 +102,9 @@
</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="请选择"
@@ -114,12 +113,17 @@
<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="备注">
@@ -146,6 +150,7 @@
elementManagementAdd,
elementManagementMod,
elementManagementDel,
+ getParentElement
} from "@/api/elementManagement.js";
export default {
data() {
@@ -156,6 +161,7 @@
name: "",
type: "",
parentId: "",
+ point:"",
remark: "",
},
pageSize: 10,
@@ -179,28 +185,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 +221,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 +242,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 +261,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 +292,7 @@
title: "成功",
});
} else {
- his.$message({
+ this.$message({
type: "warning",
message: res.data.message,
});
--
Gitblit v1.9.2