Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

src/components/icss/AddCommonSymptom.vue

@@ -158,7 +158,8 @@
                 "deptId": this.form.department,
                 "tagName": this.searchVal,
                 "noIds": noIds,
-                "type": this.form.type
+                "type": this.form.type,
+                "notTagType": [8],
             }
             api.getSymptomList(param).then((res)=>{
                if(res.data.code === '0') {

src/components/icss/AddDeptInfo.vue

@@ -9,7 +9,7 @@
                     <el-input v-model="form.name" placeholder="请输入科室名称" maxlength="30"></el-input>
                 </el-form-item>
                 <el-form-item label="描述：" prop="remark">
-                    <el-input type="textarea" :rows="3" placeholder="请输入科室描述" v-model="form.remark" maxlength="1024"></el-input>
+                    <el-input type="textarea" :rows="3" placeholder="请输入科室描述" v-model="form.remark" maxlength="100"></el-input>
                 </el-form-item>
                 <el-button size="small" type="primary" @click="addOrga">{{text}}</el-button>
             </el-form>
@@ -69,6 +69,13 @@
       addOrga() {
         this.$refs.form.validate((valid)=> {
           if (valid) {
+            if(!this.form.name.trim()){
+              this.$message({
+                message: '科室名称不能为空',
+                type: 'warning'
+              });
+              return
+            }
             // 有id是修改，没有id是添加
             if(this.id){
               let param = {

src/components/icss/AddIndeptLabel.vue

@@ -13,7 +13,7 @@
                 ref="submitForm"
         ></PubIndeptTag>
         <div class="main">
-            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2"> <i>*</i> 标签明细：<i style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i></p>
+            <p class="title" v-if="dataPub.region2==1||dataPub.region2==2|| dataPub.region2==11"> <i>*</i> 标签明细：<i style="margin-left:70px;color: #22ccc8; font-size: 12px;">所有选项必须都有或者都没有同“伴”/“无”标记</i></p>
             <SingleSelect v-if="dataPub.region2==1 || dataPub.region2==2 || dataPub.region2==11" :ascription="dataPub.region1" :sexType="dataPub.region7" :type="dataPub.region2" @pushValues="pushValues" :options="editData.questionDetailList"></SingleSelect>
             <div class="btn">
                 <el-button

src/components/icss/AddMedicalName.vue

@@ -136,11 +136,14 @@ import api from '@api/icss.js';
           type:this.data.type
         }
         api.getMedicalDetail(params).then((res)=>{
-          const result = res.data;console.log(999,result);
+          const result = res.data;
           if(result.code == 0){
             this.synonymous = result.data.medicalInfo;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -154,7 +157,10 @@ import api from '@api/icss.js';
           if(data.code==0){
             this.typeList = data.data.records;
           }else{
-            console.log(res.msg);
+            this.$message({
+              message:data.msg,
+              type:'warning'
+            });
           }
         }).catch((error) => {
           console.log(error);

src/components/icss/AddPhysicalExamTemp.vue

@@ -149,6 +149,7 @@
                 "tagName": this.searchVal,
                 "type": 4,
                 "notIds": notIds,
+                "notTagType": [8],
             }
             api.searchTagList(param).then((res) => {
                 if (res.data.code === '0') {

src/components/icss/AddVersion.vue

@@ -77,7 +77,10 @@
           if(result.code==0){
             this.list = result.data;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -92,7 +95,10 @@
               })
               this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }else{//添加
@@ -104,7 +110,10 @@
               })
               this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }

src/components/icss/DeptInfo.vue

@@ -24,7 +24,7 @@
                         width="60">
                 </el-table-column>
                 <el-table-column
-                        prop="gmtCreate"
+                        prop="gmtModified"
                         label="操作时间"
                         :show-overflow-tooltip="true">
                 </el-table-column>

src/components/icss/MedicalInfo.vue

@@ -222,7 +222,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();

src/components/icss/MedicalName.vue

@@ -227,7 +227,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();

src/components/icss/MedicalRelation.vue

@@ -239,7 +239,10 @@
               type: 'success',
             });
           }else{
-            this.$message.error(res.data.msg);
+            this.$message({
+              message:res.data.msg,
+              type:'warning'
+            });
           }
         })
         this.getDataList();*/

src/components/icss/PubIndeptTag.vue

@@ -178,7 +178,7 @@
                     label="正常值范围："
                     class="fix-inp"
                     prop="region13"
-                    v-if="form.region1==5 && form.region2==6"
+                    v-if="form.region1==5 && form.region2==6 || form.region2==7"
             >
                 <el-col :span="7">
                 <el-input v-model="form.minNormalVal"
@@ -278,6 +278,9 @@
           ],
           region9: [
             { required: true, message: '请输入最大年龄', trigger: 'change' }
+          ],
+           region13: [
+            { required: true, message: '请输入正常值范围', trigger: 'change' }
           ]
         },
         tmpSex: '通用',

src/components/icss/SimilarName.vue

@@ -212,7 +212,6 @@
         e.preventDefault();
         let formData = new FormData();
         formData.append('uploadfile', fileInfo);
-        // console.log(123,fileInfo,formData);
         const header = {
           headers:{
             'Content-Type': 'multipart/form-data'
@@ -225,7 +224,6 @@
               type: 'success',
             });
           }else{
-            // this.$message.error(res.data.msg);
             this.$message({
               dangerouslyUseHTMLString: true,
               message:res.data.msg,

src/components/icss/SingleSelect.vue

@@ -6,10 +6,10 @@
                     <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 2 || type == 11) " :label="i" :disabled="hasNone==i||hasBan==i|| hasError==i || (hasDefault!=-1&&hasDefault!=i)||focusOn==-1">默认选中</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="2+i" v-model="rows[i].isNone" @change="emitValues(i,'hasNone',rows[i].isNone)">
-                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasBan==i || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
+                    <el-checkbox-button  v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isBan || hasError==i ||focusOn==-1">同“无”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="type!=1&&(focusOn==i||(focusOn==-1&&i==0))" :key="3+i" v-model="rows[i].isBan" @change="emitValues(i,'hasBan',rows[i].isBan)">
-                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="hasNone==i || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
+                    <el-checkbox-button v-if=" !(ascription == 5 && type == 1 || type == 11)" :label="i" :disabled="rows[i].isNone || hasError==i||focusOn==-1">同“伴”类型</el-checkbox-button>
                 </el-checkbox-group>
                 <el-checkbox-group size="small" v-for="(it,i) in rows" v-if="focusOn==i||(focusOn==-1&&i==0)" :key="4+i" v-model="rows[i].isError" @change="emitValues(i,'hasError',rows[i].isError)">
                     <el-checkbox-button v-if="ascription==5 && (type == 1 || type != 11)" :label="i" :disabled="hasDefault==i||hasBan==i ||hasNone==i ||(hasError!=-1&&hasError==i)||focusOn==-1">标记异常选项</el-checkbox-button>

src/components/icss/VersionDesc.vue

@@ -108,7 +108,10 @@
           if(result.code==0){
             this.list = result.data;
           }else{
-            this.$message.error(result.msg);
+            this.$message({
+              message:result.msg,
+              type:'warning'
+            });
           }
         })
       },
@@ -143,7 +146,10 @@
               })
               this.getList();
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }else if(this.showDesc){//明细
@@ -166,7 +172,10 @@
               })
               this.getList();
             }else{
-              this.$message.error(res.data.msg);
+              this.$message({
+                message:res.data.msg,
+                type:'warning'
+              });
             }
           })
         }