Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

shj

2022-03-31 1fce0b643b1b8bd5d443efb3ff0074caab3c5dba

Merge branch 'shf' of https://sinanoaq.cn:8888/r/ztqt into shf

 src/views/contingencyplan/index.vue

@@ -126,9 +126,6 @@
        name: [
          { required: true, message: "预案名称不能为空", trigger: "change" },
        ],
        // remark: [
        //   { required: true, message: "备注不能为空", trigger: "blur" },
        // ],
      },
    };
  },
@@ -176,12 +173,10 @@
      });
      if (type === "新增") {
        this.title = "新增";
        this.form = {
          name: "",
          fileType: 0,
          fileList: [],
          remark: "",
        };
        this.form = {};
        this.fileUrl="";
        this.fileName="";
        this.fileList=[]
      } else {
        this.title = "编辑";
        this.form = value;
@@ -200,11 +195,15 @@
                this.form.fileList=this.fileList
            }
            if (this.form.fileType==1){
                let fileList = []
                if (this.fileUrl!=""){
                let file={
                    fileUrl:this.fileUrl,
                    fileName:this.fileName
                }
                this.form.fileList=[file]
                    fileList.push(file)
                }
                this.form.fileList=fileList
            }
          if (this.title === "新增") {
            emergencyPlanAdd(this.form).then((res) => {
@@ -217,6 +216,8 @@
                  message: "新增成功",
                  title: "成功",
                });
              }else{
                  this.$message.error(res.data.message);
              }
            });
          }
@@ -231,6 +232,8 @@
                message: "编辑成功",
                title: "成功",
              });
            }else{
                this.$message.error(res.data.message);
            }
          });
        }

 src/views/safetyproduction/feature.vue

@@ -110,6 +110,7 @@
                v-model="form.parentId"
                placeholder="请选择"
                style="width: 100%"
                :disabled="title=='编辑'?true:false"
              >
                <el-option
                  v-for="item in parent"