Merge branch 'dev-followUp-20190312' into 'release_followup'

Dev follow up 20190312



See merge request !18

src/store/followup/workbench.js

@@ -9,7 +9,7 @@ export default  {
   },
   mutations: {
     GET_TODAY_PLAN_LIST(state, payload) {
-      console.log('返回数据', payload)
+      // console.log('返回数据', payload)
       state.todayPlansList = payload
     },
     GET_TODAY_APPOINTS_LIST(state, payload) {

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

@@ -35,7 +35,7 @@
                         size="small"
                         placeholder="请输入"
                         :disabled="itemIsDisabled(itemTimeForm)"
-                        @blur="timeNoBlur(itemTimeForm)"
+                        @blur="timeNoBlur"
                         maxlength="2"
                         clearable />
                     </el-form-item>
@@ -201,7 +201,7 @@
       this.getConstData();
     },
     mounted(){
-      console.log(this.resourceId)
+//      console.log(this.resourceId)
       if(!this.planId){//新建计划
         this.initNewForm();
       }
@@ -216,8 +216,8 @@
         }
       },
       resourceId(val){
-        console.log('props=',val)
-        console.log('activeResourceId=',this.activeResourceId)
+//        console.log('props=',val)
+//        console.log('activeResourceId=',this.activeResourceId)
         if(parseFloat(val) >= 0){
           if(val!==this.activeResourceId){
             this.activeTab = 0 + '';
@@ -238,7 +238,7 @@
           this.timeUnit = this.setTimeNodeList[0].timeUnit
           // 这里操作时间节点的数据
           this.setTimeNodeList.forEach((item,index)=>{
-            if((index > 0 && !this.isStandedTemplate) || this.isStandedTemplate){
+            if((index > 0 && !this.isStandedTemplate) || this.isStandedTemplate || !item.change){
               item.isDisabled = true;
               item.timeUnit = this.timeUnit;
             }else{
@@ -445,7 +445,7 @@
         const len = pushData.length;
         const startDays = len ? pushData[0].startDays : null;
         const resourceId = len ? pushData[0].resourceId : null;
-        console.log(pushData)
+//        console.log(pushData)
         // 如果选了推送时间，没选漫画
         if(len && (startDays!==''&&startDays >= 0) && !resourceId){
           this.errMsg = '请选择推送的患教漫画';
@@ -500,9 +500,10 @@
         this.checkIsRepeat(timeNo);
       },
       // 检查是否重复
-      checkIsRepeat(val){
+      checkIsRepeat(val,lastIndex){
+        const inx = lastIndex ? lastIndex : this.activeTab;
         for(let i=0;i<this.setTimeNodeList.length;i++){
-          if(this.activeTab!=i && val==this.setTimeNodeList[i].timeNo){
+          if(inx!=i && val==this.setTimeNodeList[i].timeNo){
             this.isValied = false;
             this.errMsg = '时间节点重复';
             this.timeIsRepeat = true;
@@ -510,7 +511,13 @@
               message: this.errMsg,
               type: 'error'
             });
-            this.setTimeNodeList[this.activeTab].timeNo = '';
+            this.setTimeNodeList[inx].timeNo = '';
+//            if(lastIndex){
+//              this.setTimeNodeList[inx].timeNo = '';
+//            }else{
+//              this.setTimeNodeList[this.activeTab].timeNo = '';
+//            }
+
             return;
           }
           this.isValied = true;
@@ -534,9 +541,11 @@
       },
       // 时间失去焦点
       timeNoBlur(itemTimeForm){
+        const lastIndex = this.activeTab;
+        const timeNo = this.setTimeNodeList[this.activeTab].timeNo;
         setTimeout(()=>{
           // 这里设置定时器是因为，如果填完时间，直接点击随访方式radio，会立即出发排序和重复事件
-          this.checkIsRepeat(itemTimeForm.timeNo);
+          this.checkIsRepeat(timeNo,lastIndex);
 //          // 新增成功之后
 //          this.setTimeNodeList = this.sortKey(this.setTimeNodeList,'timeNo');
         },300)
@@ -721,16 +730,6 @@
       // 显示tab文字
       showTabLabel(item){
         let str;
-//        if(this.isStandedTemplate || this.planId){
-//          if(item.timeNo){
-//            str = '开始后' + String(item.timeNo) + this.timeUnitStr
-//          }else{
-//            str = '设置时间节点'
-//          }
-//        }else{
-//
-//        }
-//        console.log(item)
         if(item.timeNo>=0 && item.timeNo!==''){
           str = '开始后' + String(item.timeNo) + this.timeUnitStr
         }else{

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

@@ -193,12 +193,12 @@
       },
       // 监听保存校验结果
       addListenSave(val){
-         console.log('监听保存校验结果',val)
+//         console.log('监听保存校验结果',val)
         this.checkForm = false
          if(val.status){
            this.baseInfo.fPlanTimeReqList = val.setTimeNodeList
 //           this.baseInfo.time = (new Date(this.baseInfo.time).getTime())
-           console.log(this.baseInfo.time)
+//           console.log(this.baseInfo.time)
            // 提交
            createFollowPlan(this.baseInfo).then(res=>{
              if(res.code=='000000'){
@@ -243,7 +243,7 @@
         this.isShowSelectPatient = getArguments[0];
         const selectPatients = getArguments[1]; // 每次选中获取的人
         this.hasSelectedList = selectPatients;
-        console.log('呵呵呵呵',arguments)
+//        console.log('呵呵呵呵',arguments)
         this.baseInfo.patientIdList = [];
         selectPatients.forEach((item)=>{
           this.baseInfo.patientIdList.push(item.patientId);
@@ -281,7 +281,7 @@
             this.noChoice = false
           }
           if (valid) {
-            console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
+//            console.log('当前选择的随访模板id为',this.baseInfo.resourceId)
             this.resourceId = String(this.baseInfo.resourceId)
 //            console.log( this.baseInfo.resourceId)
             if(this.baseInfo.resourceId){

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

@@ -247,7 +247,7 @@
       },
       // 监听保存校验结果
       addListenSave(val){
-        console.log('监听保存校验结果',val)
+//        console.log('监听保存校验结果',val)
         this.checkForm = false
         if(val.status){
           this.$confirm('是否确认保存修改内容?', '', {
@@ -260,8 +260,8 @@
             this.planDetailData.fPlanTimeReqList = val.setTimeNodeList
 //            this.planDetailData.joinTime = new Date();
 //            this.planDetailData.joinTime = (new Date(this.planDetailData.joinTime)).getTime()
-            console.log(this.planDetailData.joinTime)
-            console.log('修改计划前的数据===>>>',this.planDetailData)
+//            console.log(this.planDetailData.joinTime)
+//            console.log('修改计划前的数据===>>>',this.planDetailData)
             createFollowPlan(this.planDetailData).then(res=>{
               if(res.code=='000000'){
                 //  各种校验通过后，提交编辑内容，toast提示

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

@@ -204,7 +204,7 @@
     },
     watch: {
       timeNodeList(val) {
-        console.log('val1',val)
+//        console.log('val1',val)
         if(val&&val.length) {
           this.timeNodes = val[0].id
         }
@@ -214,7 +214,7 @@
         this.nodePlanPatientsTimesId =  this.timeNodeList.filter(function(item){
           return item.id == val;
         });
-        console.log(this.nodePlanPatientsTimesId)
+//        console.log(this.nodePlanPatientsTimesId)
       },
       residentDetail(val) {
         this.planDetails = val.fPlanDto

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

@@ -356,7 +356,7 @@
             patientNames.push(item.patientName)
             planPatientsIdList.push(item.fuPlanPatientId)
           });
-          console.log(patientIds)
+//          console.log(patientIds)
           if(patientNames.length>5) {
             const le = patientNames.length
             patientNames = patientNames.slice(0,5)
@@ -431,7 +431,7 @@
         this.showAddPatientTime = true
       },
       handleSelectionChange(val) {
-        console.log('已选居民',val)
+//        console.log('已选居民',val)
         this.finishPatientList = val;
       }
     },

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo2.js

@@ -19,7 +19,7 @@ export default ($this) => {
       ],
       rules: [{ required: true, message: '请选择调查时状态', trigger: ['submit','change'] }],
       changeFun: (e)=>{
-        console.log(e)
+        // console.log(e)
         if(e == '失访' || e=='死亡'){
           $this.showModule = false;
         }else{

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

@@ -176,7 +176,7 @@
       },
       changeHandler(val) {
         this.getReservationPatients({makeAnAppointDate: val});
-        console.log('日期',this.getRevervationNum)
+//        console.log('日期',this.getRevervationNum)
       },
     }
   }