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

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
2c2d2331 · yi.li · 3670d46e · 66facfa2 · 2c2d2331 · 2c2d2331
--- a/index.html
+++ b/index.html
@@ -17,5 +17,6 @@
    	<router-view></router-view>
    </div>
    <script src="https://unpkg.com/qiniu-js@2.2.0/dist/qiniu.min.js"></script>
+    <script src="https://pv.sohu.com/cityjson?ie=utf-8"></script>
  </body>
 </html>
--- a/package-lock.json
+++ b/package-lock.json
@@ -2821,14 +2821,12 @@
        "balanced-match": {
          "version": "1.0.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "brace-expansion": {
          "version": "1.1.11",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "balanced-match": "^1.0.0",
            "concat-map": "0.0.1"
@@ -2843,20 +2841,17 @@
        "code-point-at": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "concat-map": {
          "version": "0.0.1",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "console-control-strings": {
          "version": "1.1.0",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "core-util-is": {
          "version": "1.0.2",
@@ -2973,8 +2968,7 @@
        "inherits": {
          "version": "2.0.3",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "ini": {
          "version": "1.3.5",
@@ -2986,7 +2980,6 @@
          "version": "1.0.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "number-is-nan": "^1.0.0"
          }
@@ -3001,7 +2994,6 @@
          "version": "3.0.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "brace-expansion": "^1.1.7"
          }
@@ -3009,14 +3001,12 @@
        "minimist": {
          "version": "0.0.8",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "minipass": {
          "version": "2.2.4",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "safe-buffer": "^5.1.1",
            "yallist": "^3.0.0"
@@ -3035,7 +3025,6 @@
          "version": "0.5.1",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "minimist": "0.0.8"
          }
@@ -3116,8 +3105,7 @@
        "number-is-nan": {
          "version": "1.0.1",
          "bundled": true,
-          "dev": true,
+          "dev": true
-          "optional": true
        },
        "object-assign": {
          "version": "4.1.1",
@@ -3129,7 +3117,6 @@
          "version": "1.4.0",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "wrappy": "1"
          }
@@ -3251,7 +3238,6 @@
          "version": "1.0.2",
          "bundled": true,
          "dev": true,
-          "optional": true,
          "requires": {
            "code-point-at": "^1.0.0",
            "is-fullwidth-code-point": "^1.0.0",
@@ -4193,6 +4179,11 @@
      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.0.tgz",
      "integrity": "sha1-Gywnmm7s44ChIWi5JIUmWzWx7/s="
    },
+    "js-md5": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
+      "integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
+    },
    "js-tokens": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",

--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
    "fastclick": "^1.0.6",
    "iscroll": "^5.2.0",
    "js-cookie": "^2.2.0",
+    "js-md5": "^0.7.3",
    "showdown": "^1.6.4",
    "vue": "^2.1.0",
    "vue-router": "^2.1.1",

--- a/src/assets/image/VR-code.svg
+++ b/src/assets/image/VR-code.svg
--- a/src/assets/image/VR-mobile.svg
+++ b/src/assets/image/VR-mobile.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>手机</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-314.000000, -214.000000)" fill="#B3BEC5" fill-rule="nonzero">
+            <g id="手机" transform="translate(314.000000, 214.000000)">
+                <path d="M11.0209906,17.1295455 C11.0209906,17.6455895 11.4393269,18.0639258 11.9553709,18.0639258 C12.4714149,18.0639258 12.8897512,17.6455895 12.8897512,17.1295455 C12.8897512,16.6135015 12.4714149,16.1951652 11.9553709,16.1951652 C11.4393269,16.1951652 11.0209906,16.6135015 11.0209906,17.1295455 L11.0209906,17.1295455 Z" id="Shape"></path>
+                <path d="M13.1163284,5.7778511 C13.1163284,5.70988813 13.0755242,5.65481406 13.0251707,5.65481406 L10.7652715,5.65481406 C10.714918,5.65481406 10.6741138,5.70988813 10.6741138,5.7778511 L10.6741138,5.86511035 C10.6741138,5.93307333 10.714918,5.98814739 10.7652715,5.98814739 L13.0251707,5.98814739 C13.0755242,5.98814739 13.1163284,5.93307333 13.1163284,5.86511035 L13.1163284,5.7778511 Z" id="Shape"></path>
+                <path d="M15.4519362,6.45059185 L8.46080884,6.45059185 C8.27841109,6.45059185 8.09472362,6.60771679 8.09472362,6.76286604 L8.09472362,15.2372408 C8.09472362,15.39239 8.27841109,15.4785536 8.46080884,15.4785536 L15.4519362,15.4785536 C15.6343614,15.4785536 15.7506547,15.3923901 15.7506547,15.2372408 L15.7506547,6.76286601 C15.7506272,6.60771679 15.6343339,6.45059185 15.4519362,6.45059185 Z" id="Shape"></path>
+                <path d="M12.0033646,0.0266345564 C5.38765225,0.0266345564 0.0245765095,5.38973776 0.0245765095,12.0054226 C0.0245765095,18.6211075 5.38765225,23.9842107 12.0033646,23.9842107 C18.6190769,23.9842107 23.9821526,18.6211075 23.9821526,12.0054226 C23.9821526,5.38973776 18.6190769,0.0266345564 12.0033646,0.0266345564 Z M16.4366426,18.1704228 C16.4366426,18.5643054 16.170304,18.881217 15.8166768,18.881217 L8.1970771,18.881217 C7.84344992,18.881217 7.51844329,18.5643054 7.51844329,18.1704228 L7.51844332,5.83251947 C7.51844332,5.43863692 7.84344995,5.10602923 8.19707713,5.10602923 L15.8166768,5.10602923 C16.170304,5.10602923 16.4366426,5.43866435 16.4366426,5.83251947 L16.4366426,18.1704228 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/assets/image/close-eyes.svg
+++ b/src/assets/image/close-eyes.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>不显示</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-356.000000, -179.000000)" fill="#666666" fill-rule="nonzero">
+            <g id="不显示" transform="translate(356.000000, 183.000000)">
+                <path d="M2.98760777,4.47585816 C4.94765492,6.11926669 7.43127373,7.00805831 9.98980402,6.98167478 C13.9640444,7.0225326 17.6093887,4.78176931 19.3649668,1.21883894 C19.5521654,0.807512254 19.3988241,0.321333583 19.0094289,0.091583043 C18.8181252,-0.001978335 18.5972317,-0.0148501233 18.3963409,0.055857502 C18.19545,0.126565127 18.0313945,0.274927609 17.9410059,0.467636331 C16.5441006,3.58701642 13.4088477,5.56280617 9.98980402,5.4783656 C7.76037056,5.50874238 5.60065046,4.70229859 3.93751811,3.21842997 C3.09832069,2.48280435 2.41273474,1.58885528 1.92008948,0.58786491 C1.68997986,0.235586567 1.25173349,0.0817075981 0.851666507,0.212715594 C0.487789672,0.467392835 0.384104767,0.960502427 0.614641265,1.33997149 C1.22659788,2.50788576 2.0285062,3.56608405 2.98760777,4.47133829 L2.98760777,4.47585816 Z M9.9941569,7.63120872 C9.52265361,7.67647236 9.1570345,8.06269722 9.13799621,8.53562135 L9.13799621,11.0955874 C9.12205241,11.4115164 9.2816591,11.7105094 9.55312518,11.873253 C9.82459126,12.0359967 10.1637225,12.0359967 10.4351886,11.873253 C10.7066547,11.7105094 10.8662614,11.4115164 10.8503176,11.0955874 L10.8503176,8.53562135 C10.8308133,8.06289364 10.465438,7.6769264 9.9941569,7.63120872 L9.9941569,7.63120872 Z M19.1249887,8.44075636 L17.6987795,6.33190961 C17.5749658,6.11437082 17.366006,5.95824866 17.1221706,5.90110218 C16.8783351,5.84395571 16.6216962,5.89095785 16.4139945,6.03080108 C15.9765328,6.33703529 15.8514494,6.92965089 16.1278823,7.38633299 L17.5551794,9.49517974 C17.6792244,9.71246602 17.888172,9.86836726 18.1319051,9.92548974 C18.3756382,9.98261222 18.6321679,9.93580255 18.8399644,9.79628826 C19.2775285,9.49003737 19.4022102,8.89707016 19.1249887,8.44075636 L19.1249887,8.44075636 Z M3.57867083,6.18081183 C3.16908942,5.91883495 2.63140244,5.9820699 2.29388586,6.33190961 L0.867676644,8.44075636 C0.590455144,8.89707016 0.715136858,9.49003736 1.15270091,9.79628826 C1.36049738,9.93580255 1.61702715,9.98261223 1.86076023,9.92548975 C2.10449332,9.86836727 2.31344092,9.71246602 2.43748588,9.49517974 L3.8636951,7.38633299 C3.97786782,6.96217115 3.87074091,6.50907376 3.57867083,6.18081183 L3.57867083,6.18081183 Z" id="Shape"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/assets/image/open-eyes.svg
+++ b/src/assets/image/open-eyes.svg
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
+    <title>Group 9</title>
+    <desc>Created with Sketch.</desc>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="切图" transform="translate(-320.000000, -179.000000)" fill="#666666" fill-rule="nonzero">
+            <g id="Group-9" transform="translate(320.000000, 183.000000)">
+                <g id="Group-12">
+                    <path d="M8.66701834,9.46570652 C7.30791394,8.87476767 6.42857143,7.51241956 6.42857143,5.99606099 C6.42857143,3.91861582 8.07394255,2.22857143 10.0963641,2.22857143 C12.118123,2.22857143 13.7628314,3.91861582 13.7628314,5.99606099 C13.7628314,7.48935192 12.9258988,8.84830772 11.6297466,9.457565 C11.2964314,9.61428931 10.9028146,9.46502805 10.7504041,9.12444103 C10.5979935,8.78453247 10.7437775,8.3815271 11.0764301,8.22480279 C11.9034229,7.83604508 12.4375224,6.96150987 12.4375224,5.99606099 C12.4375224,4.66695743 11.3872151,3.58549185 10.0963641,3.58549185 C8.80485046,3.58549185 7.75388043,4.66695743 7.75388043,5.99606099 C7.75388043,6.96693756 8.31581144,7.83875893 9.18587681,8.21733973 C9.52250529,8.36388714 9.67955441,8.76214328 9.53642104,9.10680106 C9.42907101,9.36461595 9.18388884,9.51998333 8.92611624,9.51998333 C8.83997116,9.51998333 8.7518381,9.50302183 8.66701834,9.46570652 Z" id="Shape"></path>
+                    <path d="M9.99216722,12.0786272 C5.81147998,12.0786272 2.28417006,9.13546677 0.553316517,7.38096867 C0.196808387,7.01934937 0,6.5430703 0,6.03965282 C0,5.53555689 0.196808387,5.05927782 0.553316517,4.69765852 C2.28417006,2.94316041 5.81147998,0 9.99216722,0 C14.1728545,0 17.7001644,2.94316041 19.4303553,4.69765852 C19.7868634,5.05927782 19.9836718,5.53555689 19.9836718,6.03965282 C19.9836718,6.5430703 19.7868634,7.01934937 19.4303553,7.38096867 C19.1083052,7.70798649 18.8233638,7.9909044 18.339626,8.40747896 C18.0593231,8.64833234 17.6411881,8.61169549 17.4059458,8.32470682 C17.1707034,8.03771815 17.2064868,7.60960976 17.4867896,7.36875639 C17.9334188,6.98406945 18.1872154,6.73168224 18.4980004,6.4168767 C18.6013745,6.31171537 18.6583628,6.17805871 18.6583628,6.03965282 C18.6583628,5.90124694 18.6013745,5.76691182 18.4980004,5.66242894 C17.2210652,4.36792686 13.8368886,1.35692043 9.99216722,1.35692043 C6.14744581,1.35692043 2.76260662,4.36792686 1.48633405,5.66242894 C1.38295995,5.76691182 1.325309,5.90124694 1.325309,6.03965282 C1.325309,6.17805871 1.38295995,6.31171537 1.48633405,6.41619825 C2.76260662,7.71137878 6.14744581,10.7217068 9.99216722,10.7217068 C11.9701909,10.7217068 13.7003818,10.1321248 15.6015376,8.81048433 C15.9050333,8.59880475 16.3172044,8.68021998 16.5219647,8.99027629 C16.7280502,9.30033261 16.6491943,9.7216564 16.3463612,9.93265753 C14.2411079,11.3967747 12.221337,12.0786272 9.99216722,12.0786272" id="Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
--- a/src/components/followup/form/index.vue
+++ b/src/components/followup/form/index.vue
@@ -174,11 +174,17 @@
 </style>
 <style lang="scss">
  .form-box{
+    .el-form-item.is-required:not(.is-no-asterisk)>.el-form-item__label:before {
+      content: '*';
+      color: #F56C6C;
+      margin-right: 10px;
+    }
    .el-form-item__label,
    .el-radio__label {
      font-size: 18px;
    }
    .obj-form-title{
+      float: none;
      .el-form-item__label,
      .el-form-item__content{
        display: block;
@@ -192,6 +198,22 @@
        }
      }
    }
+    .obj-form-title2{
+      margin-left: 15px;
+    }
+    .obj-form-title3{
+      margin-left: 25px;
+    }
+    .obj-form-title4{
+      margin-left: 35px;
+    }
+    .radio-block{
+      .el-radio-group{
+        .el-radio{
+          display: block;
+        }
+      }
+    }
  }
 </style>

--- a/src/utils/mixins.js
+++ b/src/utils/mixins.js
 import fetch from '@/utils/fetch'
-import { getBaseUrl } from '@/utils/index'
+import { getBaseUrl, getSaasDomain } from '@/utils/index'
 module.exports = {
    data: function () {
@@ -153,6 +153,20 @@ module.exports = {
                data: para
            })
        },
+        // 通用saas-GET请求
+        saasGET(api, para, callback,str) {
+          // para.token = para.token || this.token || "343BCABC890349ACAF357FA79122F9FE"
+          let url = api + this.getUrlPara(para)
+          url = encodeURI(url);
+          return fetch({
+            headers: {
+              sysCode: 9
+            },
+            url: getSaasDomain(url),
+            method: 'get',
+            data: para
+          })
+        },
        // 通用DELETE请求
        DELETE(api, para, callback,str) {

--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -443,7 +443,11 @@ export const ssoLogin = (href, paramMap) => {
        initEnvironment();
    }
 };
+export const ssoLogin2 = () => { //单独部署不走saas端登录
+  console.log("ssoLogin2开始");
+  //获取用户系统信息
+  initEnvironment();
+};
 //单点登录--end

--- a/src/views/followup/plan-manage/dialog/add-patient-time.vue
+++ b/src/views/followup/plan-manage/dialog/add-patient-time.vue
@@ -22,7 +22,7 @@
              type="date"
              placeholder="请选择随访开始时间"
              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
+              value-format="timestamp"
              clearable>
            </el-date-picker>
          </el-form-item>

--- a/src/views/followup/plan-manage/dialog/change-plan.vue
+++ b/src/views/followup/plan-manage/dialog/change-plan.vue
@@ -40,7 +40,7 @@
            v-model="planChangeData.startDate"
            type="date"
            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+            value-format="timestamp"
            placeholder="选择随访开始时间">
          </el-date-picker>
        </el-form-item>
@@ -92,6 +92,9 @@
          planId: [
            { required: true, message: '请选择随访计划', trigger: 'change' },
          ],
+          startDate: [
+            { required: true, message: '请选择随访开始时间', trigger: 'change' },
+          ]
        },
        realGroup: [],
        selectPlanName: ''

