Merge branch 'dev-followUp-20190312' of...

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

src/App.vue

@@ -54,7 +54,7 @@ export default {
 	created() {
 		vm = this
     if(vm.$route.name!='loginPage') {
-      vm.getToken()
+     vm.getToken()
     }
 	},
 	mounted() {
@@ -140,7 +140,12 @@ export default {
 				}
 			})
 		}
-	}
+	},
+  watch: {
+    _token(val) {
+      vm.getUserAuth(val)
+    }
+  }
 }
 </script>
 

src/components/followup/form/index.vue

@@ -13,7 +13,7 @@
           :label="item.label"
           :rules="item.rules"
           :label-width="item.labelWidth"
-          :required="isRule"
+          :required="item.required"
           :class="item.className"
           :error="item.error">
           <!-- div文本 -->
@@ -112,8 +112,7 @@
 
   export default {
     props: {
-      isRule: Boolean,
-//      formName: String,
+      ruleNew: Boolean,
       dataSource: {
         type: Array,
         default: () => []
@@ -124,19 +123,13 @@
       }
     },
     watch: {
-      isRule(val){
-        this.needRule = val
-        this.$forceUpdate();
-      },
       form(val){
         this.form = val
-//        console.log(val)
         this.$forceUpdate()
-      }
+      },
     },
     data() {
       return {
-        needRule: true,
         spanNum: 6,
 //        valueFormat: 'timestamp',
 //        valueFormat: 'yyyy-MM-dd',
@@ -192,9 +185,6 @@
 </style>
 <style lang="scss">
   .form-box{
-    .margin-left-20{
-      margin-left: 20px;
-    }
     .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
       content: '*';
       color: #F56C6C;
@@ -252,6 +242,20 @@
       color: #449284 !important;
     }
 
+
+    .margin-left-20{
+      margin-left: 20px;
+    }
+    .margin-left-40{
+      margin-left: 40px;
+    }
+    .margin-left-60{
+      margin-left: 60px;
+    }
+    .margin-left-80{
+      margin-left: 80px;
+    }
+
   }
   .checkBody{
     .el-col{

src/utils/followup/followupUtils/checkCardNum.js

+// 检查号码是否符合规范，包括长度，类型
+function isCardNo(card){
+  //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+  var reg = /(^\d{15}$)|(^\d{17}(\d|X|x)$)/;
+  if(reg.test(card) === false){
+    return false;
+  }
+  return true;
+}
+
+// 取身份证前两位,校验省份
+function checkProvince(card,vcity){
+  var province = card.substr(0,2);
+  if(vcity[province] == undefined){
+    return false;
+  }
+  return true;
+}
+
+// 检查生日是否正确
+function checkBirthday(card){
+  var len = card.length;
+  //身份证15位时，次序为省（3位）市（3位）年（2位）月（2位）日（2位）校验位（3位），皆为数字
+  if(len == '15'){
+    var re_fifteen = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/;
+    var arr_data = card.match(re_fifteen);
+    var year = arr_data[2];
+    var month = arr_data[3];
+    var day = arr_data[4];
+    var birthday = new Date('19'+year+'/'+month+'/'+day);
+    return verifyBirthday('19'+year,month,day,birthday);
+  }
+  //身份证18位时，次序为省（3位）市（3位）年（4位）月（2位）日（2位）校验位（4位），校验位末尾可能为X
+  if(len == '18'){
+    var re_eighteen = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X|x)$/;
+    var arr_data = card.match(re_eighteen);
+    var year = arr_data[2];
+    var month = arr_data[3];
+    var day = arr_data[4];
+    var birthday = new Date(year+'/'+month+'/'+day);
+    return verifyBirthday(year,month,day,birthday);
+  }
+  return false;
+}
+
+// 校验日期
+function verifyBirthday(year,month,day,birthday) {
+  var now = new Date();
+  var now_year = now.getFullYear();
+  //年月日是否合理
+  if(birthday.getFullYear() == year && (birthday.getMonth() + 1) == month && birthday.getDate() == day)
+  {
+    //判断年份的范围（0岁到100岁之间)
+    var time = now_year - year;
+    if(time >= 0 && time <= 100)
+    {
+      return true;
+    }
+    return false;
+  }
+  return false;
+}
+
+// 校验位的检测
+function checkParity(card){
+  //15位转18位
+  card = changeFivteenToEighteen(card);
+  var len = card.length;
+  if(len == '18'){
+    var arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2);
+    var arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2');
+    var cardTemp = 0, i, valnum;
+    for(i = 0; i < 17; i ++) {
+      cardTemp += card.substr(i, 1) * arrInt[i];
+    }
+    valnum = arrCh[cardTemp % 11];
+    if (valnum == card.substr(17, 1).toLocaleUpperCase())
+    {
+      return true;
+    }
+    return false;
+  }
+  return false;
+}
+
+// 15位转18位身份证号
+function changeFivteenToEighteen(card){
+  if(card.length == '15')
+  {
+    var arrInt = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2);
+    var arrCh = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2');
+    var cardTemp = 0, i;
+    card = card.substr(0, 6) + '19' + card.substr(6, card.length - 6);
+    for(i = 0; i < 17; i ++)
+    {
+      cardTemp += card.substr(i, 1) * arrInt[i];
+    }
+    card += arrCh[cardTemp % 11];
+    return card;
+  }
+  return card;
+}
+
+export const checkCardNum = (rule, value, callback) => {
+  var vcity={ 11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",
+    21:"辽宁",22:"吉林",23:"黑龙江",31:"上海",32:"江苏",
+    33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",
+    42:"湖北",43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",
+    51:"四川",52:"贵州",53:"云南",54:"西藏",61:"陕西",62:"甘肃",
+    63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外"
+  };
+  //是否为空
+  if(value === ''){
+    callback(new Error('请输入正确的身份证'))
+  }
+  //校验长度，类型
+  if(isCardNo(value) === false){
+    callback(new Error('请输入正确的身份证'))
+  }
+  //检查省份
+  if(checkProvince(value,vcity) === false){
+    callback(new Error('请输入正确的身份证'))
+  }
+  //校验生日
+  if(checkBirthday(value) === false){
+    callback(new Error('请输入正确的身份证'))
+  }
+  //检验位的检测
+  if(checkParity(value) === false){
+    callback(new Error('请输入正确的身份证'))
+  }
+  callback()
+}

