Merge remote-tracking branch 'origin/dev2/zhangxc' into test

src/components/icss/AddCommonSymptom.vue

@@ -95,7 +95,12 @@
             },
             titleText: '添加科室常见症状',
             departList: [],
-            typeList:[],
+            typeList:[
+                 {
+                    "name": "症状",
+                    "key": 1
+                },
+            ],
             searchVal: '',
             isEdit: false,
             isDetail: false,
@@ -127,7 +132,7 @@
             
         } else {
             this.getDepartmentList()
-            this.getIcssEnumsData()
+            // this.getIcssEnumsData()
         }
     },
     watch: {
@@ -146,7 +151,6 @@
         getIcssEnumsData()  {
             api.getIcssEnumsData().then((res) => {
                 if(res.data.code === '0') {
-                    console.log(res.data.data.questionTypeEnum)
                    this.typeList = res.data.data.questionUsualTypeEnum
                 }
             })

src/components/icss/AddIndeptLabel.vue

@@ -123,11 +123,11 @@
           this.warning('所有选项必须都有或者都没有同“伴”/“无”标记')
           return;
         }
-        if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
+        if(parseFloat(this.dataPub.region8) >= parseFloat(this.dataPub.region9)) {
           this.warning('最小年龄不能大于或等于最大年龄')
           return;
         }
-        if(parseInt(this.dataPub.minNormalVal) >= parseInt(this.dataPub.maxNormalVal)) {
+        if(parseFloat(this.dataPub.minNormalVal) >= parseFloat(this.dataPub.maxNormalVal)) {
           this.warning('最小正常值不能大于或等于最大正常值')
           return;
         }

src/components/icss/AddMedicalInfo.vue

@@ -27,7 +27,7 @@
                 </el-form-item>
 
 
-                <el-form-item label="选择概念:"  prop = "concept">
+                <el-form-item label="选择概念:"  prop = "concept"  class="required">
 
                       <el-input v-model="form.concept" disabled></el-input>
                       <!-- <el-select v-model="form.concept"   filterable  @change="selectConcept" placeholder="请选择" size="small">
@@ -40,17 +40,17 @@
                       </el-select> -->
                    
                 </el-form-item>
-                <el-form-item label="选择类型:" prop="type">
+                <el-form-item label="选择类型:" prop="type"  class="required">
                         <el-input disabled v-model="form.conceptType"></el-input>
                 </el-form-item>
                
                 <!-- <el-form-item label="术语名称:" prop="termName">
                    <el-input v-model="form.termName"></el-input>
                 </el-form-item> -->
-                 <el-form-item label="术语标准名称:" prop="termStandardName">
+                 <el-form-item label="术语标准名称:" prop="termStandardName"  class="required">
                    <el-input disabled v-model="form.stdName"></el-input>
                 </el-form-item>
-                <el-form-item label="搜索小类名称:">
+                <el-form-item label="搜索小类名称:" >
                   <div class="conceptSearch  termMiniClassSearch">
                     <input v-model="termMiniClassText" type="text" class="searchText">
                     <span class="searchName" @click="searchTermMiniClass">搜索</span>
@@ -66,7 +66,7 @@
                     </ul>
                   </div>
                 </el-form-item>
-                 <el-form-item label="术语小类名称:" prop="termMiniClassName">
+                 <el-form-item label="术语小类名称:" prop="termMiniClassName"  class="required">
                    <el-input disabled v-model="form.termMiniClassName"></el-input>
                    <!-- <el-select v-model="form.termMiniClassName"   filterable  placeholder="请选择" size="small">
                         <el-option
@@ -93,7 +93,7 @@
                     </ul>
                   </div>
                 </el-form-item>
-                <el-form-item label="术语类组:" prop="termClass">
+                <el-form-item label="术语类组:" prop="termClass"  class="required">
                    <el-input disabled v-model="form.termClass"></el-input>
                    <!-- <el-select v-model="form.termClass"   filterable  placeholder="请选择" size="small">
                         <el-option
@@ -104,7 +104,7 @@
                         </el-option>
                     </el-select> -->
                 </el-form-item>
-                <el-form-item label="性别:" prop="sex">
+                <el-form-item label="性别:" prop="sex"  class="required">
                    <el-select v-model="form.sex" clearable placeholder="请选择" size="small">
                         <el-option
                             v-for="item in sexList"
@@ -116,7 +116,7 @@
                 </el-form-item>
                 <el-form-item
                     label="年龄"
-                    class="fix-inp"
+                    class="fix-inp required"
                     prop="age"
                 >
                     <el-col :span="10">
@@ -144,7 +144,7 @@
                       </el-form-item>
                     </el-col>
                 </el-form-item>
-                <el-form-item label="一级部位:" prop="primarySite">
+                <el-form-item label="一级部位:" prop="primarySite" class="required">
                     <el-select v-model="form.primarySite" clearable placeholder="请选择" @change="selectPrimarySite" size="small">
                         <el-option
                             v-for="item in primarySiteList"
@@ -154,7 +154,7 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="二级部位:" prop="twoLevelPosition">
+                <el-form-item label="二级部位:" prop="twoLevelPosition" class="required">
                     <el-select v-model="form.twoLevelPosition" clearable placeholder="请选择" size="small">
                         <el-option
                             v-for="item in twoLevelPositionList"
@@ -175,7 +175,7 @@
                           </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="科室:" prop="department">
+                <el-form-item label="科室:" prop="department" class="required">
                    <el-select v-model="form.department"   filterable  placeholder="请选择" size="small">
                           <el-option
                               v-for="(item) in departmentList"
@@ -309,35 +309,35 @@
            remark: '' //备注
         },
         rules: {
-            termStandardName: [
-                { required: true, message: '请选择标准术语', trigger: '' }
-            ],
+            // termStandardName: [
+            //     { required: true,  }
+            // ],
 
-            termMiniClassName: [
-                { required: true, message: '请选择小类名称', trigger: 'change' }
-            ],
-            termClass: [
-                { required: true, message: '请选择术语类组', trigger: 'change' }
-            ],
-            sex: [
-                { required: true, message: '请选择性别', trigger: 'change' }
-            ],
+            // termMiniClassName: [
+            //     { required: true,}
+            // ],
+            // termClass: [
+            //     { required: true, }
+            // ],
+            // sex: [
+            //     { required: true, }
+            // ],
             
-            primarySite: [
-                { required: true, message: '请选择一级部位', trigger: 'change' }
-            ],
-            twoLevelPosition: [
-                { required: true, message: '请选择二级部位', trigger: 'change' }
-            ],
-            department: [
-                { required: true, message: '请选择科室', trigger: 'change' }
-            ],
-            minAge: [
-                { required: true, message: '请输入最小年龄', trigger: 'change' }
-            ],
-            maxAge: [
-                { required: true, message: '请输入最大年龄', trigger: 'change' }
-            ]
+            // primarySite: [
+            //     { required: true,}
+            // ],
+            // twoLevelPosition: [
+            //     { required: true, }
+            // ],
+            // department: [
+            //     { required: true,}
+            // ],
+            // minAge: [
+            //     { required: true, }
+            // ],
+            // maxAge: [
+            //     { required: true, }
+            // ]
         }
       }
     },