--- a/src/views/followup/plan-manage/dialog/set-time-node.vue
+++ b/src/views/followup/plan-manage/dialog/set-time-node.vue
@@ -241,13 +241,13 @@
            }else{
              item.isDisabled = false;
            }
-            if(item.remindList.length > 0){// remindDay 提醒医生预约提前天数
+            if(item.remindList && item.remindList.length > 0){// remindDay 提醒医生预约提前天数
              item.remindDay = []
              item.remindList.forEach((kkk)=>{
                item.remindDay.push(kkk.startDays)
              })
            }
-            if(item.pushContentList.length > 0){//pushDay 推送患教提前天数
+            if(item.pushContentList && item.pushContentList.length > 0){//pushDay 推送患教提前天数
              let pushData = item.pushContentList[0]
              item.hasSelected = pushData.resourceId ? true : false;
              item.pushDay = pushData.startDays
@@ -256,7 +256,7 @@
                header_name: pushData.sendContent
              }
            }
-            if(item.followupList.length > 0){ //followResourceId 随访量表
+            if(item.followupList && item.followupList.length > 0){ //followResourceId 随访量表
              item.followResourceId = []
              item.followupList.forEach((kkk)=>{
                if(this.isStandedTemplate){
@@ -709,7 +709,8 @@
 //        }else{
 //
 //        }
-        if(item.timeNo){
+        console.log(item)
+        if(item.timeNo>=0 && item.timeNo!==''){
          str = '开始后' + String(item.timeNo) + this.timeUnitStr
        }else{
          str = '设置时间节点'

--- a/src/views/followup/plan-manage/new-plan.vue
+++ b/src/views/followup/plan-manage/new-plan.vue
@@ -58,6 +58,7 @@
              ref="beginDate"
              placeholder="请选择随访开始时间"
              :picker-options="pickerOptions"
+              value-format="timestamp"
              clearable
              @blur="handleDateInputConfirm"
              style="width:380px;">
@@ -196,6 +197,8 @@
        this.checkForm = false
         if(val.status){
           this.baseInfo.fPlanTimeReqList = val.setTimeNodeList
+//           this.baseInfo.time = (new Date(this.baseInfo.time).getTime())
+           console.log(this.baseInfo.time)
           // 提交
           createFollowPlan(this.baseInfo).then(res=>{
             if(res.code=='000000'){

--- a/src/views/followup/plan-manage/plan-modify.vue
+++ b/src/views/followup/plan-manage/plan-modify.vue
@@ -252,6 +252,8 @@
            //  关闭弹层，继续创建
            this.planDetailData.fPlanTimeReqList = val.setTimeNodeList
 //            this.planDetailData.joinTime = new Date();
+//            this.planDetailData.joinTime = (new Date(this.planDetailData.joinTime)).getTime()
+            console.log(this.planDetailData.joinTime)
            console.log('修改计划前的数据===>>>',this.planDetailData)
            createFollowPlan(this.planDetailData).then(res=>{
              if(res.code=='000000'){

--- a/src/views/followup/record-manage/form-template.vue
+++ b/src/views/followup/record-manage/form-template.vue
@@ -46,10 +46,6 @@
      stroke,
      BreadCrumb,
    },
-    data(){
-      return {
-      }
-    },
  }
 </script>
@@ -67,7 +63,7 @@
    .patient-base-info{
      line-height: 60px;
      height: 60px;
-      border-bottom: 2px dashed #ccc;
+      border-bottom: 1px dashed #ccc;
    }
    .form-container{
      padding: 40px 10px;

--- a/src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js
-export default [
+export default ($this) => {
-  {
+  return [
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'a1',
+      className: 'obj-form-title',
-    model: 'a1',
+      prop: 'a1',
-    spanNum: 24,
+      model: 'a1',
-    label: '调查时状态',
+      spanNum: 24,
-    options: [
+      label: '调查时状态',
-      { label: '接受调查', value: '1' },
+      options: [
-      { label: '失访', value: '2' },
+        { label: '接受调查', value: '1' },
-      { label: '死亡', value: '3' }
+        { label: '失访', value: '2' },
+        { label: '死亡', value: '3' }
      ],
-    rules: [{ required: true, message: '请选择调查时状态', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择调查时状态', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title2',
-    prop: 'a7',
+      prop: 'a7',
-    model: 'a7',
+      model: 'a7',
-    label: '调查方式',
+      label: '调查方式',
-    linkageRule: [{ name: 'a1', value: ['1'] }],
+      linkageRule: [{ name: 'a1', value: ['1'] }],
-    disabled: false,
+      disabled: false,
-    placeholder: '150',
+      placeholder: '150',
-    spanNum: 24,
+      spanNum: 24,
-    options: [
+      options: [
-      { label: '面对面', value: '1', disabled: false },
+        { label: '面对面', value: '1', disabled: false },
-      { label: '电话（限中危人群，高危人群6个月随访）', value: '2', disabled: false },
+        { label: '电话（限中危人群，高危人群6个月随访）', value: '2', disabled: false },
-    ],
+      ],
-    rules: [{ required: true, message: '请选择调查方式', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择调查方式', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title2',
-    prop: 'a8',
+      prop: 'a8',
-    model: 'a8',
+      model: 'a8',
-    label: '本次调查是否为被调查者本人',
+      label: '本次调查是否为被调查者本人',
-    linkageRule: [{ name: 'a1', value: ['1'] }],
+      linkageRule: [{ name: 'a1', value: ['1'] }],
-    disabled: false,
+      disabled: false,
-    placeholder: '150',
+      placeholder: '150',
-    spanNum: 24,
+      spanNum: 24,
-    options: [
+      options: [
-      { label: '是', value: '1', disabled: false },
+        { label: '是', value: '1', disabled: false },
-      { label: '否', value: '2', disabled: false },
+        { label: '否', value: '2', disabled: false },
-    ],
+      ],
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title3',
-    prop: 'a9',
+      prop: 'a9',
-    model: 'a9',
+      model: 'a9',
-    label: '提供信息者与被调查者之间关系',
+      label: '提供信息者与被调查者之间关系',
-    linkageRule: [{ name: 'a8', value: ['2'] }],
+      linkageRule: [{ name: 'a8', value: ['2'] }],
-    disabled: false,
+      disabled: false,
-    placeholder: '150',
+      placeholder: '150',
-    spanNum: 24,
+      spanNum: 24,
-    options: [
+      options: [
-      { label: '父母', value: '1', disabled: false },
+        { label: '父母', value: '1', disabled: false },
-      { label: '配偶', value: '2', disabled: false },
+        { label: '配偶', value: '2', disabled: false },
-      { label: '子女', value: '3', disabled: false },
+        { label: '子女', value: '3', disabled: false },
-      { label: '兄弟姐妹', value: '4', disabled: false },
+        { label: '兄弟姐妹', value: '4', disabled: false },
-      { label: '其他', value: '5', disabled: false },
+        { label: '其他', value: '5', disabled: false },
-    ],
+      ],
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title4',
-    linkageRule: [{name: 'a9',value: ['5']}],
+      linkageRule: [{name: 'a9',value: ['5']}],
-    prop: 'a10',
+      prop: 'a10',
-    model: 'a10',
+      model: 'a10',
-    label: '其他',
+      label: '其他',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入其他原因',
+      placeholder: '请输入其他原因',
-    spanNum: 12,
+      spanNum: 12,
-    type: 'number',
+      type: 'number',
-    labmsg: '',
+      labmsg: '',
-    // slots: [{ name: 'mmol/L', type: 'append' }]
+      // slots: [{ name: 'mmol/L', type: 'append' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title2',
-    prop: 'a2',
+      prop: 'a2',
-    model: 'a2',
+      model: 'a2',
-    spanNum: 24,
+      spanNum: 24,
-    label: '失访原因',
+      label: '失访原因',
-    linkageRule: [{ name: 'a1', value: ['2'] }],
+      linkageRule: [{ name: 'a1', value: ['2'] }],
-    options: [
+      options: [
-      { label: '失去联系', value: '1' },
+        { label: '失去联系', value: '1' },
-      { label: '拒绝参加调查', value: '2' },
+        { label: '拒绝参加调查', value: '2' },
-      { label: '其他', value: '3' }
+        { label: '其他', value: '3' }
-    ],
+      ],
-    rules: [{ required: true, message: '请选择失访原因', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择失访原因', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title3',
-    linkageRule: [{name: 'a2',value: ['3']}],
+      linkageRule: [{name: 'a2',value: ['3']}],
-    prop: 'a3',
+      prop: 'a3',
-    model: 'a3',
+      model: 'a3',
-    label: '其他',
+      label: '其他',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入其他原因',
+      placeholder: '请输入其他原因',
-    spanNum: 12,
+      spanNum: 12,
-    type: 'number',
+      type: 'number',
-    labmsg: '',
+      labmsg: '',
-    // slots: [{ name: 'mmol/L', type: 'append' }]
+      // slots: [{ name: 'mmol/L', type: 'append' }]
-  },
+    },
-  {
+    {
-    formType: 'date-picker',
+      formType: 'date-picker',
-    className: 'obj-form-title',
+      className: 'obj-form-title2',
-    prop: 'a4',
+      prop: 'a4',
-    model: 'a4',
+      model: 'a4',
-    placeholder: '选择死亡时间',
+      placeholder: '选择死亡时间',
-    label: '死亡时间',
+      label: '死亡时间',
-    linkageRule: [{ name: 'a1', value: ['3'] }],
+      linkageRule: [{ name: 'a1', value: ['3'] }],
-    format: 'yyyy-MM-dd',
+      format: 'yyyy-MM-dd',
-    type: 'date',
+      type: 'date',
-    rules: [{ required: true, message: '请选择死亡时间', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择死亡时间', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title2',
-    prop: 'a5',
+      prop: 'a5',
-    model: 'a5',
+      model: 'a5',
-    label: '死亡原因',
+      label: '死亡原因',
-    linkageRule: [{ name: 'a1', value: ['3'] }],
+      linkageRule: [{ name: 'a1', value: ['3'] }],
-    disabled: false,
+      disabled: false,
-    placeholder: '150',
+      placeholder: '150',
-    spanNum: 24,
+      spanNum: 24,
-    options: [
+      options: [
-      { label: '脑卒中', value: '1', disabled: false },
+        { label: '脑卒中', value: '1', disabled: false },
-      { label: '冠心病', value: '2', disabled: false },
+        { label: '冠心病', value: '2', disabled: false },
-      { label: '恶心肿瘤', value: '3', disabled: false },
+        { label: '恶心肿瘤', value: '3', disabled: false },
-      { label: '呼吸系统疾病', value: '4', disabled: false },
+        { label: '呼吸系统疾病', value: '4', disabled: false },
-      { label: '损伤和中毒', value: '5', disabled: false },
+        { label: '损伤和中毒', value: '5', disabled: false },
-      { label: '不祥', value: '6', disabled: false },
+        { label: '不祥', value: '6', disabled: false },
-      { label: '其他', value: '7', disabled: false },
+        { label: '其他', value: '7', disabled: false },
-    ],
+      ],
-    rules: [{ required: true, message: '请选择死亡原因', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择死亡原因', trigger: 'blur' }]
-  },
+    },
-  {
+    {
-    formType: 'radio',
+      formType: 'radio',
-    className: 'obj-form-title',
+      className: 'obj-form-title3',
-    prop: 'a6',
+      prop: 'a6',
-    model: 'a6',
+      model: 'a6',
-    label: '脑卒中类型',
+      label: '脑卒中类型',
-    linkageRule: [{ name: 'a5', value: ['1'] }],
+      linkageRule: [{ name: 'a5', value: ['1'] }],
-    disabled: false,
+      disabled: false,
-    placeholder: '150',
+      placeholder: '150',
-    spanNum: 24,
+      spanNum: 24,
-    options: [
+      options: [
-      { label: '出血性脑卒中', value: '1', disabled: false },
+        { label: '出血性脑卒中', value: '1', disabled: false },
-      { label: '缺血性脑卒中', value: '2', disabled: false },
+        { label: '缺血性脑卒中', value: '2', disabled: false },
-      { label: '不祥', value: '3', disabled: false },
+        { label: '不祥', value: '3', disabled: false },
-    ],
+      ],
-    rules: [{ required: true, message: '请选择脑卒中类型', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择脑卒中类型', trigger: 'blur' }]
-  },
+    },
-]
+  ]
+}
--- a/src/views/followup/record-manage/models/stroke/dataSourceCheckBody.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceCheckBody.js
--- a/src/views/followup/record-manage/models/stroke/dataSourceCheckLab.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceCheckLab.js
-export default [
+export default ($this) => {
-  {
+  return [
-    formType: 'div',
+    {
-    name: '6.1 血糖',
+      formType: 'div',
-    className: 'sec-title',
+      name: '6.1 血糖',
-  },
+      className: 'sec-title',
-  {
+    },
-    formType: 'date-picker',
+    {
-    className: 'obj-form-title',
+      formType: 'date-picker',
-    prop: 'e1',
+      className: 'obj-form-title',
-    model: 'e1',
+      prop: 'e1',
-    placeholder: '请选择',
+      model: 'e1',
-    label: '检查时间',
+      placeholder: '请选择',
-    format: 'yyyy-MM-dd',
+      label: '检查时间',
-    type: 'date',
+      format: 'yyyy-MM-dd',
-    rules: [{ required: true, message: '检查时间', trigger: 'blur' }],
+      type: 'date',
-    spanNum: 24,
+      rules: [{required: true, message: '检查时间', trigger: 'blur'}],
-  },
+      spanNum: 24,
-  {
+    },
-    formType: 'input',
+    {
-    className: 'obj-form-title',
+      formType: 'input',
-    prop: 'e2',
+      className: 'obj-form-title',
-    model: 'e2',
+      prop: 'e2',
-    label: '空腹血糖',
+      model: 'e2',
-    disabled: false,
+      label: '空腹血糖',
-    placeholder: '请输入',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '请输入',
-    type: 'number',
+      spanNum: 24,
-    labmsg: '次',
+      type: 'number',
-    slots: [{ name: 'mmol/L', type: 'append' }]
+      labmsg: '次',
-  },
+      slots: [{name: 'mmol/L', type: 'append'}]
+    },
-  {
+    {
-    formType: 'div',
+      formType: 'div',
-    name: '6.2 血脂',
+      name: '6.2 血脂',
-    className: 'sec-title',
+      className: 'sec-title',
-  },
+    },
-  {
+    {
-    formType: 'date-picker',
+      formType: 'date-picker',
-    className: 'obj-form-title',
+      className: 'obj-form-title',
-    prop: 'e3',
+      prop: 'e3',
-    model: 'e3',
+      model: 'e3',
-    placeholder: '请选择',
+      placeholder: '请选择',
-    label: '检查时间',
+      label: '检查时间',
-    format: 'yyyy-MM-dd',
+      format: 'yyyy-MM-dd',
-    type: 'date',
+      type: 'date',
-    rules: [{ required: true, message: '检查时间', trigger: 'blur' }],
+      rules: [{required: true, message: '检查时间', trigger: 'blur'}],
-    spanNum: 24,
+      spanNum: 24,
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title',
-    prop: 'e4',
+      prop: 'e4',
-    model: 'e4',
+      model: 'e4',
-    label: '甘油三酯',
+      label: '甘油三酯',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入',
+      placeholder: '请输入',
-    spanNum: 24,
+      spanNum: 24,
-    type: 'number',
+      type: 'number',
-    labmsg: '次',
+      labmsg: '次',
-    slots: [{ name: 'mmol/L', type: 'append' }]
+      slots: [{name: 'mmol/L', type: 'append'}]
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title',
-    prop: 'e5',
+      prop: 'e5',
-    model: 'e5',
+      model: 'e5',
-    label: '胆固醇',
+      label: '胆固醇',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入',
+      placeholder: '请输入',
-    spanNum: 24,
+      spanNum: 24,
-    type: 'number',
+      type: 'number',
-    labmsg: '次',
+      labmsg: '次',
-    slots: [{ name: 'mmol/L', type: 'append' }]
+      slots: [{name: 'mmol/L', type: 'append'}]
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title',
-    prop: 'e6',
+      prop: 'e6',
-    model: 'e6',
+      model: 'e6',
-    label: '低密度脂蛋白胆固醇',
+      label: '低密度脂蛋白胆固醇',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入',
+      placeholder: '请输入',
-    spanNum: 24,
+      spanNum: 24,
-    type: 'number',
+      type: 'number',
-    labmsg: '次',
+      labmsg: '次',
-    slots: [{ name: 'mmol/L', type: 'append' }]
+      slots: [{name: 'mmol/L', type: 'append'}]
-  },
+    },
-  {
+    {
-    formType: 'input',
+      formType: 'input',
-    className: 'obj-form-title',
+      className: 'obj-form-title',
-    prop: 'e7',
+      prop: 'e7',
-    model: 'e7',
+      model: 'e7',
-    label: '高密度脂蛋白胆固醇',
+      label: '高密度脂蛋白胆固醇',
-    disabled: false,
+      disabled: false,
-    placeholder: '请输入',
+      placeholder: '请输入',
-    spanNum: 24,
+      spanNum: 24,
-    type: 'number',
+      type: 'number',
-    labmsg: '次',
+      labmsg: '次',
-    slots: [{ name: 'mmol/L', type: 'append' }]
+      slots: [{name: 'mmol/L', type: 'append'}]
-  },
+    },
-]
+  ]
+}
--- a/src/views/followup/record-manage/models/stroke/dataSourceLifeStyleGuide.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceLifeStyleGuide.js
-export default [
+export default ($this) => {
-  {
+  return [
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b1',
+      className: 'obj-form-title',
-    model: 'b1',
+      prop: 'b1',
-    label: '运动',
+      model: 'b1',
-    disabled: false,
+      label: '运动',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', value: '1', disabled: false },
+      options: [
-      { label: '缺乏运动 (不符合上述经常运动标准者）', value: '2', disabled: false },
+        {label: '经常运动（相当于快步走的中等强度运动，且每周≥3次、每次≥30分钟，包含中度、重度体力劳动者）', value: '1', disabled: false},
-    ],
+        {label: '缺乏运动 (不符合上述经常运动标准者）', value: '2', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b2',
+      className: 'obj-form-title',
-    model: 'b2',
+      prop: 'b2',
-    label: '吸烟',
+      model: 'b2',
-    disabled: false,
+      label: '吸烟',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '否', value: '1', disabled: false },
+      options: [
-      { label: '是', value: '2', disabled: false },
+        {label: '否', value: '1', disabled: false},
-    ],
+        {label: '是', value: '2', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b3',
+      className: 'obj-form-title',
-    model: 'b3',
+      prop: 'b3',
-    label: '饮酒',
+      model: 'b3',
-    disabled: false,
+      label: '饮酒',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '不饮酒', value: '1', disabled: false },
+      options: [
-      { label: '少量饮酒', value: '2', disabled: false },
+        {label: '不饮酒', value: '1', disabled: false},
-      { label: '经常大量饮酒（白酒≥3次/周，每次≥2两）', value: '3', disabled: false },
+        {label: '少量饮酒', value: '2', disabled: false},
-    ],
+        {label: '经常大量饮酒（白酒≥3次/周，每次≥2两）', value: '3', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b4',
+      className: 'obj-form-title',
-    model: 'b4',
+      prop: 'b4',
-    label: '口味',
+      model: 'b4',
-    disabled: false,
+      label: '口味',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '偏咸', value: '1', disabled: false },
+      options: [
-      { label: '偏淡', value: '2', disabled: false },
+        {label: '偏咸', value: '1', disabled: false},
-      { label: '适中', value: '3', disabled: false },
+        {label: '偏淡', value: '2', disabled: false},
-    ],
+        {label: '适中', value: '3', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b5',
+      className: 'obj-form-title',
-    model: 'b5',
+      prop: 'b5',
-    label: '荤素',
+      model: 'b5',
-    disabled: false,
+      label: '荤素',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '偏荤', value: '1', disabled: false },
+      options: [
-      { label: '偏素', value: '2', disabled: false },
+        {label: '偏荤', value: '1', disabled: false},
-      { label: '均衡', value: '3', disabled: false },
+        {label: '偏素', value: '2', disabled: false},
-    ],
+        {label: '均衡', value: '3', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b6',
+      className: 'obj-form-title',
-    model: 'b6',
+      prop: 'b6',
-    label: '吃蔬菜（每日食用6两蔬菜）',
+      model: 'b6',
-    disabled: false,
+      label: '吃蔬菜（每日食用6两蔬菜）',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '≥5天/周', value: '1', disabled: false },
+      options: [
-      { label: '3-4天/周', value: '2', disabled: false },
+        {label: '≥5天/周', value: '1', disabled: false},
-      { label: '≤2天/周', value: '3', disabled: false },
+        {label: '3-4天/周', value: '2', disabled: false},
-    ],
+        {label: '≤2天/周', value: '3', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
-  {
+    },
-    formType: 'radio',
+    {
-    className: 'obj-form-title',
+      formType: 'radio',
-    prop: 'b7',
+      className: 'obj-form-title',
-    model: 'b7',
+      prop: 'b7',
-    label: '吃水果（每日食用4两水果）',
+      model: 'b7',
-    disabled: false,
+      label: '吃水果（每日食用4两水果）',
-    placeholder: '150',
+      disabled: false,
-    spanNum: 24,
+      placeholder: '150',
-    options: [
+      spanNum: 24,
-      { label: '≥5天/周', value: '1', disabled: false },
+      options: [
-      { label: '3-4天/周', value: '2', disabled: false },
+        {label: '≥5天/周', value: '1', disabled: false},
-      { label: '≤2天/周', value: '3', disabled: false },
+        {label: '3-4天/周', value: '2', disabled: false},
-    ],
+        {label: '≤2天/周', value: '3', disabled: false},
-    rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      ],
-  },
+      rules: [{required: true, message: '请选择是否', trigger: 'blur'}]
+    },
-]
+  ]
+}
--- a/src/views/followup/record-manage/models/stroke/dataSourceMainSickControl.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceMainSickControl.js
@@ -21,21 +21,22 @@ export default ($this) => {
    },
    {
      formType: 'input',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      linkageRule: [{name: 'c1',value: ['2']}],
      prop: 'c2',
      model: 'c2',
      label: '发病次数',
      disabled: false,
      placeholder: '请输入发病次数',
-      spanNum: 24,
+      spanNum: 6,
      type: 'number',
      labmsg: '次',
-      slots: [{ name: '次', type: 'append' }]
+      slots: [{ name: '次', type: 'append' }],
+      rules: [{ required: true, message: '请输入发病次数', trigger: 'blur' }]
    },
    {
      formType: 'date-picker',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c3',
      model: 'c3',
      placeholder: '请选择',
@@ -48,7 +49,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c4',
      model: 'c4',
      label: '就诊机构级别',
@@ -65,7 +66,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c5',
      model: 'c5',
      label: '主要诊断',
@@ -82,7 +83,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c6',
      model: 'c6',
      label: '住院期间是否接受康复治疗',
@@ -97,7 +98,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c7',
      model: 'c7',
      label: '出院后是否接受康复治疗',
@@ -131,7 +132,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title radio-block',
      prop: 'c9',
      model: 'c9',
      label: '评分值',
@@ -178,7 +179,7 @@ export default ($this) => {
    },
    {
      formType: 'date-picker',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c15',
      model: 'c15',
      placeholder: '请选择',
@@ -191,12 +192,15 @@ export default ($this) => {
    },
    {
      formType: 'checkbox',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'heartType',
      model: 'heartType',
      label: '心脏病类型',
      linkageRule: [{ name: 'c10', value: ['2'] }],
      disabled: false,
+      changeFun: (val)=>{
+        // console.log(val)
+      },
      spanNum: 24,
      options: [
        { label: '冠心病', value: '1', disabled: false },
@@ -209,7 +213,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title3',
      prop: 'c18',
      model: 'c18',
      label: '冠心病类型',
@@ -225,7 +229,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title3',
      prop: 'c19',
      model: 'c19',
      label: '房颤类型',
@@ -241,7 +245,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c17',
      model: 'c17',
      label: '就诊机构级别',
@@ -270,11 +274,19 @@ export default ($this) => {
        { label: '无', value: '1', disabled: false },
        { label: '有', value: '2', disabled: false },
      ],
-      rules: [{ required: true, message: '请选择是否', trigger: 'blur' }]
+      rules: [{ required: true, message: '请选择是否', trigger: 'blur' }],
+      changeFun(e){
+        if(e == 2) {
+          $this.form = {
+            ...$this.form,
+            medicalUseSituation: []
+          }
+        }
+      }
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c20',
      model: 'c20',
      label: '是否服用抗栓药物',
@@ -289,14 +301,14 @@ export default ($this) => {
    },
    {
      formType: 'checkbox',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
-      prop: 'c21',
+      prop: 'medicalUseSituation',
-      model: 'c21',
+      model: 'medicalUseSituation',
      label: '用药品种',
      linkageRule: [{ name: 'c11', value: ['2'] }],
      disabled: false,
      changeFun: (val)=>{
-        console.log(val)
+        // console.log(val)
      },
      spanNum: 24,
      options: [
@@ -310,7 +322,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c22',
      model: 'c22',
      label: '用药情况',
@@ -347,7 +359,7 @@ export default ($this) => {
    },
    {
      formType: 'date-picker',
-      className: 'obj-form-title',
+      className: 'obj-form-title2',
      prop: 'c23',
      model: 'c23',
      placeholder: '请选择',
@@ -374,7 +386,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title3',
      prop: 'c24',
      model: 'c24',
      label: '是否服降压药',
@@ -389,7 +401,7 @@ export default ($this) => {
    },
    {
      formType: 'radio',
-      className: 'obj-form-title',
+      className: 'obj-form-title3',
      prop: 'c25',
      model: 'c25',
      label: '血压控制情况',

--- a/src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation.js
+++ b/src/views/followup/record-manage/models/stroke/dataSourceTreatmentSituation.js
--- a/src/views/followup/record-manage/patient-scale/stroke.vue
+++ b/src/views/followup/record-manage/patient-scale/stroke.vue
@@ -37,17 +37,16 @@
    data(){
      return {
        addComponents: [
-          {name: 'BaseInfo',dataSource:dataSourceBaseInfo, title: '一、基本信息'},
+          {name: 'BaseInfo',dataSource: dataSourceBaseInfo(this), title: '一、基本信息'},
-          {name: 'DataType',dataSource:dataSourceLifeStyleGuide, title: '二、随访期间生活方式'},
+          {name: 'DataType',dataSource: dataSourceLifeStyleGuide(this), title: '二、随访期间生活方式'},
-          {name: 'DataType',dataSource:dataSourceMainSickControl(this), title: '三、随访期间主要病史及控制情况'},
+          {name: 'DataType',dataSource: dataSourceMainSickControl(this), title: '三、随访期间主要病史及控制情况'},
-          {name: 'DataType',dataSource:dataSourceTreatmentSituation, title: '四、本次随访期间血管病变的外科手术或介入治疗情况'},
+          {name: 'DataType',dataSource: dataSourceTreatmentSituation(this), title: '四、本次随访期间血管病变的外科手术或介入治疗情况'},
-          {name: 'DataType',dataSource:dataSourceCheckBody, title: '五、体格检查（高危人群12个月随访必做）'},
+          {name: 'DataType',dataSource: dataSourceCheckBody(this), title: '五、体格检查（高危人群12个月随访必做）'},
-          {name: 'DataType',dataSource:dataSourceCheckLab, title: '六、实验室检查（高危人群12个月随访必填）'},
+          {name: 'DataType',dataSource: dataSourceCheckLab(this), title: '六、实验室检查（高危人群12个月随访必填）'},
        ],
        form: {
          heartType: [],
-          inputVal: '1',
+          medicalUseSituation: []
-          radioVal: '2'
        },
      }
    },

--- a/src/views/followup/reservation-manage/reservation-list.vue
+++ b/src/views/followup/reservation-manage/reservation-list.vue
@@ -126,7 +126,7 @@
            :current-page="reservationList.pageNo"
            :page-sizes="[10, 20, 50, 100]"
            :page-size="reservationList.pageSize"
-            :total="reservationList.count">
+            :total="statusTotal">
          </el-pagination>
        </div>
      </div>
@@ -197,6 +197,7 @@
        getRowKeys(row) {
          return row.fuPlanPatientTimesId;
        },
+        statusTotal: null, //每种状态的总数
      }
    },
    created() {
@@ -425,9 +426,25 @@
      status(val) {
        this.getReservationList({
          status: val,
+          pageNo: 1,
+          pageSize: 10,
          ...this.setSearchData()
        })
-      }
+      },
+      reservationList(val) {
+        if(this.status == 1) {
+          this.statusTotal = val.unSendCount
+        } else if (this.status == 2) {
+          this.statusTotal = val.waitAcceptCount
+        } else if (this.status == 3) {
+          this.statusTotal = val.acceptedCount
+        } else if(this.status == 4) {
+          this.statusTotal = val.refusedCount
+        } else {
+          this.statusTotal = val.count
+        }
+      },
    }
  }
 </script>

--- a/src/views/login.vue
+++ b/src/views/login.vue