src/utils/followup/followupUtils/checkField.js

+import rangeJson from '@/utils/followup/followupUtils/range';
+
+// 这个方法，是用户在选择随访轮次（6个月，12个月）后续操作
+let checkNeedRule = (val) => {
+  const needRule = localStorage.getItem('needRule');
+  if(( (!val||val=='') && (!needRule || needRule=='true') )){
+    return true;
+  }
+  return false;
+}
+
+// 校验范围通用方法
+export const checkRange = (rule, value, callback) => {
+  let min,max;
+  let val = Number(value);
+  rangeJson.forEach((item)=>{
+    if(item.field == rule.field){
+      min = item.min;
+      max = item.max;
+    }
+  })
+  if(((val >= min) && (val <= max)) || checkNeedRule(val)){
+    callback()
+  }else{
+    callback(new Error(`输入范围${min}~${max}`))
+  }
+}
+
+// 校验手机号
+export const checkMobile = (rule, value, callback) => {
+  var reg = /^1[3|4|5|7|8][0-9]{9}$/; //验证规则
+  const flag = reg.test(value);
+  if(flag){
+    callback()
+  }else{
+    callback(new Error(`请输入正确的手机号码`))
+  }
+}
+
+// 校验是否是整数
+export const checkIsInteger = (rule, value, callback) => {
+  const num = Number.isInteger(parseFloat(value));
+  const val = parseFloat(value);
+  if(num || checkNeedRule(val)){
+    callback()
+  }else{
+    callback(new Error(`输入整数`))
+  }
+}
+
+// 校验是否是一位小数
+export const checkNumberIsToFixed = (rule, value, callback) => {
+  const isNum = /^(([1-9][0-9]*)|(([0]\.\d{1,1}|[1-9][0-9]*\.\d{1,1})))$/;
+  const val = Number(value);
+  if(isNum.test(val)  || checkNeedRule(val)){
+    callback()
+  }else{
+    callback(new Error(`最多输入1位小数`))
+  }
+}
+
+// 大于0的正整数
+export const checkNormalInt = (rule, value, callback) => {
+  const isInteger = Number.isInteger(parseFloat(value));
+  const val = parseFloat(value);
+  if((isInteger && val > 0) || checkNeedRule(val)){
+    callback()
+  }else{
+    callback(new Error(`请输入大于0的正整数`))
+  }
+}

src/utils/followup/followupUtils/range.js

+// 各个字段校验的配置文件
+export default [
+  {
+    field: 'fastingBloodGlucose',
+    name: '空腹血糖',
+    min: 1,
+    max: 33.3
+  },
+  {
+    field: 'triglyceride',
+    name: '甘油三酯',
+    min: 0,
+    max: 5
+  },
+  {
+    field: 'cholesterol',
+    name: '胆固醇',
+    min: 1,
+    max: 10
+  },
+  {
+    field: 'cLdl',
+    name: '低密度脂蛋白胆固醇',
+    min: 0,
+    max: 5
+  },
+  {
+    field: 'cHdl',
+    name: '高密度脂蛋白胆固醇',
+    min: 0,
+    max: 5
+  },
+  {
+    field: 'stature',
+    name: '身高',
+    min: 100,
+    max: 200
+  },
+  {
+    field: 'weight',
+    name: '体重',
+    min: 35,
+    max: 200
+  },
+  {
+    field: 'waistline',
+    name: '腰围',
+    min: 50,
+    max: 150
+  },
+  {
+    field: 'firstSystolicPressure',
+    name: '收缩压SBP',
+    min: 70,
+    max: 240
+  },
+  {
+    field: 'firstDiastolicPressure',
+    name: '舒张压DBP',
+    min: 50,
+    max: 130
+  },
+  {
+    field: 'firstPulse',
+    name: '脉搏',
+    min: 30,
+    max: 200
+  },
+  {
+    field: 'secondSystolicPressure',
+    name: '收缩压SBP',
+    min: 70,
+    max: 240
+  },
+  {
+    field: 'secondDiastolicPressure',
+    name: '舒张压DBP',
+    min: 50,
+    max: 130
+  },
+  {
+    field: 'secondPulse',
+    name: '脉搏',
+    min: 30,
+    max: 200
+  },
+
+]

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -293,7 +293,7 @@
               this.totalNumber = this.wechatPatientNum + this.messagePatientNum
             }else{
               this.$message({
-                message: '提交失败',
+                message: res.message,
                 type: 'error'
               });
             }

src/views/followup/plan-manage/plan-detail.vue

