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/views/followup/plan-manage/dialog/set-time-form.vue

@@ -40,7 +40,7 @@
       </el-form-item>
       <el-form-item label="提醒医生预约居民">
         <el-select
-          v-if="!isStandedTemplate && !planId"
+          v-if="!isStandedTemplate"
           v-model="timeForm.remindDay"
           multiple
           :multiple-limit=3
@@ -56,7 +56,7 @@
 
         <!--固定模板需要填充-->
         <el-select
-          v-if="isStandedTemplate || planId"
+          v-if="isStandedTemplate"
           v-model="timeForm.remindDay"
           multiple
           :multiple-limit=3
@@ -74,7 +74,7 @@
         <div style="display: flex">
 
           <el-select
-            v-if="!isStandedTemplate && !planId"
+            v-if="!isStandedTemplate"
             v-model="timeForm.pushDay"
             placeholder="选择推送时间"
             clearable
@@ -89,7 +89,7 @@
 
           <!--固定模板需要填充-->
           <el-select
-            v-if="isStandedTemplate || planId"
+            v-if="isStandedTemplate"
             v-model="timeForm.pushDay"
             placeholder="选择推送时间"
             clearable
@@ -114,7 +114,7 @@
       </div>
       <el-form-item label="随访登记表">
         <el-select
-          v-if="!isStandedTemplate && !planId"
+          v-if="!isStandedTemplate"
           v-model="timeForm.followResourceId"
           multiple
           :multiple-limit=3
@@ -130,7 +130,7 @@
 
         <!--固定模板需要填充-->
         <el-select
-          v-if="isStandedTemplate || planId"
+          v-if="isStandedTemplate"
           v-model="timeForm.followResourceId"
           multiple
           :multiple-limit=3
@@ -141,7 +141,7 @@
             v-for="(item,index) in formOptionsCopy"
             :key="index"
             :label="item.sendContent"
-            :value="item.startDays">
+            :value="item.resourceId">
           </el-option>
         </el-select>
       </el-form-item>
@@ -224,14 +224,15 @@
               hasSelected: this.timeForm.comentMsg
             })
           }
+
           if(this.timeForm.followupList && this.timeForm.followupList.length > 0){ //followResourceId
             this.formOptionsCopy = this.timeForm.followupList
             this.timeForm.followResourceId = []
             this.timeForm.followupList.forEach((item)=>{
-              this.timeForm.followResourceId.push(item.startDays)
+              this.timeForm.followResourceId.push(item.resourceId)
             })
           }
-
+          console.log(this.formOptionsCopy)
           getPatientNumber({
             patientIdList: this.patientIdList
           }).then(res=>{

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

@@ -144,6 +144,7 @@
 //            console.log(this.isStandedTemplate)
             if(this.isStandedTemplate || this.planId){
               this.deleteAddNode()
+
             }
           }
         }
@@ -221,8 +222,10 @@
               this.$emit('addListenSave',false)
             }
           }else{
+            console.log(this.isStandedTemplate)
+            console.log(this.planId)
             // 不是固定模板
-            if(!this.isStandedTemplate){
+            if(!this.isStandedTemplate && !this.planId){
               if(this.timeForm.remindDay.length>0){
                 this.timeForm.remindDay.forEach((item)=>{
                   this.timeForm.remindList.push({
@@ -360,6 +363,12 @@
       changeTab(val){
         console.log('当前的 activeTab ',val)
         this.activeTab = val;
+console.log(this.setTimeNodeList)
+        console.log(this.setTimeNodeList1)
+//        this.setTimeNodeList1 = this.setTimeNodeList
+//        this.timeForm = this.setTimeNodeList[val];
+//        this.timeForm.formRef = this.getNowTime();
+
 
         if(val == 'setNewRef') {
           this.initNewForm();

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

@@ -269,7 +269,6 @@
        // this.setTimeNodeList = val.fPlanTimeDtoList
         this.setTimeNodeListOnCom(val.fPlanTimeReqList)
 //        console.log(this.setTimeNodeList)
-       // this.patientIdList = val.patientIdList
         this.planId = String(val.id)
         if(val.resourceId){
           this.isStandedTemplate = true