Merge remote-tracking branch 'remotes/origin/web-v2' into web-v2-pro

src/views/safetyCheck/equipmentConfig/index.vue

@@ -61,8 +61,8 @@
     <el-dialog :title="addDialogTitle" :visible.sync="addDialogType" @close="addDialogOff" width="780px" append-to-body class="checkItemLibrary-dialog-box"
                :close-on-click-modal="false">
       <el-form ref="addDialogForm" :model="addDialogForm" :rules="rules" label-width="120px">
-        <el-form-item label="检查内容:" prop="checkLevel">
-          <el-select  v-model="addDialogForm.joinHazardReid" placeholder="请选择检查项" :disabled="isDetail" style="width:548px;">
+        <el-form-item label="检查内容:" prop="joinHazardReid">
+          <el-select  v-model="addDialogForm.joinHazardReid" clearable placeholder="请选择检查项" :disabled="isDetail" style="width:548px;">
             <el-option
               v-for="item in materialTypeList"
               :key="item.id"
@@ -168,7 +168,7 @@ export default {
           { required: true, message: "请选择", trigger: "change" },
           { required: true, message: "请选择", validator: this.spaceJudgment, trigger: "change" },
         ],
-        name: [
+        joinHazardReid: [
           { required: true, message: "请输入检查项目内容", trigger: "change" },
           { required: true, message: "请输入检查项目内容", validator: this.spaceJudgment, trigger: "change" },
         ],