Bladeren bron

合并小超分支,请求地址未修改
Squashed commit of the following:

commit 540db5eac6f23111dfc7ff181f1448b4ef5fb990
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Apr 4 17:14:26 2019 +0800

修改年龄为空判断条件

commit f05056016ca670cad4854747f9f9d4e5224d2bf3
Author: zhangxc <zhangxc@zjlantone.com>
Date: Thu Apr 4 16:51:27 2019 +0800

修改的时候不调科室列表接口

liucf 6 jaren geleden
bovenliggende
commit
c72a131075
2 gewijzigde bestanden met toevoegingen van 9 en 6 verwijderingen
  1. 6 5
      src/components/icss/AddMedicalInfo.vue
  2. 3 1
      src/components/icss/AddPhysicalExamTemp.vue

+ 6 - 5
src/components/icss/AddMedicalInfo.vue

@@ -179,7 +179,7 @@
                    <el-select v-model="form.department"   filterable  placeholder="请选择" size="small">
                           <el-option
                               v-for="(item) in departmentList"
-                              :key="item.id"
+                              :key="item.name"
                               :label="item.name"
                               :value="item.name">
                           </el-option>
@@ -368,6 +368,7 @@
         
       }
       this.getPrimarySite()
+      this.getAllDepts()
     },
     methods: {
       back() { this.$router.go(-1) },
@@ -460,10 +461,10 @@
          
         })
       },
-      getDeptInfo() {
-        api.getDeptInfo({}).then((res) => {
+      getAllDepts() {
+        api.getAllDepts({name: ''}).then((res) => {
           if(res.data.code == '0') {
-            this.departmentList = res.data.data.records
+            this.departmentList = res.data.data
           }
         })
       },
@@ -485,7 +486,7 @@
         //   return;
         // }
         const  { primarySite,termClass,termCode,concept,conceptType,department,order,sex,termMiniClassName, maxAge, minAge, name, remark, stdName, twoLevelPosition } = this.form
-        if ( !primarySite || !termClass || !concept || !conceptType|| !department || !sex || !termMiniClassName || !maxAge || !minAge || !name || !stdName || !twoLevelPosition ) {
+        if ( !primarySite || !termClass || !concept || !conceptType|| !department || !sex || !termMiniClassName || (!maxAge&&maxAge != 0) || (!minAge &&minAge != 0) || !name || !stdName || !twoLevelPosition ) {
           this.warning('请填写必填项');
           return
         }

+ 3 - 1
src/components/icss/AddPhysicalExamTemp.vue

@@ -118,8 +118,10 @@
             this.departList.push({ id, name, val:id })
             this.form.department = id
             
+        } else {
+            this.getDepartmentList()
         }
-        this.getDepartmentList()
+        
         this.getTagList()
     },
     watch: {