fixed

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

@@ -127,10 +127,10 @@
         this.showFollowTime = true
       },
       goToResidentList() {
-        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId:'1'}})
+        this.$router.push({path: '/followup/plan-manage/resident-list', query: {planId: this.$route.query.planId}})
       },
       changePlan() {
-        this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:'1'}})
+        this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId: this.$route.query.planId}})
       },
       closeFollowTime(isShow) {
         this.showFollowTime = isShow

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

@@ -13,7 +13,7 @@
         </div>
         <div class="plan-btns-group">
           <el-button class="button-white" plain @click="cancelEdit" >取 消</el-button>
-          <el-button class="button-green" type="primary" @click="cancelEdit" >保 存</el-button>
+          <el-button class="button-green" type="primary" @click="saveModify" >保 存</el-button>
         </div>
       </div>
       <el-form ref="baseInfo" :model="planDetail" :rules="rules" label-suffix=":" label-width="140px">
@@ -22,22 +22,12 @@
         </el-form-item>
         <el-form-item label="随访居民" required>
           <div class="select-patients">
-            <el-button plain icon="el-icon-plus" @click="selectPatientHandler">{{planDetail.num ? '继续添加' : '选择居民'}}</el-button><br>
-            <el-button type="text" class="mt10" @click="seeSelectedHandler" v-if="planDetail.num">已选{{planDetail.num}}人<i class="el-icon-arrow-right"></i></el-button>
+            <el-button plain icon="el-icon-plus" @click="selectPatientHandler">{{planDetail.patientIdList ? '继续添加' : '选择居民'}}</el-button><br>
+            <el-button type="text" class="mt10" @click="seeSelectedHandler" v-if="planDetail.patientIdList">已选{{planDetail.patientIdList.length}}人<i class="el-icon-arrow-right"></i></el-button>
           </div>
         </el-form-item>
         <el-form-item label="随访模板" prop="resourceName">
-          <el-select
-            v-model="planDetail.followupTemplate"
-            placeholder="请选择随访模板"
-            clearable>
-            <el-option
-              v-for="item in templateOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
+          {{planDetail.resourceName}}
         </el-form-item>
         <el-form-item label="随访开始时间" prop="timeStr">
           {{planDetail.timeStr}} <el-button class="btn-text" type="text" @click="goToFollowTime">查看全部></el-button>
@@ -65,7 +55,7 @@
       @closeSelectPatient="closeSelectPatient"
       @sureSelectPatient="sureSelectPatient(arguments)">
     </select-patient>
-
+    <has-selected-patient :isShowSelectedDialog="isShowSelectedDialog" :hasSelectedList="residentList.fPlanPatientInfoDtoList" @closeSelectedDialog="closeSelectedDialog" @continueAdd="continueAdd"></has-selected-patient>
     <follow-time :showThisPage="showFollowTime" :nodeTimeList="nodeTimeList" @closeFollowTime="closeFollowTime"></follow-time>
   </div>
 </template>
@@ -122,6 +112,7 @@
           }
         ],
         isShowSelectPatient: false, //显示居民选择框
+        isShowSelectedDialog: false, //显示已选居民
         hasSelectedList: [], //已选居民
         showFollowTime: false,  //是否展示全部时间
       }
@@ -129,15 +120,19 @@
     mounted() {
       this.getPlanDetail(this.$route.query.planId); //获取计划详情
       this.getNodeTimeList(this.$route.query.planId); // 获取随访时间列表
+      this.getResidentList({
+        planId: this.$route.query.planId
+      }); //已选居民
     },
     computed: {
       ...mapState('planManage', {
         planDetail: state => state.planDetail,
-        nodeTimeList: state => state.nodeTimeList
+        nodeTimeList: state => state.nodeTimeList,
+        residentList: state => state.residentList,
       })
     },
     methods: {
-      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList']),
+      ...mapActions('planManage', ['getPlanDetail', 'getNodeTimeList', 'getResidentList']),
       selectPatientHandler() {
         this.isShowSelectPatient = true;
       },
@@ -147,14 +142,21 @@
       seeSelectedHandler() {
         this.isShowSelectedDialog = true;
       },
+      closeSelectedDialog(val) {
+        this.isShowSelectedDialog = val;
+      },
       sureSelectPatient() {
         let getArguments = arguments[0];
         this.isShowSelectPatient = getArguments[0];
         this.hasSelectedList = getArguments[1];
         this.modifyInfo.hasSelectedNum = getArguments[1].length;
       },
+      continueAdd(val) {
+        this.isShowSelectedDialog = val;
+        this.isShowSelectPatient = true;
+      },
       cancelEdit() {
-        this.$confirm('是否放弃本次修改，放弃后数据不能被保存', '', {
+        this.$confirm('是否放弃本次修改?', '', {
           confirmButtonText: '继续修改',
           cancelButtonText: '确定放弃',
           type: 'warning'
@@ -165,6 +167,23 @@
           this.$router.back(-1)
         });
       },
+      saveModify() {
+        this.$confirm('是否确认保存修改内容?', '', {
+          confirmButtonText: '确定',
+            cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          //  关闭弹层，继续创建
+          this.$message({
+            message: '修改成功！',
+            type: 'success'
+          });
+          this.$router.back(-1)
+        }).catch(() => {
+          //  确定放弃，跳出当前编辑页面
+
+        });
+      },
       goToFollowTime() {
         this.showFollowTime = true
       },

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

@@ -58,6 +58,7 @@
         <el-table
           :data="residentList.fPlanPatientInfoDtoList"
           center
+          @selection-change="handleSelectionChange"
           style="width: 100%;margin-top: 20px;">
           <el-table-column
             type="selection"
@@ -167,6 +168,7 @@
         finishData: {}, //结束数据
         isShowSelectPatient: false, //显示居民选择框
         hasSelectedList: [], //已选居民
+        finishPatientList: [], //结束随访居民（多选）
       }
     },
     created() {
@@ -228,9 +230,23 @@
         this.showChangePlan = isShow
       },
       finishFollowup(row) {
-        this.finishData = {
-          patientName: row.patientName,
-        };
+        if(row=='all') {
+          if(this.finishPatientList.length<=0) {
+            this.$message({
+              message: '请选择居民！',
+              type: 'warning'
+            });
+            return;
+          }
+          this.finishData = {
+            patientName: row.patientName,
+          };
+        } else {
+          this.finishData = {
+            patientName: row.patientName,
+          };
+        }
+
         this.showFinishFollowup = true;
       },
       closeFinishFollowup(isShow) {
@@ -248,6 +264,10 @@
         this.hasSelectedList = getArguments[1];
         this.modifyInfo.hasSelectedNum = getArguments[1].length;
       },
+      handleSelectionChange(val) {
+        console.log('已选居民',val)
+        this.finishPatientList = val;
+      }
     },
     watch: {
       status(val) {

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

@@ -84,16 +84,19 @@
             align="center">
           </el-table-column>
           <el-table-column
+            width="160"
             prop="planTime"
             label="随访计划时间"
             align="center">
           </el-table-column>
           <el-table-column
+            width="160"
             prop="appointmentTime"
             label="随访预约时间"
             align="center">
           </el-table-column>
           <el-table-column
+            width="180"
             fixed="right"
             label="操作"
             align="center">