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

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

.gitignore

@@ -6,4 +6,5 @@ dist/
 /yqy/
 node_modules/
 .DS_Store
-.vscode
+.vscode/
+.idea/

.vscode/settings.json

-{
-    "editor.fontSize": 15
-}
\ No newline at end of file

src/App.vue

@@ -48,10 +48,10 @@ export default {
 	},
 	created() {
 		vm = this
-		vm.getToken()
+		// vm.getToken()
 	},
 	mounted() {
-	
+
 	},
 	methods: {
 		// 解密token
@@ -69,13 +69,13 @@ export default {
 				} else {
 					if(!localStorage.getItem('storageToken')) {
 						window.location.href = getLoginUrl('?from=work&type=logout')  // 没有token返回登录页面
-						return 
-					} 
+						return
+					}
 				}
 			}else {
 				if(!localStorage.getItem('storageToken')) {
 					window.location.href = getLoginUrl('?from=work&type=logout')  // 没有token返回登录页面
-					return 
+					return
 				}
 			}
 			vm.changeToken(vm.token)

src/utils/followup/followapis.js

@@ -60,7 +60,7 @@ export const getPlanDetail = (planId) => {
 export const getNodeTimeList = (planId) => {
   return fetch({
     headers,
-    url: getFollowUpSC(`/followup/plans/${planId}/time`),
+    url: getFollowUpSC(`/followup/plan/${planId}/time`),
     method: 'get',
     description: '获取随访时间节点列表',
   })

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

@@ -80,13 +80,45 @@
           name: '',
           startYear: '0',
         },
-        timeRangeList:[{
+        timeRangeList:[
+          {
           label: '2019年',
           value: 1
         },{
-          label: '2018年',
+          label: '2020年',
           value: 2
-        }],
+        }, {
+          label: '2021年',
+          value: 3
+        },{
+          label: '2022年',
+          value: 4
+        },{
+          label: '2023年',
+          value: 5
+        },{
+          label: '2024年',
+          value: 6
+        },{
+          label: '2025年',
+          value: 7
+        },{
+          label: '2026年',
+          value: 8
+        },{
+          label: '2027年',
+          value: 9
+        },{
+          label: '2028年',
+          value: 10
+        },{
+          label: '2029年',
+          value: 11
+        },{
+          label: '2030年',
+          value: 12
+        }
+        ],
         paginationSet: {
           pageNo: 1,
           pageSize: 10,

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

@@ -36,11 +36,11 @@
         </div>
         <div class="table-content">
           <el-radio-group v-model="activeName" @change="handlerClick" size="small">
-            <el-radio-button label="0">全部（{{recordList.count}}）</el-radio-button>
-            <el-radio-button label="1">已完成（{{recordList.acceptCount}}）</el-radio-button>
-            <el-radio-button label="2">未完成（{{recordList.refuseCount}}）</el-radio-button>
+            <el-radio-button label="">全部({{recordList.count}})</el-radio-button>
+            <el-radio-button label="2">已完成({{recordList.finishedCount}})</el-radio-button>
+            <el-radio-button label="1">未完成({{recordList.unfinishedCount}})</el-radio-button>
           </el-radio-group>
-          <el-table :data="recordList.fuPlanInfoList" style="width: 100%;margin-top: 20px;">
+          <el-table :data="recordList.enteringDtos" style="width: 100%;margin-top: 20px;">
           <el-table-column prop="nickname" label="姓名" min-width="100" align="center">
             <template slot-scope="scope">
               <span style="cursor: pointer" @click="visitDetail(scope.row)">{{scope.row.nickname}}</span>
@@ -71,7 +71,7 @@
           <el-row type="flex" justify="end" class="margin-top20">
             <el-pagination
               background
-              v-if="recordList.fuPlanInfoList"
+              v-if="recordList.enteringDtos"
               @size-change="handleSizeChangePre"
               @current-change="handleCurrentChangePre"
               layout="total, sizes, prev, pager, next, jumper"
@@ -112,7 +112,7 @@
           nickname: '',
           mobilePhone: ''
         },
-        activeName: 0,
+        activeName: '',
         paginationSet: {
           pageNo: 1,
           pageSize: 10,
@@ -146,30 +146,31 @@
       // ...mapActions('reservationManage', ['getConstantsData']),
       ...mapActions('recordManage', ['getRecordList', 'getEnteringInfo']),
       async search(currentPage){
-        if(this.timeRangeList.length>0) {
+        if(this.timeRangeList) {
           this.searchData.beginTime = this.timeRangeList[0];
           this.searchData.endTime = this.timeRangeList[1];
+        }else {
+          this.searchData.beginTime = '';
+          this.searchData.endTime = '';
         }
         await this.getRecordList({
-          info: {
-            ...this.searchData,
-            status: this.activeName,
-            pageNo: currentPage || this.paginationSet.pageNo,
-            pageSize: this.paginationSet.pageSize,
-          },
+          ...this.searchData,
+          status: this.activeName,
+          pageNo: currentPage || this.paginationSet.pageNo,
+          pageSize: this.paginationSet.pageSize,
         });
-        const {pageNo, pageSize, count, acceptCount, refuseCount} = this.recordList;
-        if(this.activeName == 0){
+        const {pageNo, pageSize, count, finishedCount, unfinishedCount} = this.recordList;
+        if(this.activeName == ''){
           this.paginationSet.total = count;
+        }else if(this.activeName == 2){
+          this.paginationSet.total = finishedCount;
         }else if(this.activeName == 1){
-          this.paginationSet.total = acceptCount;
-        }else {
-          this.paginationSet.total = refuseCount;
+          this.paginationSet.total = unfinishedCount;
         }
         this.paginationSet = {
           ...this.paginationSet,
           pageNo,
-          pageSize: 10,
+          pageSize: pageSize,
         }
       },
       reseat(){
@@ -177,11 +178,12 @@
         this.searchData.nickname = '';
         this.searchData.mobilePhone = '';
         this.timeRangeList = [];
+        this.searchData.beginTime = '';
+        this.searchData.endTime = '';
         this.search(1);
       },
       async visitDetail(row){
         await this.getEnteringInfo({patientId:row.patientId,fuPlanPatientTimesId:row.fuPlanPatientTimesId});
-        //await this.getEnteringInfo({});
         this.dialogDetailShow = true;
         // this.enteringRow = row;