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

src/views/followup/plan-manage/dialog/set-time-form.vue

@@ -204,6 +204,7 @@
         if(this.isStandedTemplate || this.planId){
 //          console.log('表单子组件监听到的form数据',this.timeForm)
           this.timeForm.isDisabled = true
+          console.log(this.timeForm.remindList)
           if(this.timeForm.remindList && this.timeForm.remindList.length > 0){// remindDay
             this.remindOptionsCopy = this.timeForm.remindList
             this.timeForm.remindDay = []

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -255,6 +255,7 @@
                 this.setTimeNodeList.push(this.timeForm);
               }
               this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
+              console.log('addListenSave',this.setTimeNodeList)
               // 保存按钮发起的校验
               if(obj.type=='save'){
                 this.$emit('addListenSave',true)
@@ -267,6 +268,7 @@
             }else{// 是固定模板
               // 只能保存提交
 //              this.setTimeNodeList.push(this.timeForm);
+              console.log('addListenSave',this.setTimeNodeList)
               this.$emit('setTimeNodeListOnCom',this.setTimeNodeList)
               this.$emit('addListenSave',true)
             }

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

@@ -18,25 +18,25 @@
           <el-button class="button-green" type="primary" @click="saveModify" size="small">保 存</el-button>
         </div>
       </div>
-      <el-form ref="baseInfo" :model="planDetail" :rules="rules" label-suffix=":" label-width="140px">
+      <el-form ref="baseInfo" :model="planDetailData" :rules="rules" label-suffix=":" label-width="140px">
         <el-form-item label="随访计划名称" prop="name">
-          <el-input v-model="planDetail.name" maxlength="20" style="width: 30%" size="small" clearable></el-input>
+          <el-input v-model="planDetailData.name" maxlength="20" style="width: 30%" size="small" clearable></el-input>
         </el-form-item>
         <el-form-item label="随访居民" required>
           <div class="select-patients">
-            <el-button plain icon="el-icon-plus" size="small" @click="selectPatientHandler">{{planDetail.patientIdList ? '继续添加' : '选择居民'}}</el-button><br>
-            <el-button type="text" class="mt10" size="small" @click="seeSelectedHandler" v-if="planDetail.patientIdList">已选{{hasSelectedList.length}}人<i class="el-icon-arrow-right"></i></el-button>
+            <el-button plain icon="el-icon-plus" size="small" @click="selectPatientHandler">{{planDetailData.patientIdList ? '继续添加' : '选择居民'}}</el-button><br>
+            <el-button type="text" class="mt10" size="small" @click="seeSelectedHandler" v-if="planDetailData.patientIdList">已选{{hasSelectedList.length}}人<i class="el-icon-arrow-right"></i></el-button>
           </div>
         </el-form-item>
         <el-form-item label="随访模板" prop="resourceName">
-          {{planDetail.resourceName}}
+          {{planDetailData.resourceName}}
         </el-form-item>
         <el-form-item label="随访开始时间" prop="timeStr">
-          {{planDetail.timeStr}} <el-button class="btn-text" type="text" @click="goToFollowTime" size="small">查看全部></el-button>
+          {{planDetailData.timeStr}} <el-button class="btn-text" type="text" @click="goToFollowTime" size="small">查看全部></el-button>
         </el-form-item>
         <el-form-item label="备注">
           <el-select
-            v-model="planDetail.remarksStatus"
+            v-model="planDetailData.remarksStatus"
             placeholder="请选择随访种类"
             size="small"
             clearable>
@@ -53,7 +53,7 @@
         <set-time-node
           :isStandedTemplate="isStandedTemplate"
           :setTimeNodeList="setTimeNodeList"
-          :patientIdList="patientIdList"
+          :patientIdList="planDetailData.patientIdList"
           @setTimeNodeListOnCom="setTimeNodeListOnCom"
           :checkForm="checkForm"
           :planId="planId"
@@ -63,7 +63,7 @@
     </div>
     <select-patient
       :isShowSelectPatient="isShowSelectPatient"
-      :patientIdList="patientIdList"
+      :patientIdList="planDetailData.patientIdList"
       @closeSelectPatient="closeSelectPatient"
       @sureSelectPatient="sureSelectPatient(arguments)">
     </select-patient>
@@ -95,6 +95,7 @@
     },
     data() {
       return {
+        planDetailData: {},
         planId: '',
         isStandedTemplate: false, // 是否是固定的随访模板
         standedTimeNodeList: [], // 如果是国定随访模板，获取固定数据后不可更改，只读
@@ -172,12 +173,12 @@
         this.isShowSelectPatient = getArguments[0];
         const selectPatients = getArguments[1]; // 每次选中获取的人
         selectPatients.forEach((item)=>{
-          if(!this.patientIdList.includes(item.patientId)){
+          if(!this.planDetailData.patientIdList.includes(item.patientId)){
             this.hasSelectedList.push(item)
-            this.patientIdList.push(item.patientId); // 页面中数据存储所有选择的人，没有去重
+            this.planDetailData.patientIdList.push(item.patientId); // 页面中数据存储所有选择的人，没有去重
           }
         })
-        this.hasSelectedNum = this.patientIdList.length;
+        this.planDetailData.hasSelectedNum = this.patientIdList.length;
       },
       continueAdd(val) {
         this.isShowSelectedDialog = val;
@@ -225,8 +226,9 @@
         if(val){
           //  关闭弹层，继续创建
           this.planDetail.joinTime = '2019-04-09T16:00:00.000+0000'
-//          this.setFollowPlan(this.planDetail)
-          createFollowPlan(this.planDetail).then(res=>{
+          this.planDetailData.fPlanTimeReqList = this.setTimeNodeList
+          console.log('修改计划前的数据===>>>',this.planDetailData)
+          createFollowPlan(this.planDetailData).then(res=>{
             if(res.code=='000000'){
               this.getTimeNodeList([]);
               //  各种校验通过后，提交编辑内容，toast提示
@@ -263,7 +265,7 @@
     watch: {
       planDetail(val) {
 //        console.log(val)
-       // this.setTimeNodeList = val.fPlanTimeDtoList
+        this.planDetailData = val
         this.setTimeNodeListOnCom(val.fPlanTimeReqList)
 //        console.log(this.setTimeNodeList)
         this.planId = String(val.id)