Browse Source

Merge remote-tracking branch 'origin/AIControlV1.3.1' into test

zhouna 5 years ago
parent
commit
480727e886

+ 2 - 2
src/components/qualityControl/AutoTestList.vue

@@ -178,10 +178,10 @@
           if(res.data.code==="0"){
             //this.loading=false;
             loadingInstance.close();
-            this.warning(res.data.msg||'操作成功','success');
+            this.warning('操作成功','success');
             this.getDataList();
           }else{
-            this.warning("自动化测试失败");
+            this.warning(res.data.msg||"自动化测试失败");
           }
         });
       },

+ 1 - 1
src/components/qualityControl/StandardRecord.vue

@@ -15,7 +15,7 @@
                 </el-form-item>
                 <el-form-item label="科室:">
                      <el-select size="mini" v-model.trim="filter.deptId" @change="getValue"  placeholder="请选择科室" clearable>
-                        <el-option v-for="item in moduleList" :label="item.deptName" :value="String(item.deptId)" :key="String(item.deptId)" ></el-option>
+                        <el-option v-for="item in moduleList" :label="item.deptName" :value="Number(item.deptId)" :key="Number(item.deptId)" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="出院日期:">