@@ -352,8 +352,8 @@
         this.form.conceptType = data.conceptType
         this.form.name = data.name
         this.form.stdName = data.stdName
-        this.form.termClass = data.cateName
-        this.form.termMiniClassName = data.grp
+        this.form.termClass = data.grp
+        this.form.termMiniClassName = data.cateName
         this.form.sex = data.gender
         this.form.minAge = data.minAge
         this.form.maxAge = data.maxAge
@@ -473,28 +473,33 @@
       },
       submitForm() {
         //验证外层表单
-        let goOn=true,it=null;
-        this.$refs.groups.validate((valid) =>{
-          if(!valid){
-            goOn = false;
-            return false;
-          }
-        });
+        // let goOn=true,it=null;
+        // this.$refs.groups.validate((valid) =>{
+        //   if(!valid){
+        //     goOn = false;
+        //     return false;
+        //   }
+        // });
 
-        if(!goOn){
-          return;
+        // if(!goOn){
+        //   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 ) {
+          this.warning('请填写必填项');
+          return
         }
         //通过必填验证，提交保存
         const param = {
           "bodypart": this.form.primarySite,
-          "cateName": this.form.termClass,
+          "grp": this.form.termClass,
           "code": this.form.termCode,
           "conceptName": this.form.concept,
           "conceptType": this.form.conceptType,
           "dept": this.form.department,
           "displayOrder": this.form.order,
           "gender": this.form.sex,
-          "grp": this.form.termMiniClassName,
+          "cateName": this.form.termMiniClassName,
           "maxAge":this.form.maxAge,
           "minAge": this.form.minAge,
           "name": this.form.name,
@@ -540,6 +545,13 @@
 <style lang="less">
     @import "../../less/common.less";
     .MedicalInfoWrapper {
+      .required {
+        .el-form-item__label::before {
+          color: red;
+          content:'*'
+        }
+      }
+        
         .conceptSearch {
           height: 30px;
           margin: 4px 0;

src/components/icss/MedicalInfo.vue

@@ -226,7 +226,7 @@
             'Content-Type': 'multipart/form-data'
           }
         }
-        /*api.knowledgeUpload(formData,header).then((res)=>{
+        api.medicalInfoExcelIm(formData,header).then((res)=>{
           if(res.data.code==0){
             this.$message({
               message: '上传成功',
@@ -243,7 +243,7 @@
         //解决上传相同文件不触发change
         let inp = document.getElementById("upFile");
         inp.value = "";
-        */
+        
       },
     }
   }

src/components/icss/NoiseTemplate.vue

@@ -175,7 +175,7 @@ export default {
         });
         return;
       }
-      if(parseInt(this.dataPub.region8) >= parseInt(this.dataPub.region9)) {
+      if(parseFloat(this.dataPub.region8) >= parseFloat(this.dataPub.region9)) {
           this.$message({
             message: '最小年龄不能大于或等于最大年龄',
             type: 'warning'