bug fixed

src/views/followup/plan-manage/dialog/change-plan.vue

@@ -16,7 +16,7 @@
             placeholder="请选择">
             <el-option
               v-for="(item, index) in groupList"
-              :key="item.labelId+index"
+              :key="index"
               :label="item.labelName"
               :value="item.labelId">
             </el-option>
@@ -25,8 +25,8 @@
         <el-form-item label="随访计划：" prop="planId">
           <el-select v-model="planChangeData.planId" size="small">
             <el-option
-              v-for="item in planOption"
-              :key="item.id"
+              v-for="(item,index) in planOption"
+              :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
@@ -123,6 +123,7 @@
         this.$emit('closeChangePlan',false);
       },
       changePlans() {
+        const _this = this
         this.$refs['planChangeData'].validate(valid => {
           if (valid) {
             const { planPatientsId, planId, patientId, startDate } = this.planChangeData;
@@ -140,10 +141,11 @@
                 });
                 if(this.$route.name == 'residentList') {
                   this.getResidentList({
-                    planId,
+                    planId: this.planChangeData.planIdOld,
                     status: this.planChangeData.status
                   });
                 } else if(this.$route.name == 'residentDetail') {
+                  this.$router.push({path: '/followup/plan-manage/resident-detail', query: {patientId: patientId, planId: planId}})
                   this.getResidentDetail({
                     planId,
                     patientId
@@ -173,16 +175,19 @@
       planChangeData(val) {
         const _this = this
         let labelList = val.yLabelList
-        labelList.forEach(function (item, index) {
-          let nodeItem  =  _this.groupList.filter(function(item1){
-            return item1.labelId == item;
-          });
-          let pushItem = {
-            labelId: nodeItem[0].labelId,
-            label: nodeItem[0].labelName,
-          }
-          _this.selectedGroup.push(pushItem)
-        })
+        console.log()
+        if(labelList) {
+          labelList.forEach(function (item, index) {
+            let nodeItem  =  _this.groupList.filter(function(item1){
+              return item1.labelId == item;
+            });
+            let pushItem = {
+              labelId: nodeItem[0].labelId,
+              label: nodeItem[0].labelName,
+            }
+            _this.selectedGroup.push(pushItem)
+          })
+        }
       }
     }
   }

src/views/followup/plan-manage/dialog/finish-followup.vue

@@ -11,7 +11,7 @@
         <el-form
           :model="finishData"
           :rules="rules"
-          label-width="100px">
+          label-width="100px" ref="finishData">
           <el-form-item label="居民：">
             {{finishData.patientName}}
           </el-form-item>
@@ -70,41 +70,47 @@
         this.$emit('closeFinishFollowup',false)
       },
       finishFollowUp() {
-        const { changeCode, planId, patientIdList } = this.finishData;
-        finishPlan({
-          changeCode,
-          planId,
-          patientIdList,
-        }).then((data) => {
-          if(data.code == '000000') {
-            this.$message({
-              message: '操作成功！',
-              type: 'success'
-            });
-            if(this.$route.name == 'residentList') {
-              this.getResidentList({
-                planId,
-                status: changeCode
-              })
-            } else if(this.$route.name == 'residentDetail') {
-              this.getResidentDetail({
-                planId,
-                patientId: patientIdList[0]
-              })
-            }
+        this.$refs['finishData'].validate(valid => {
+          if (valid) {
+            const { changeCode, planId, patientIdList } = this.finishData;
+            finishPlan({
+              changeCode,
+              planId,
+              patientIdList,
+            }).then((data) => {
+              if(data.code == '000000') {
+                this.$message({
+                  message: '操作成功！',
+                  type: 'success'
+                });
+                if(this.$route.name == 'residentList') {
+                  this.getResidentList({
+                    planId,
+                    status: changeCode
+                  })
+                } else if(this.$route.name == 'residentDetail') {
+                  this.getResidentDetail({
+                    planId,
+                    patientId: patientIdList[0]
+                  })
+                }
 
-            this.clickClose()
-          } else {
-            this.$message({
-              message: `${data.message}`,
-              type: 'error'
+                this.clickClose()
+              } else {
+                this.$message({
+                  message: `${data.message}`,
+                  type: 'error'
+                });
+              }
+            }).catch((err) => {
+              this.$message({
+                message: `${err.message}`,
+                type: 'error'
+              });
             });
+          } else {
+            return false;
           }
-        }).catch((err) => {
-          this.$message({
-            message: `${err.message}`,
-            type: 'error'
-          });
         });
       }
     }

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

@@ -162,7 +162,8 @@
           planId: this.residentDetail.fPlanDto.id,
           patientId: this.residentDetail.patientId,
           yLabelList: this.residentDetail.labelIdList,
-          startDate:  this.residentDetail.fPlanDto.timeStr
+          startDate:  this.residentDetail.fPlanDto.timeStr,
+          planIdOld: this.residentDetail.fPlanDto.id,
         }
         this.showChangePlan = true;
       },

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

@@ -244,9 +244,10 @@
           planPatientsId: row.fuPlanPatientId,
           planId: this.$route.query.planId,
           patientId: row.patientId,
-          yLabelList: row.labelIdList||[],
+          yLabelList: row.labelIdList,
           startDate:  row.time,
-          status: this.status
+          status: this.status,
+          planIdOld: this.$route.query.planId,
         }
         this.showChangePlan = true;
       },