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

Dev follow up 20190312



See merge request !23

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

@@ -18,7 +18,7 @@
           <el-form-item :label="finishData.reasonName" prop="finishReason">
             <el-input
               type="textarea"
-              v-model="finishData.finishReason"
+              v-model="finishData.changeReason"
               placeholder="请输入原因"
               maxlength="30"
               rows="3"
@@ -57,7 +57,7 @@
       return {
         showFinishFollowup: true,
         rules: {
-          finishReason: [
+          changeReason: [
             { required: true, message: '请输入原因', trigger: 'blur' },
             { min: 1, max: 30, message: '长度在30个字符内', trigger: 'blur' }
           ],
@@ -72,12 +72,13 @@
       finishFollowUp() {
         this.$refs['finishData'].validate(valid => {
           if (valid) {
-            const { changeCode, planId, patientIdList, planPatientsIdList } = this.finishData;
+            const { changeCode, planId, patientIdList, planPatientsIdList,changeReason } = this.finishData;
             finishPlan({
               changeCode,
               planId,
               patientIdList,
-              planPatientsIdList
+              planPatientsIdList,
+              changeReason
             }).then((data) => {
               if(data.code == '000000') {
                 this.$message({

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

@@ -462,8 +462,9 @@
         const startDays = len ? pushData[0].startDays : null;
         const resourceId = len ? pushData[0].resourceId : null;
 //        console.log(pushData)
+//        debugger
+        if(len && (startDays!=='' && startDays >= 0) && !resourceId){
           // 如果选了推送时间，没选漫画
-        if(len && (startDays!==''&&startDays >= 0) && !resourceId){
           this.errMsg = '请选择推送的患教漫画';
           this.$message({
             message: this.errMsg,
@@ -477,7 +478,7 @@
             })
           }
           return false;
-        }else if(len && (startDays === '' || !startDays) && startDays!=0 && resourceId){
+        }else if(len && (!startDays && startDays !== 0) && resourceId){
           //如果选了漫画，没选推送时间
           this.errMsg = '请选择推送时间';
           this.$message({