Merge remote-tracking branch 'origin/depart' into dev

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/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/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/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/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'
+              });
             }
           })
         }