no message

src/utils/fetch.js

@@ -14,8 +14,8 @@ service.interceptors.request.use(config => {
   if( config.headers['sysCode']==undefined) {
     config.headers['sysCode'] = 12
   }
-  config.headers['token'] = '807108DB003F4304A1037E8CD15BAA93'
-  //config.headers['token'] = localStorage.getItem('storageToken')
+  // config.headers['token'] = '8143DC2A026B4602BF7B746FB5AEE9A1'
+  config.headers['token'] = localStorage.getItem('storageToken')
   config.headers['deviceInfo'] = JSON.stringify({ "app_channel": "", "app_mac": "", "app_uuid": "", "app_version": "", "device_brand": "", "device_ip": "", "device_model": "", "device_net": "", "device_ops": "", "resolution_wh": "", "system_level": "", "device_type": '10' })
   // if (config.data && config.data.setEntry) {
   //   config.headers['sysCode'] = config.data.sysCode || 10

src/utils/followup/followapis.js

@@ -250,9 +250,8 @@ export const getBasicData = (params) => {
 // 获取所有漫画列表
 export const getAllEducationComtent = (data) => {
   return fetch({
-    headers:{},
-    // url: getFollowUpSC(`/patientEdus/postEducationComtentList/`),
-    url: 'https://www.yunqueyi.com/web/patientEdus/postEducationComtentList',
+    headers,
+    url: getFollowUpSC(`/healths/comtent/workstation/list`),
     method: 'post',
     data: data,
     description: '获取所有漫画列表'

src/views/followup/plan-manage/dialog/select-cartoon.vue

@@ -62,8 +62,13 @@
 
         diseaseId: '',//所选疾病id
         typeId: '',//所选分类id
-        typeList : [], // 分类列表
-        diseaseOptions: [
+        typeList : [ // 分类列表
+          {
+            no: '',
+            value: '全部'
+          }
+        ],
+        diseaseOptions: [ //疾病列表
           {
             no: '',
             value: '全部'
@@ -81,10 +86,11 @@
             numList: 'P036,P004'
           }).then(res=>{
             this.diseaseOptions = this.diseaseOptions.concat(res.data.P004)
-            this.typeList = res.data.P036
+            this.typeList = this.typeList.concat(res.data.P036)
           })
-          getAllEducationComtent().then(res=>{
-
+          getAllEducationComtent({}).then(res=>{
+//            res.data.picapEducationComtentsForHypertension
+//            res.data.picapEducationComtentsForNotHypertension
           })
         }
       }

src/views/followup/plan-manage/dialog/select-patient.vue

@@ -26,7 +26,7 @@
                 v-for="(item,index) in ageOptions"
                 :key="index"
                 :label="item.value"
-                :value="item.no">
+                :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -143,9 +143,6 @@
           labelId: '分组',
           searchCondition: ''
         },
-
-//        searchPara.ageBegin =  $scope.ageDate($scope.search.age).ageBegin
-//      searchPara.ageEnd =  $scope.ageDate($scope.search.age).ageEnd
         paginationSet: {
           pageNum: 1,
           pageSize: 5,
@@ -206,8 +203,8 @@
           diseaseId: opts.diseaseId,
           age: opts.age,
           sex: opts.sex,
-//          ageBegin:'',
-//          ageEnd:'',
+          ageBegin: opts.ageBegin,
+          ageEnd: opts.ageEnd,
           srvPackageId:opts.srvPackageId,
           searchCondition:opts.searchCondition,
         }).then(res=>{
@@ -257,28 +254,29 @@
         })
       },
       changeSex(val){
-        console.log(val)
         this.getPatientsList({
           sex: val,
           pageNum: this.paginationSet.pageNum
         })
       },
       changeAge(val){
-        console.log(val)
+        if(val=='年龄范围'){
+          val = null
+        }
         this.getPatientsList({
           age: val,
+          ageBegin: this.ageDate(val).ageBegin,
+          ageEnd: this.ageDate(val).ageEnd,
           pageNum: this.paginationSet.pageNum
         })
       },
       changeDisease(val){
-        console.log(val)
         this.getPatientsList({
           diseaseId: val,
           pageNum: this.paginationSet.pageNum
         })
       },
       changeLabel(val){
-        console.log(val)
         this.getPatientsList({
           labelId: val,
           pageNum: this.paginationSet.pageNum

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

@@ -202,7 +202,8 @@
       nextClick(formName) {
         this.getTimeNodeList([]);
         //为方便调试，不做校验
-        // this.activeTab = 'second';
+         this.activeTab = 'second';
+
         //用作校验
         if(!this.baseInfo.hasSelectedNum) {
           this.noChoice = true