瀏覽代碼

Merge branch 'web-v2' of http://192.168.1.43:3000/git/sass-lab-web into web-v2

dedsudiyu 2 年之前
父節點
當前提交
56af290f2c
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

+ 3 - 4
src/views/comprehensive/laboratoryManagement/subject/addSubject.vue

@@ -87,7 +87,7 @@
       </el-form-item>
       <el-form-item label="准入设备"  class="form-item">
         <el-select v-model="form.hardwareType" placeholder="请选择整改类型" style="width:230px;">
-          <el-option label="无"  :value=null />
+          <el-option label="无"  :value="0" />
           <el-option label="海康智能门禁" :value="1" />
           <el-option label="电子信息牌" :value="2" />
         </el-select>
@@ -213,7 +213,7 @@
           safetyInfoList:[],
           form:{
             details:"",
-            hardwareType:null,
+            hardwareType:0,
           },
           // 表单校验
           rules: {
@@ -287,10 +287,9 @@
           this.$set(this.form,'buildId',this.subjectData.buildId)
           this.$set(this.form,'floorId',this.subjectData.floorId)
           this.$set(this.form,'room',this.subjectData.room)
-          this.$set(this.form,'hardwareType',this.subjectData.hardwareType)
+          this.$set(this.form,'hardwareType',this.subjectData.hardwareType==null?0:this.subjectData.hardwareType)
           this.$set(this.form,'details',this.subjectData.details)
           this.$refs.UEditor.text=unescape(this.subjectData.details)
-          // this.$set(this.form,'layoutId',this.subjectData.layoutId)
           this.$set(this.form,'moldId',this.subjectData.moldId)
           if(this.subjectData.adminId){
             this.$set(this.form,'adminId',this.subjectData.adminId)