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/utils/followup/followupUtils/rangConfig/rangeDiabetes.js

@@ -90,4 +90,22 @@ export default [
     min: 0,
     max: 99
   },
+  {
+    field: 'nextWorkoutDuration',
+    name: '运动情况',
+    min: 0,
+    max: 99
+  },
+  {
+    field: 'stapleFoodGram',
+    name: '主食摄入量',
+    min: 0,
+    max: 999
+  },
+  {
+    field: 'nextStapleFoodGram',
+    name: '主食摄入量',
+    min: 0,
+    max: 999
+  },
 ]

src/views/followup/record-manage/dialog/chose-medication.vue

@@ -3,16 +3,16 @@
     <el-dialog title="用药情况" :visible.sync="showDialog">
       <el-form :model="formChosedMedical" ref="choseMed" :rules="rules">
         <el-form-item label="药物名称" :label-width="formLabelWidth" prop="medicinesName">
-          <el-input v-model="formChosedMedical.medicinesName" autocomplete="off" placeholder="请输入药物名称"></el-input>
+          <el-input v-model="formChosedMedical.medicinesName" autocomplete="off" placeholder="请输入药物名称" maxlength="10"></el-input>
         </el-form-item>
         <el-form-item label="用法" :label-width="formLabelWidth" prop="dosageDay">
-          <el-input v-model="formChosedMedical.dosageDay" autocomplete="off" placeholder="请输入每日几次">
+          <el-input v-model="formChosedMedical.dosageDay" type="number" autocomplete="off" placeholder="请输入每日几次">
             <template slot="append">次/日</template>
           </el-input>
         </el-form-item>
         <el-form-item label="用量" :label-width="formLabelWidth" prop="dosageNum">
-          <el-input v-model="formChosedMedical.dosageNum" autocomplete="off" placeholder="请输入每次用量">
-            <template slot="append">粒/每次</template>
+          <el-input v-model="formChosedMedical.dosageNum" autocomplete="off" placeholder="请输入每次用量" maxlength="10">
+            <template slot="append">每次</template>
           </el-input>
         </el-form-item>
       </el-form>
@@ -25,8 +25,18 @@
 </template>
 
 <script>
+  import { checkIsInteger } from '@/utils/followup/followupUtils/checkField';
   export default {
     data(){
+      var checkRange = (rule, value, callback) => {
+        // let min,max;
+        let val = Number(value);
+        if((val >= 0) && (val <= 5)){
+          callback()
+        }else{
+          callback(new Error(`输入范围0~5`))
+        }
+      }
       return {
         showDialog: true,
         formLabelWidth: '120px',
@@ -37,7 +47,7 @@
         },
         rules: {
           medicinesName: [{ required: true, message: '请输入药物名称', trigger: 'change' }],
-          dosageDay: [{ required: true, message: '请输入每日几次', trigger: 'change' }],
+          dosageDay: [{ required: true, message: '请输入每日几次', trigger: ['change'] },{ validator: checkIsInteger, trigger: 'change' },{validator:checkRange,trigger: 'change'}],
           dosageNum: [{ required: true, message: '请输入每次用量', trigger: 'change' }],
         },
       }

src/views/followup/record-manage/models/diabetes/diabetesSourseLifeMode.js

@@ -136,7 +136,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '',
       slots: [{name: '克/天', type: 'append'}],
-      rules: [{ required: true, message: '请输入每天摄入主食克数', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请输入每天摄入主食克数', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
@@ -151,7 +151,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '',
       slots: [{name: '克/天', type: 'append'}],
-      rules: [{ required: true, message: '请输入每天摄入主食克数', trigger: ['submit','change'] }]
+      rules: [{ required: true, message: '请输入每天摄入主食克数', trigger: ['submit','change'] },{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }]
     },
 
     {

src/views/followup/record-manage/models/diabetes/diabetesSourseMedicationUse.js

@@ -64,7 +64,7 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入胰岛素种类',
       spanNum: 12,
-      maxlength: 30,
+      maxlength: 10,
       type: 'text',
       labmsg: '次',
       rules: [{required: true, message: '请输入胰岛素种类', trigger: ['submit','change']}],
@@ -78,7 +78,7 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入胰岛素用法',
       spanNum: 12,
-      maxlength: 30,
+      maxlength: 10,
       type: 'text',
       labmsg: '次',
       rules: [{required: true, message: '请输入胰岛素用法', trigger: ['submit','change']}],
@@ -92,7 +92,7 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入胰岛素用量',
       spanNum: 12,
-      maxlength: 30,
+      maxlength: 10,
       type: 'text',
       labmsg: '次',
       rules: [{required: true, message: '请输入胰岛素用量', trigger: ['submit','change']}],