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/store/followup/planManage.js

@@ -5,6 +5,7 @@ import {getPlanList,
   getResidentList,
   getGroupList,
   getResidentDetail,
+  getBasicData,
   changePlan} from '../../utils/followup/followapis'
 
 export default {
@@ -24,6 +25,8 @@ export default {
     timeNodeList: [],
     setTimeNodeList: [], //新建计划设置时间节点
     planList: {}, //随访计划列表
+    remarkOption: [], //随访计划备注常量
+    planStatusOption: [], //随访计划状态常量
   },
   mutations: {
     GET_RESIDENT_LIST(state, payload) {
@@ -39,6 +42,12 @@ export default {
     GET_PLAN_DETAIL(state, payload) {
       state.planDetail = payload
     },
+    GET_REMARK_OPTION(state, payload) {
+     state.remarkOption = payload.P211
+    },
+    GET_PLAN_STATUS_OPTION(state, payload) {
+      state.planStatusOption = payload.P216
+    },
     GET_NODE_TIME_LIST(state, payload) {
       state.nodeTimeList = payload
     },
@@ -83,6 +92,20 @@ export default {
         context.commit('GET_PLAN_DETAIL', data);
       });
     },
+    getRemarkOption(context, payload) {
+      getBasicData({
+        numList: 'P211'
+      }).then(({data}) => {
+        context.commit('GET_REMARK_OPTION', data);
+      });
+    },
+    getPlanStatusOption(context, payload) {
+      getBasicData({
+        numList: 'P216'
+      }).then(({data}) => {
+        context.commit('GET_PLAN_STATUS_OPTION', data);
+      });
+    },
     getNodeTimeList(context, payload) {
       getNodeTimeList(payload).then(({data}) => {
         context.commit('GET_NODE_TIME_LIST', data);

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

@@ -39,10 +39,10 @@
             size="small"
             clearable>
             <el-option
-              v-for="item in kindOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item in remarkOption"
+              :key="item.no"
+              :label="item.value"
+              :value="item.no">
             </el-option>
           </el-select>
         </el-form-item>
@@ -103,15 +103,6 @@
             label: '随访模板三'
           }
         ],
-        kindOptions: [
-          {
-            value: 0,
-            label: '上门随访'
-          }, {
-            value: 1,
-            label: '术后随访'
-          }
-        ],
         isShowSelectPatient: false, //显示居民选择框
         isShowSelectedDialog: false, //显示已选居民
         hasSelectedList: [], //已选居民
@@ -120,20 +111,23 @@
     },
     mounted() {
       this.getPlanDetail(this.$route.query.planId); //获取计划详情
+      this.getRemarkOption()
       this.getNodeTimeList(this.$route.query.planId); // 获取随访时间列表
       this.getResidentList({
         planId: this.$route.query.planId
       }); //已选居民
+
     },
     computed: {
       ...mapState('planManage', {
         planDetail: state => state.planDetail,
         nodeTimeList: state => state.nodeTimeList,
         residentList: state => state.residentList,
+        remarkOption: state => state.remarkOption
       })
     },
     methods: {
-      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList']),
+      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList', 'getRemarkOption']),
       selectPatientHandler() {
         this.isShowSelectPatient = true;
       },

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

@@ -178,16 +178,18 @@
       this.getResidentList({
         planId: this.$route.query.planId
       });
+      this.getPlanStatusOption()
       this.getGroupList(); //获取分组列表
     },
     computed: {
       ...mapState('planManage',{
         residentList: state => state.residentList,
-        groupList: state => state.groupList
+        groupList: state => state.groupList,
+        planStatusOption: state => state.planStatusOption
       })
     },
     methods: {
-      ...mapActions('planManage', ['getResidentList', 'getGroupList']),
+      ...mapActions('planManage', ['getResidentList', 'getGroupList', 'getPlanStatusOption']),
       handleSizeChangePre(pageSize) {
         this.getResidentList({
           pageSize,