Browse Source

bug修复

morphone1995 4 years atrás
parent
commit
ec8754d444

+ 27 - 30
src/components/cdssManage/MedicineInfoPg.vue

@@ -108,9 +108,7 @@ export default {
         orderNo: 0
       },
       positions: [], //位置列表
-      rules: {
-       
-      }
+      rules: {}
     };
   },
   watch: {
@@ -118,9 +116,9 @@ export default {
       if (this.data.content !== '') {
         this.$refs.editor && this.$refs.editor.clearValidate(); // 清除校验
       }
-      if (this.data.content === ''){
+      if (this.data.content === '') {
         // console.log('内容为空');
-        this.$refs['form'].validateField('content') // 手动校验
+        this.$refs['form'].validateField('content'); // 手动校验
       }
       this.data.text = this.$refs.quillEditor.quill.root.innerText;
     }
@@ -133,34 +131,32 @@ export default {
     this.renderPositions();
     if (this.isEdit) {
       setTimeout(() => {
-        this.rules = {         
+        this.rules = {
           position: [
             { required: true, message: '请选择内容类型', trigger: 'change' }
           ],
           title: [
             { required: true, message: '请输入段落标题', trigger: 'change' },
             { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
-           
           ],
           content: [
             { required: true, message: '请输入段落内容', trigger: 'change' }
           ]
         };
       }, 100);
-    }else{
-      this.rules = {         
-          position: [
-            { required: true, message: '请选择内容类型', trigger: 'change' }
-          ],
-          title: [
-            { required: true, message: '请输入段落标题', trigger: 'change' },
-            { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
-           
-          ],
-          content: [
-            { required: true, message: '请输入段落内容', trigger: 'change' }
-          ]
-        };
+    } else {
+      this.rules = {
+        position: [
+          { required: true, message: '请选择内容类型', trigger: 'change' }
+        ],
+        title: [
+          { required: true, message: '请输入段落标题', trigger: 'change' },
+          { max: 30, message: '标题名称不能超过30字', trigger: 'change' }
+        ],
+        content: [
+          { required: true, message: '请输入段落内容', trigger: 'change' }
+        ]
+      };
     }
   },
   mounted() {},
@@ -185,7 +181,7 @@ export default {
       } else if (
         this.showType == 3 ||
         this.showType == 4 ||
-        this.showType == 5||
+        this.showType == 5 ||
         this.showType == 7
       ) {
         // 检验/检查
@@ -218,7 +214,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-
 .quill-editor.ql-editor {
   padding-left: 0 !important;
 }
@@ -229,9 +224,10 @@ export default {
   position: relative;
 }
 .order-btn {
-  position: absolute;
+  // position: absolute;
   top: 12px;
   right: 0;
+  display: flex;
   a {
     margin-bottom: 20px;
     border: 1px solid #22ccc8;
@@ -251,19 +247,20 @@ export default {
 /**富文本编辑器样式修改***/
 .ql-snow .ql-picker.ql-size .ql-picker-label::before,
 .ql-snow .ql-picker.ql-size .ql-picker-item::before,
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,it
-.ql-editor,.quill-editor{
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+it .ql-editor,
+.quill-editor {
   padding-top: 0px !important;
   margin-top: -8px;
   min-height: 48px;
-  p{
+  p {
     padding-top: 8px;
   }
 }
-.ql-editor.ql-blank::before{
-  padding-top: 0px
+.ql-editor.ql-blank::before {
+  padding-top: 0px;
 }
-.btns{
+.btns {
   margin-top: 20px;
 }
 </style>

+ 6 - 5
src/components/cdssManage/MedicinePrompt.vue

@@ -395,13 +395,14 @@ export default {
 }
 
 .selectMedicine {
-  /deep/ .el-input__suffix-inner {
-    position: relative;
-    top: -1px;
-  }
+  // /deep/ .el-input__suffix-inner {
+  //   position: relative;
+  //   top: -1px;
+  // }
   /deep/ .el-icon-circle-close {
     position: relative;
-    top: -2px;
+    // top: -2px;
+    left:12px;
   }
 }
 

+ 9 - 3
src/components/cdssManage/hospital/AddHospital.vue

@@ -13,13 +13,13 @@
             <el-form-item label="医院名称" prop="hospitalName">
               <el-input v-model="form.hospitalName" placeholder="2-30位,可输入汉字、字母、数字和下划线" @blur="handlePinyin($event)"></el-input>
             </el-form-item>
-            <el-form-item label="医院名称拼音">
+            <el-form-item label="医院名称拼音" prop="spell">
               <el-input v-model="form.spell" placeholder="请输入医院名称拼音"></el-input>
             </el-form-item>
             <el-form-item label="医院编码" prop="hospitalCode">
               <el-input v-model="form.hospitalCode" placeholder="4-15位,可输入字母、数字和下划线"></el-input>
             </el-form-item>
-            <el-form-item label="医院地址">
+            <el-form-item label="医院地址" prop="address">
               <el-input type="textarea" :rows="2" v-model="form.address" placeholder="请输入医院地址"></el-input>
             </el-form-item>
 
@@ -72,7 +72,13 @@ export default {
           { required: true, message: '医院编码不能为空', trigger: 'change' },
           { min: 2, max: 30, message: '长度4-15位', trigger: 'blur' },
           { required: true, validator: validatePass1, trigger: 'blur' }
-        ]
+        ],
+        address:[
+          {  max: 200, message: '长度最多200字', trigger: 'change' },
+        ],
+        spell:[
+          {  max: 30, message: '医院名称拼音长度最多30位', trigger: 'change' },
+        ],
       },
       hospitalId: '',
       isEdit: false,