@@ -73,7 +73,7 @@
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent[0].followupList" @click="goToShort(item.resourceUrl)">{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent[0].followupList" @click="goToScale(item)">{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -184,6 +184,10 @@
       goToShort(url) {
         window.open(url)
       },
+      goToScale(val) {
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: val.doctorId, scaleNo: val.resourceId, planPatientsTimesId: val.planPatientsTimesId, showBtn: 0}});
+      }
     },
     watch: {
       planDetail(val) {

src/views/followup/plan-manage/resident-detail.vue

@@ -93,7 +93,7 @@
           <div class="content-div">
             <div class="c-title">随访登记表：</div>
             <div class="c-content more-content">
-              <p  class="click-text" v-for="item in nodeContent.followupList" @click="goToShort(item.resourceUrl)" >{{item.sendContent}}</p>
+              <p  class="click-text" v-for="item in nodeContent.followupList" @click="goToScale(item)" >{{item.sendContent}}</p>
             </div>
           </div>
         </div>
@@ -133,6 +133,7 @@
         planDetails: {}, //计划详情
         status: null,
         residentCrumb: [], //面包屑
+        nodePlanPatientsTimesId: []
       }
     },
     created() {
@@ -196,6 +197,10 @@
       goToShort(url) {
         window.open(url)
       },
+      goToScale(val) {
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: this.residentDetail.doctorId, scaleNo: val.resourceId, planPatientsTimesId: this.nodePlanPatientsTimesId[0].planPatientsTimesId, showBtn: 1}});
+      }
     },
     watch: {
       timeNodeList(val) {
@@ -205,7 +210,11 @@
         }
       },
       timeNodes(val) {
-        this.getNodeTimeContent(val)
+        this.getNodeTimeContent(val);
+        this.nodePlanPatientsTimesId =  this.timeNodeList.filter(function(item){
+          return item.id == val;
+        });
+        console.log(this.nodePlanPatientsTimesId)
       },
       residentDetail(val) {
         this.planDetails = val.fPlanDto

src/views/followup/record-manage/dialog/followupDetail.vue

@@ -103,7 +103,7 @@
           <p class="title">随访登记表</p>
         </div>
         <div class="list-item" v-for="(item, index) in enteringInfo.fuTable" :key="index" v-if="enteringInfo.fuTable.length>0">
-          <p class="link-p">{{item.name}}</p>
+          <p class="link-p" @click="goToScale(item)">{{item.name}}</p>
         </div>
         <div class="list-item" v-if="enteringInfo.fuTable.length==0">
           <p class="empty-p">暂无</p>
@@ -148,6 +148,10 @@
       closeDetail(){
         this.$emit('closeDetail',false)
       },
+      goToScale(val) {
+        this.$router.push({path: '/followup/record-manage/form-template',
+          query: {doctorId: val.doctorId, scaleNo: val.scaleNo, planPatientsTimesId: val.planPatientsTimesId, showBtn: 1}});
+      }
     },
     filters: {
       emptyFileter: function(value) {

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

@@ -13,7 +13,7 @@
           <el-col :span="20">心脑血管病危险因素
             社区、乡镇人群随访表
           </el-col>
-          <el-col :span="4" v-if="showBtn">
+          <el-col :span="4" v-if="showBtn=='1'">
             <el-button class="button-white" size="small" plain @click="formSubmit(2)">暂存</el-button>
             <el-button type="primary" size="small" @click="formSubmit(1)">提交</el-button>
           </el-col>
@@ -24,17 +24,11 @@
           <h2>（适用于社区、乡镇脑卒中高危人群满6个月、12个月时随访和中危人群满12个月时随访使用）</h2>
         </div>
 
-        <!--<el-row :gutter="24" class="patient-base-info">-->
-          <!--<el-col :span="4"><div class="grid-content bg-purple">居民：戴家康</div></el-col>-->
-          <!--<el-col :span="12"><div class="grid-content bg-purple">身份证号：31021212121212121212</div></el-col>-->
-          <!--<el-col :span="8"><div class="grid-content bg-purple">随访计划名称：2018年河北省脑卒中随访</div></el-col>-->
-        <!--</el-row>-->
-
         <!--模板页面除了显示居民基本信息，将病种展示作为组件引入-->
 
         <div class="form-container">
           <!--脑卒中-->
-          <stroke v-if="resourceId=='SCALE0003'" :checkStart="checkStart" @checkEnd="checkEnd" :showBtn="showBtn" :saveWay="saveWay" />
+          <stroke v-if="resourceId=='SCALE0003'" :showBtn="showBtn" :checkStart="checkStart" @checkEnd="checkEnd" :saveWay="saveWay" />
         </div>
 
 
@@ -53,7 +47,7 @@
     data(){
       return {
         checkStart: false,
-        showBtn: true,
+        showBtn: '1',
         resourceId: '',
         saveWay: 1,
         jumPathThird: '/followup/record-manage/record-list'
@@ -73,24 +67,12 @@
       }
     },
     created(){
-//      this.showBtn = false;
-//      console.log(this.$route.query);
       this.resourceId = this.$route.query.resourceId;
       this.resourceId = 'SCALE0003'
+      if(this.$route.query.showBtn=='0'){
+        this.showBtn = String(this.$route.query.showBtn);
+      }
       // 0003 脑卒中、0002 糖尿病、0001 高血压
-
-//      axios({
-//        method: 'get',
-//        url: 'https://dev-sc.yunqueyi.com/scale/1/SCALE0003/info',
-//        data: JSON.stringify(this.formData),
-//      }).then(res=>{
-//        console.log(res)
-//        this.formData = res.data.data
-//        res.data.code='111'
-//        if( res.data.code=='111'){
-//          this.showBtn = false;
-//        }
-//      })
     }
   }
 </script>
@@ -110,6 +92,8 @@
   }
   .form-template{
     .form-header{
+      /*position: fixed;*/
+      /*z-index:100000;*/
       line-height: 60px;
       height: 60px;
       border-bottom: 1px solid #e1e1e1;

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js

+import { checkCardNum } from '@/utils/followup/followupUtils/checkCardNum';
+
 export default ($this) => {
+
   return [
     {
       formType: 'div',
@@ -14,9 +17,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入姓名',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '次',
-      rules: [{required: true, message: '请输入姓名', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入姓名', trigger: ['submit','change']}],
     },
     {
       formType: 'input',
@@ -27,9 +31,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入身份证',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '次',
-      rules: [{required: true, message: '请输入身份证', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入身份证', trigger: ['submit','change']},{ validator: checkCardNum , trigger: ['submit','change'] }],
     },
     {
       formType: 'radio',
@@ -37,17 +42,20 @@ export default ($this) => {
       prop: 'inTurn',
       model: 'inTurn',
       spanNum: 24,
-      label: '随访轮次 （距离建档时间）：',
+      label: '随访轮次（距离建档时间）：',
       options: [
         { label: '6个月', value: '6个月' },
         { label: '12个月', value: '12个月' },
       ],
-      rules: [{ required: true, message: '请选择随访轮次', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择随访轮次', trigger: ['submit','change'] }],
       changeFun: (e)=>{
         console.log(e)
-        if(e==2){
-          $this.isRule = true;
-          // console.log($this.isRule)
+        if(e == '12个月'){
+          $this.needRule = false;
+          localStorage.setItem('needRule',false);
+        }else{
+          $this.needRule = true;
+          localStorage.setItem('needRule',true);
         }
       }
     },

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo0.js

+import { checkMobile } from '@/utils/followup/followupUtils/checkField';
+
 export default ($this) => {
   return [
     {
@@ -9,9 +11,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入随访单位名称',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '次',
-      rules: [{required: true, message: '请输入随访单位名称', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入随访单位名称', trigger: ['submit','change']}],
     },
     {
       formType: 'input',
@@ -22,9 +25,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入随访人员姓名',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '次',
-      rules: [{required: true, message: '请输入随访人员姓名', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入随访人员姓名', trigger: ['submit','change']}],
     },
     {
       formType: 'input',
@@ -35,9 +39,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入随访人员联系电话',
       spanNum: 12,
+      maxlength: 11,
       type: 'tel',
       labmsg: '次',
-      rules: [{required: true, message: '请输入随访人员联系电话', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入随访人员联系电话', trigger: ['submit','change']},{ validator: checkMobile , trigger: ['submit','change'] }],
     },
     {
       formType: 'date-picker',
@@ -50,7 +55,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '本次调查时间', trigger: 'submit'}],
+      rules: [{required: true, message: '本次调查时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
   ]

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo2.js

@@ -7,7 +7,7 @@ export default ($this) => {
     },
     {
       formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title margin-left-20',
       prop: 'investigationState',
       model: 'investigationState',
       spanNum: 24,
@@ -17,15 +17,21 @@ export default ($this) => {
         { label: '失访', value: '失访' },
         { label: '死亡', value: '死亡' }
       ],
-      rules: [{ required: true, message: '请选择调查时状态', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择调查时状态', trigger: ['submit','change'] }],
       changeFun: (e)=>{
+        console.log(e)
+        if(e == '失访' || e=='死亡'){
+          $this.showModule = false;
+        }else{
+          $this.showModule = true;
+        }
 
       }
     },
 
     {
       formType: 'radio',
-      className: 'obj-form-title2',
+      className: 'obj-form-title2 margin-left-40',
       prop: 'investigationWay',
       model: 'investigationWay',
       label: '调查方式：',
@@ -37,11 +43,11 @@ export default ($this) => {
         { label: '面对面', value: '面对面', disabled: false },
         { label: '电话（限中危人群，高危人群6个月随访）', value: '电话（限中危人群，高危人群6个月随访）', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择调查方式', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择调查方式', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
-      className: 'obj-form-title2',
+      className: 'obj-form-title2 margin-left-40',
       prop: 'oneself',
       model: 'oneself',
       label: '本次调查是否为被调查者本人：',
@@ -53,11 +59,11 @@ export default ($this) => {
         { label: '是', value: '是', disabled: false },
         { label: '否', value: '否', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
-      className: 'obj-form-title3',
+      className: 'obj-form-title3 margin-left-60',
       prop: 'relationship',
       model: 'relationship',
       label: '提供信息者与被调查者之间关系：',
@@ -72,25 +78,26 @@ export default ($this) => {
         { label: '兄弟姐妹', value: '兄弟姐妹', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
-      className: 'obj-form-title4',
-      linkageRule: [{name: 'relationshipRemark',value: ['其他']}],
+      className: 'obj-form-title4 margin-left-80',
+      linkageRule: [{name: 'relationship',value: ['其他']}],
       prop: 'relationshipRemark',
       model: 'relationshipRemark',
       disabled: false,
       placeholder: '请输入其他关系',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '',
-      rules: [{ required: true, message: '请输入其他关系', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入其他关系', trigger: ['submit','change'] }]
     },
 
     {
       formType: 'radio',
-      className: 'obj-form-title2',
+      className: 'obj-form-title3 margin-left-60',
       prop: 'lossReason',
       model: 'lossReason',
       spanNum: 24,
@@ -101,26 +108,27 @@ export default ($this) => {
         { label: '拒绝参加调查', value: '拒绝参加调查' },
         { label: '其他', value: '其他' }
       ],
-      rules: [{ required: true, message: '请选择失访原因', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择失访原因', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
-      className: 'obj-form-title3',
+      className: 'obj-form-title3 margin-left-60',
       linkageRule: [{name: 'lossReason',value: ['其他']}],
       prop: 'lossRemark',
       model: 'lossRemark',
       disabled: false,
       placeholder: '请输入其他失访原因',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '',
-      rules: [{ required: true, message: '请输入其他失访原因', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入其他失访原因', trigger: ['submit','change'] }]
     },
 
 
     {
       formType: 'date-picker',
-      className: 'obj-form-title2',
+      className: 'obj-form-title2 margin-left-40',
       prop: 'deadTime',
       model: 'deadTime',
       placeholder: '选择死亡时间',
@@ -131,11 +139,11 @@ export default ($this) => {
       dateType: 'datetime',
       type: 'date',
       spanNum: 12,
-      rules: [{ required: true, message: '请选择死亡时间', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择死亡时间', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
-      className: 'obj-form-title2',
+      className: 'obj-form-title2 margin-left-40',
       prop: 'causeOfDeath',
       model: 'causeOfDeath',
       label: '死亡原因：',
@@ -146,17 +154,17 @@ export default ($this) => {
       options: [
         { label: '脑卒中', value: '脑卒中', disabled: false },
         { label: '冠心病', value: '冠心病', disabled: false },
-        { label: '恶心肿瘤', value: '恶心肿瘤', disabled: false },
+        { label: '恶性肿瘤', value: '恶性肿瘤', disabled: false },
         { label: '呼吸系统疾病', value: '呼吸系统疾病', disabled: false },
         { label: '损伤和中毒', value: '损伤和中毒', disabled: false },
         { label: '不祥', value: '不祥', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择死亡原因', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择死亡原因', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
-      className: 'obj-form-title3',
+      className: 'obj-form-title3 margin-left-60',
       prop: 'deadStrokeRemark',
       model: 'deadStrokeRemark',
       label: '脑卒中类型：',
@@ -169,20 +177,21 @@ export default ($this) => {
         { label: '缺血性脑卒中', value: '缺血性脑卒中', disabled: false },
         { label: '不祥', value: '不祥', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择脑卒中类型', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择脑卒中类型', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
-      className: 'obj-form-title3',
+      className: 'obj-form-title3 margin-left-60',
       linkageRule: [{name: 'causeOfDeath',value: ['其他']}],
       prop: 'deadRemark',
       model: 'deadRemark',
       disabled: false,
       placeholder: '请输入其他死亡原因',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '',
-      rules: [{ required: true, message: '请输入其他死亡原因', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入其他死亡原因', trigger: ['submit','change'] }]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceCheckBody.js

+import { checkRange, checkIsInteger, checkNumberIsToFixed } from '@/utils/followup/followupUtils/checkField';
+
 export default ($this) => {
   return [
     {
@@ -16,7 +18,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: 'submit'}],
+      rules: [{required: false, message: '请选择检查时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -31,29 +33,25 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'cm', type: 'append'}],
-      rules: [{required: true, message: '请输入身高', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入身高', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }, {validator: checkNumberIsToFixed , trigger: ['submit','change']}],
       changeFun: (val)=>{
-        console.log(val)
         $this.addComponents.forEach((item,index)=>{
           if(item.formName == 'stroke_014'){
-            $this.addComponents[index].formObject.stature = val
+            $this.addComponents[index].formObject.stature = val;
           }
         })
+
       },
       blurFunc: (val)=>{
         $this.addComponents.forEach((item,index)=>{
           if(item.formName == 'stroke_014'){
-            console.log($this.addComponents[index].formObject)
             let weight = $this.addComponents[index].formObject.weight
             let stature = $this.addComponents[index].formObject.stature
             if(weight && stature){
               weight = parseFloat(weight);
               stature = parseFloat(stature);
-              $this.addComponents[index].formObject.bmi = weight / Math.pow((stature/100),2);
-              $this.addComponents[13].formObject.bmi = weight / Math.pow((stature/100),2);
-              console.log($this.addComponents[index].formObject.bmi)
-              $this.bmi = $this.addComponents[index].formObject.bmi
-              item.formObject.bmi = weight / Math.pow((stature/100),2);
+              let bmi = (weight / Math.pow((stature/100),2)).toFixed(1);
+              $this.addComponents[index].formObject.bmi = bmi;
             }
           }
         })
@@ -72,28 +70,24 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'kg', type: 'append'}],
-      rules: [{required: true, message: '请输入体重', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入体重', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }, {validator: checkNumberIsToFixed , trigger: ['submit','change']}],
       changeFun: (val)=>{
-        console.log(val)
         $this.addComponents.forEach((item,index)=>{
           if(item.formName == 'stroke_014'){
-            $this.addComponents[index].formObject.weight = val
+            $this.addComponents[index].formObject.weight = val;
           }
         })
       },
       blurFunc: (val)=>{
         $this.addComponents.forEach((item,index)=>{
           if(item.formName == 'stroke_014'){
-            console.log($this.addComponents[index].formObject)
             let weight = $this.addComponents[index].formObject.weight
             let stature = $this.addComponents[index].formObject.stature
             if(weight && stature){
               weight = parseFloat(weight);
               stature = parseFloat(stature);
-              $this.addComponents[index].formObject.bmi = weight / Math.pow((stature/100),2);
-              console.log($this.addComponents[index].formObject.bmi)
-              $this.bmi = $this.addComponents[index].formObject.bmi
-              item.formObject.bmi = weight / Math.pow((stature/100),2);
+              let bmi = (weight / Math.pow((stature/100),2)).toFixed(1);
+              $this.addComponents[index].formObject.bmi = bmi;
             }
           }
         })
@@ -105,7 +99,7 @@ export default ($this) => {
       prop: 'bmi',
       model: 'bmi',
       label: 'BMI（系统自动生成）：',
-      disabled: false,
+      disabled: true,
       placeholder: '（这里是自动计算所得）',
       spanNum: 6,
       type: 'number',
@@ -125,7 +119,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'cm', type: 'append'}],
-      rules: [{required: true, message: '请输入腰围', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入腰围', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }, {validator: checkNumberIsToFixed , trigger: ['submit','change']}],
     },
 
 
@@ -145,7 +139,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '请选择测量时间', trigger: 'submit'}],
+      rules: [{required: false, message: '请选择测量时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -165,7 +159,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmHg', type: 'append'}],
-      rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入收缩压SBP', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -179,7 +173,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmHg', type: 'append'}],
-      rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入舒张压DBP', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -193,7 +187,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: '次/分', type: 'append'}],
-      rules: [{required: true, message: '请输入脉搏', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入脉搏', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
 
     {
@@ -213,7 +207,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmHg', type: 'append'}],
-      rules: [{required: true, message: '请输入收缩压SBP', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入收缩压SBP', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -227,7 +221,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmHg', type: 'append'}],
-      rules: [{required: true, message: '请输入舒张压DBP', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入舒张压DBP', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -241,7 +235,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: '次/分', type: 'append'}],
-      rules: [{required: true, message: '请输入脉搏', trigger: 'submit'}],
+      rules: [{required: false, message: '请输入脉搏', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] },{ validator: checkIsInteger , trigger: ['submit','change'] }],
     },
 
 
@@ -261,7 +255,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '测量时间', trigger: 'submit'}],
+      rules: [{required: false, message: '请选择测量时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -276,7 +270,7 @@ export default ($this) => {
         {label: '无', value: '无', disabled: false},
         {label: '有', value: '有', disabled: false},
       ],
-      rules: [{required: true, message: '请选择心脏杂音', trigger: 'submit'}]
+      rules: [{required: false, message: '请选择心脏杂音', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -290,7 +284,7 @@ export default ($this) => {
         {label: '整齐', value: '整齐', disabled: false},
         {label: '不齐', value: '不齐', disabled: false},
       ],
-      rules: [{required: true, message: '请选择心律', trigger: 'submit'}]
+      rules: [{required: false, message: '请选择心律', trigger: ['submit','change']}]
     },
   ]
 }

src/views/followup/record-manage/models/stroke/dataSourceCheckLab.js

+import { checkRange } from '@/utils/followup/followupUtils/checkField';
+
 export default ($this) => {
   return [
     {
@@ -16,7 +18,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '检查时间', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择检查时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -31,7 +33,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入空腹血糖', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入空腹血糖', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
 
 
@@ -51,7 +53,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{required: true, message: '检查时间', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择检查时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -66,7 +68,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入甘油三酯', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入甘油三酯', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -80,7 +82,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入胆固醇', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -94,7 +96,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入低密度脂蛋白胆固醇', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入低密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
     {
       formType: 'input',
@@ -108,7 +110,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{name: 'mmol/L', type: 'append'}],
-      rules: [{required: true, message: '请输入高密度脂蛋白胆固醇', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入高密度脂蛋白胆固醇', trigger: ['submit','change']},{ validator: checkRange , trigger: ['submit','change'] }],
     },
   ]
 }

src/views/followup/record-manage/models/stroke/dataSourceLifeStyleGuide.js

@@ -13,7 +13,7 @@ export default ($this) => {
         {label: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', value: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', disabled: false},
         {label: '缺乏运动 (不符合上述经常运动标准者）', value: '缺乏运动 (不符合上述经常运动标准者）', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -28,7 +28,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -44,7 +44,7 @@ export default ($this) => {
         {label: '少量饮酒', value: '少量饮酒', disabled: false},
         {label: '经常大量饮酒（白酒≥3次/周，每次≥2两）', value: '经常大量饮酒（白酒≥3次/周，每次≥2两）', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -60,7 +60,7 @@ export default ($this) => {
         {label: '偏淡', value: '偏淡', disabled: false},
         {label: '适中', value: '适中', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -76,7 +76,7 @@ export default ($this) => {
         {label: '偏素', value: '偏素', disabled: false},
         {label: '均衡', value: '均衡', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -92,7 +92,7 @@ export default ($this) => {
         {label: '3-4天/周', value: '3-4天/周', disabled: false},
         {label: '≤2天/周', value: '≤2天/周', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -108,7 +108,7 @@ export default ($this) => {
         {label: '3-4天/周', value: '3-4天/周', disabled: false},
         {label: '≤2天/周', value: '≤2天/周', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl.js

+import { checkNormalInt } from '@/utils/followup/followupUtils/checkField';
+
 export default ($this) => {
   return [
     {
@@ -17,7 +19,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
@@ -32,7 +34,7 @@ export default ($this) => {
       type: 'number',
       labmsg: '次',
       slots: [{ name: '次', type: 'append' }],
-      rules: [{ required: true, message: '请输入发病次数', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入发病次数', trigger: ['submit','change'] }, { validator: checkNormalInt , trigger: ['submit','change'] }]
     },
     {
       formType: 'date-picker',
@@ -46,7 +48,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{ required: true, message: '请选择随访期间第一次发病时间', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择随访期间第一次发病时间', trigger: ['submit','change'] }],
       spanNum: 12,
     },
     {
@@ -64,7 +66,7 @@ export default ($this) => {
         { label: '县级医院', value: '县级医院', disabled: false },
         { label: '社区或乡镇卫生机构', value: '社区或乡镇卫生机构', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -81,7 +83,7 @@ export default ($this) => {
         { label: '蛛网膜下腔出血', value: '蛛网膜下腔出血', disabled: false },
         { label: '短暂性脑缺血发作（TIA）', value: '短暂性脑缺血发作（TIA）', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -96,7 +98,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -111,7 +113,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl2.js

@@ -16,7 +16,7 @@ export default ($this) => {
       valueFormat: 'yyyy-MM-dd',
       dateType: 'date',
       type: 'date',
-      rules: [{ required: false, message: '请选择评估时间', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择评估时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
     {
@@ -35,10 +35,9 @@ export default ($this) => {
         { label: '4（重度残疾，不能独立行走，无他人帮助不能满足自身日常生活需求）', value: '4（重度残疾，不能独立行走，无他人帮助不能满足自身日常生活需求）', disabled: false },
         { label: '5（严重残疾，持续卧床、二便失禁，需持续护理和关注，日常生活完全依赖他人）', value: '5（严重残疾，持续卧床、二便失禁，需持续护理和关注，日常生活完全依赖他人）', disabled: false },
       ],
-      rules: [{ required: false, message: '请选择评分值', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }],
       changeFun: (e)=>{
         // console.log(e)
-        // console.log($this.formData.stroke_003.inTurn)
       }
     },
 

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl3.js

@@ -19,7 +19,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '有') {
           $this.addComponents.forEach((item,index)=>{
@@ -45,7 +45,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{ required: true, message: '首次确诊时间', trigger: 'submit' }],
+      rules: [{ required: true, message: '首次确诊时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
     {
@@ -67,20 +67,21 @@ export default ($this) => {
         { label: '具体不详', value: '具体不详', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择心脏病类型', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择心脏病类型', trigger: ['submit','change'] }]
     },
     {
       formType: 'input',
       className: 'obj-form-title4',
-      linkageRule: [{name: 'relationshipRemark',value: ['其他']}],
+      linkageRule: [{name: 'type',value: ['其他']}],
       prop: 'remark',
       model: 'remark',
       disabled: false,
       placeholder: '请输入其他心脏病类型',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '',
-      rules: [{ required: true, message: '请输入其他心脏病类型', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入其他心脏病类型', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -96,7 +97,7 @@ export default ($this) => {
         { label: '心肌梗塞', value: '心肌梗塞', disabled: false },
         { label: '无症状冠脉狭窄', value: '无症状冠脉狭窄', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择冠心病类型', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择冠心病类型', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -112,7 +113,7 @@ export default ($this) => {
         { label: '持续性', value: '持续性', disabled: false },
         { label: '未知', value: '未知', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择房颤类型', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择房颤类型', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -129,7 +130,7 @@ export default ($this) => {
         { label: '县级医院', value: '县级医院', disabled: false },
         { label: '社区或乡镇卫生机构', value: '社区或乡镇卫生机构', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择评分值', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }]
     },
 
 
@@ -145,7 +146,7 @@ export default ($this) => {
         { label: '无', value: '无', disabled: false },
         { label: '有', value: '有', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
 
     },
     {
@@ -161,7 +162,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -195,7 +196,7 @@ export default ($this) => {
         { label: '氯吡格雷', value: '氯吡格雷', disabled: false },
         { label: '其他', value: '其他', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择评分值', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择评分值', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -210,7 +211,7 @@ export default ($this) => {
         { label: '规律', value: '规律', disabled: false },
         { label: '不规律', value: '不规律', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
 
 

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl4.js

@@ -20,7 +20,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'date-picker',
@@ -34,7 +34,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{ required: true, message: '首次确诊时间', trigger: 'submit' }],
+      rules: [{ required: true, message: '首次确诊时间', trigger: ['submit','change'] }],
       spanNum: 6,
     },
     {
@@ -50,7 +50,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -86,7 +86,7 @@ export default ($this) => {
         {label: 'ARB', value: 'ARB', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
 
     {
@@ -102,7 +102,7 @@ export default ($this) => {
         { label: '规律', value: '规律', disabled: false },
         { label: '不规律', value: '不规律', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
 
     {
@@ -119,7 +119,7 @@ export default ($this) => {
         { label: '不达标', value: '不达标', disabled: false },
         { label: '不清楚', value: '不清楚', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
 
 

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl5.js

@@ -20,7 +20,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -47,7 +47,7 @@ export default ($this) => {
       dateType: 'year',
       type: 'date',
       spanNum: 6,
-      rules: [{ required: true, message: '请选择确诊时间', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择确诊时间', trigger: ['submit','change'] }]
     },
     {
       formType: 'checkbox',
@@ -68,7 +68,7 @@ export default ($this) => {
         {label: '低HDL-C', value: '低HDL-C', disabled: false},
         {label: '不详', value: '不详', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'radio',
@@ -83,7 +83,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -114,7 +114,7 @@ export default ($this) => {
         {label: '贝特类', value: '贝特类', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceMainSickControl6.js

@@ -17,7 +17,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
     {
       formType: 'date-picker',
@@ -32,7 +32,7 @@ export default ($this) => {
       dateType: 'year',
       type: 'date',
       spanNum: 6,
-      rules: [{ required: true, message: '确诊时间', trigger: 'submit' }]
+      rules: [{ required: true, message: '确诊时间', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -47,7 +47,7 @@ export default ($this) => {
         { label: '否', value: '否', disabled: false },
         { label: '是', value: '是', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }],
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -78,7 +78,7 @@ export default ($this) => {
         {label: '胰岛素', value: '胰岛素', disabled: false},
         {label: '其他', value: '其他', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'input',
@@ -90,9 +90,10 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入其他降糖药',
       spanNum: 12,
+      maxlength: 30,
       type: 'text',
       labmsg: '',
-      rules: [{ required: true, message: '请输入其他降糖药', trigger: 'submit' }]
+      rules: [{ required: true, message: '请输入其他降糖药', trigger: ['submit','change'] }]
     },
     {
       formType: 'radio',
@@ -108,7 +109,7 @@ export default ($this) => {
         { label: '未达标', value: '未达标', disabled: false },
         { label: '不清楚', value: '不清楚', disabled: false },
       ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'submit' }]
+      rules: [{ required: true, message: '请选择是否', trigger: ['submit','change'] }]
     },
 
   ]

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation.js

@@ -17,7 +17,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -47,7 +47,7 @@ export default ($this) => {
         {label: '左侧', value: '左侧', disabled: false},
         {label: '右侧', value: '右侧', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -61,7 +61,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '请选择左侧手术时间', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择左侧手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
     {
@@ -76,7 +76,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '请选择右侧手术时间', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择右侧手术时间', trigger: ['submit','change']}],
       spanNum: 12,
     },
 
@@ -93,7 +93,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}],
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}],
       changeFun(e){
         if(e == '是') {
           $this.addComponents.forEach((item,index)=>{
@@ -123,7 +123,7 @@ export default ($this) => {
         {label: '左侧', value: '左侧', disabled: false},
         {label: '右侧', value: '右侧', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -137,8 +137,8 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '左侧内膜剥脱术手术时间', trigger: 'submit'}],
-      spanNum: 6,
+      rules: [{required: true, message: '左侧内膜剥脱术手术时间', trigger: ['submit','change']}],
+      spanNum: 12,
     },
     {
       formType: 'date-picker',
@@ -152,8 +152,8 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '右侧内膜剥脱术手术时间', trigger: 'submit'}],
-      spanNum: 6,
+      rules: [{required: true, message: '右侧内膜剥脱术手术时间', trigger: ['submit','change']}],
+      spanNum: 12,
     },
 
     {
@@ -168,7 +168,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -182,8 +182,8 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: 'submit'}],
-      spanNum: 6,
+      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
+      spanNum: 12,
     },
 
 

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation2.js

@@ -19,7 +19,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -33,7 +33,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: 'submit'}],
+      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
     {
@@ -48,7 +48,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'date-picker',
@@ -62,7 +62,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: 'submit'}],
+      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
       spanNum: 6,
     },
 

src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation3.js

@@ -18,7 +18,7 @@ export default ($this) => {
         {label: '否', value: '否', disabled: false},
         {label: '是', value: '是', disabled: false},
       ],
-      rules: [{required: true, message: '请选择是否', trigger: 'submit'}]
+      rules: [{required: true, message: '请选择是否', trigger: ['submit','change']}]
     },
     {
       formType: 'input',
@@ -30,10 +30,11 @@ export default ($this) => {
       disabled: false,
       placeholder: '请输入治疗方式',
       spanNum: 6,
+      maxlength: 30,
       type: 'text',
       labmsg: '次',
       // slots: [{name: 'cm', type: 'append'}],
-      rules: [{required: true, message: '请输入治疗方式', trigger: 'submit'}],
+      rules: [{required: true, message: '请输入治疗方式', trigger: ['submit','change']}],
     },
     {
       formType: 'date-picker',
@@ -47,7 +48,7 @@ export default ($this) => {
       valueFormat: 'yyyy',
       dateType: 'year',
       type: 'date',
-      rules: [{required: true, message: '手术时间', trigger: 'submit'}],
+      rules: [{required: true, message: '手术时间', trigger: ['submit','change']}],
       spanNum: 6
     },
   ]

src/views/followup/record-manage/record-list.vue

@@ -224,7 +224,7 @@
           }
         }else if(this.formList.scalesList.length === 1){
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId}})
+            query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.fuPlanPatientTimesId,planTimesId : row.fuPlanTimesId, showBtn: 1}})
         }else {
           this.$message.warning('暂不支持录入量表!')
         }
@@ -264,7 +264,7 @@
       goFormView(item) {
         this.selectFormShow = false
         this.$router.push({path: '/followup/record-manage/form-template',
-          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
+          query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId, showBtn: 1}});
       },
       closeForm() {
         this.selectFormShow = false;

src/views/home.vue

@@ -124,9 +124,9 @@ export default {
         vm.getTodayAppointsList({
           status:0
         });
-        vm.getTodayOverview({
+        /*vm.getTodayOverview({
           status:0
-        });
+        });*/
     },
     computed: {
         ...mapGetters([
@@ -135,7 +135,7 @@ export default {
       ...mapState('workbench', {
         todayPlansList: state => state.todayPlansList,
         todayAppointsList: state => state.todayAppointsList,
-        todayOverview: state => state.todayOverview,
+        //todayOverview: state => state.todayOverview,
       }),
       ...mapState('recordManage',{
         formList: state => state.formList,
@@ -206,13 +206,13 @@ export default {
         goFormView(item) {
           this.selectFormShow = false
           this.$router.push({path: '/followup/record-manage/form-template',
-            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId}});
+            query: {doctorId: this.ScaleData.doctorId, scaleNo: item.resourceId, planPatientsTimesId: this.ScaleData.planPatientsTimesId, showBtn: 1}});
         },
         closeForm() {
           this.selectFormShow = false;
         },
         async goToScale(row) {
-          await this.getFormList(row.plantimesId); //获取量表列表
+          await this.getFormList(row.planTimesId); //获取量表列表
           //获取量表列表情况
           if(this.formList.scalesList.length > 1){
             this.selectFormShow = true
@@ -222,7 +222,7 @@ export default {
             }
           }else if(this.formList.scalesList.length === 1){
             this.$router.push({path: '/followup/record-manage/form-template',
-              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId}})
+              query: {doctorId: this.formList.doctorId, scaleNo: this.formList.scalesList[0].resourceId, planPatientsTimesId: row.planPatientTimesId, showBtn: 1}})
           }else {
             this.$message.warning('暂不支持录入量表!')
           }

src/views/login.vue

@@ -57,11 +57,11 @@
               <p class="err-text" v-show="resetCodeErr"><img src="../assets/image/err-icon.svg" alt="">{{resetCodeErrText}}</p>
             </el-form-item>
             <el-form-item label="">
-              <el-input v-model="resetPassword.password" placeholder="新密码" type="password" v-if="!showPSW" :class="{errColor: resetPWDErr}">
+              <el-input v-model.lazy="resetPassword.password" placeholder="新密码" type="password" v-if="!showPSW" :class="{errColor: resetPWDErr}">
                 <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
                 <i @click="showPWSBtn"  slot="suffix" class="el-input__icon my-icon open-eyes-icon"></i>
               </el-input>
-              <el-input v-model="resetPassword.password" placeholder="新密码" v-else :class="{errColor: resetPWDErr}">
+              <el-input v-model.lazy="resetPassword.password" placeholder="新密码" v-else :class="{errColor: resetPWDErr}">
                 <i slot="prefix" class="el-input__icon my-icon password-icon"></i>
                 <i @click="hidePWSBtn" slot="suffix" class="el-input__icon my-icon close-eyes-icon"></i>
               </el-input>
@@ -89,7 +89,9 @@
 </template>
 
 <script>
+  let vm = null
   import { ssoLogin2, getDeviceInfo } from '@/utils/utils';
+  import { mapActions } from 'vuex';
   import md5 from 'js-md5';
 
   export default {
@@ -117,8 +119,13 @@
     },
     created() {
       ssoLogin2() //初始化登录信息
+      vm = this
     },
     methods: {
+      // 修改token
+      ...mapActions([
+        'changeToken',
+      ]),
       checkPhone(val) {
         if(!(/^1[345678]\d{9}$/.test(val))) {
           return false;
@@ -270,6 +277,7 @@
             return;
           }
           localStorage.setItem("token", data.token);
+          vm.changeToken(data.token)
           localStorage.setItem("storageToken", data.token);
           localStorage.setItem('doctorId',data.picapDoctor.id);
 
@@ -331,7 +339,7 @@
         this.saasGET('/mobiles/checkCaptcha',para).then(data => {
           let req = {
             mobile: this.resetPassword.mobile,
-            password: md5(this.resetPassword.authCode).toUpperCase()
+            password: md5(this.resetPassword.password).toUpperCase()
           }
           this.saasPUT('/login/password',req).then(data => {
             this.$message({