Merge branch 'dev-scaleHype-20190428' of...

Merge branch 'dev-scaleHype-20190428' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-scaleHype-20190428

src/components/followup/form/index.vue

@@ -115,7 +115,7 @@
             v-else-if="item.formType === 'list'"
             v-for="(itemChild, indexChild) in form[item.model]"
             :key="indexChild"
-            style="margin-bottom: 15px;font-size:18px;color:#606266;">
+            style="width: 800px;margin-bottom: 15px;font-size:18px;color:#606266;">
             <el-col :span="24">
               <span>{{itemChild.medicinesName}}：</span>
               <span>每日{{itemChild.dosageDay}}次，</span>

src/views/followup/record-manage/form-template.vue

@@ -84,6 +84,7 @@
         this.titleSmText = '（适用于社区、乡镇脑卒中高危人群满6个月、12个月时随访和中危人群满12个月时随访使用）';
       }else if(this.scaleNo == 'SCALE0001'){
         this.titleText = '高血压患者随访服务记录表';
+        this.titleSmText = '（本表为高血压患者在接受随访服务时由医生填写）';
       }else if(this.scaleNo == 'SCALE0002'){
         this.titleText = '2 型糖尿病患者随访服务记录表 ';
       }
@@ -123,7 +124,7 @@
       }
     }
     .title-box{
-      padding: 60px;
+      padding: 20px;
       text-align: center;
       h1{
         font-size: 18px;

src/views/followup/record-manage/models/hypertension/hypeDataSourceMedicationUse.js

@@ -99,7 +99,7 @@ export default ($this) => {
       maxlength: 30,
       type: 'text',
       slots: [{name: '次/日', type: 'append'}],
-      rules: [{required: false, message: '请输入其他药物用法每日几次', trigger: ['submit','change','blur']},{ validator: checkRange , trigger: ['submit','change','blur'] }],
+      rules: [{required: false, message: '请输入其他药物用法每日几次', trigger: ['submit','change','blur']},{ validator: checkRange , trigger: ['submit','change','blur'] },{ validator: checkIsInteger , trigger: ['submit','change','blur'] }],
       changeFun: hanldeValue,
       blurFunc: hanldeValue
     },