Browse Source

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

zhouna 5 năm trước cách đây
mục cha
commit
f6eb086596

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

@@ -60,12 +60,12 @@
                         :formatter="dateFormatter"
                         label="出院日期">
                 </el-table-column>
-                <el-table-column
+                <!--<el-table-column
                         :resizable = "false"
                         prop="gmtModified"
                         :formatter="dateFormatter"
                         label="加入时间">
-                </el-table-column>
+                </el-table-column>-->
             </el-table>
                 </div>
                 <el-button class="disclButn" size="small" type="primary" :disabled = 'saveDisable' @click="comfirn">确定</el-button>

+ 5 - 1
src/components/qualityControl/AutoTestList.vue

@@ -189,12 +189,16 @@
         this.dialogTaskName = true;
       },
       addTask(){
+        if(!this.taskName){
+          this.warning("请输入任务名称");
+          return;
+        }
         api.addTask({missionName:this.taskName}).then((res)=>{
           if(res.data.code==="0"){
             this.dialogTaskName = false;
             this.toTaskList();
           }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="item.deptId" :key="item.deptId" ></el-option>
+                        <el-option v-for="item in moduleList" :label="item.deptName" :value="String(item.deptId)" :key="String(item.deptId)" ></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="出院日期:">