From 4c645ce08bb9b1de65ade19c5c5a67973bacf141 Mon Sep 17 00:00:00 2001
From: gaolu <12345678>
Date: Thu, 28 Nov 2019 11:51:03 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=AD=97=E5=8F=B7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/milestone/addMilestone.vue  | 6 +++---
 src/views/ebiz/milestone/editMilestone.vue | 6 +++---
 src/views/ebiz/milestone/milestoneList.vue | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/milestone/addMilestone.vue b/src/views/ebiz/milestone/addMilestone.vue
index ea83060fb..d78fbce45 100644
--- a/src/views/ebiz/milestone/addMilestone.vue
+++ b/src/views/ebiz/milestone/addMilestone.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="addMilesone fs15">
     <van-cell-group>
-      <van-field v-model="noticeDate" class="fs15" label="提醒日期" v-validate="'required'" name="提醒日期" placeholder="请选择" @click="show = true" :readonly="true"/>
+      <van-field v-model="noticeDate" class="fs12" label="提醒日期" v-validate="'required'" name="提醒日期" placeholder="请选择" @click="show = true" :readonly="true"/>
     </van-cell-group>
     <van-cell-group>
-      <van-field v-model="noticeTime" class="fs15" label="提醒时间" v-validate="'required'" name="提醒时间" placeholder="请选择" @click="timeShow = true" :readonly="true"/>
+      <van-field v-model="noticeTime" class="fs12" label="提醒时间" v-validate="'required'" name="提醒时间" placeholder="请选择" @click="timeShow = true" :readonly="true"/>
     </van-cell-group>
     <van-cell-group>
-      <van-field v-model="eventContent" label="事件内容" v-validate="'required'" name="事件内容" placeholder="请输入" class="text fs15"  type="textarea"/>
+      <van-field v-model="eventContent" label="事件内容" v-validate="'required'" name="事件内容" placeholder="请输入" class="text fs12"  type="textarea"/>
     </van-cell-group>
     <van-button type="danger" @click="save" class="bottom-btn fs16">保存</van-button>
     <van-popup v-model="show" position="bottom">
diff --git a/src/views/ebiz/milestone/editMilestone.vue b/src/views/ebiz/milestone/editMilestone.vue
index 64b11cd4a..efac0267e 100644
--- a/src/views/ebiz/milestone/editMilestone.vue
+++ b/src/views/ebiz/milestone/editMilestone.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="editMilesone">
     <van-cell-group>
-      <van-field v-model="noticeDate" class="fs15" label="提醒日期" v-validate="'required'" name="提醒日期" placeholder="请选择" @click="show = true" :readonly="true"/>
+      <van-field v-model="noticeDate" class="fs12" label="提醒日期" v-validate="'required'" name="提醒日期" placeholder="请选择" @click="show = true" :readonly="true"/>
     </van-cell-group>
     <van-cell-group>
-      <van-field v-model="noticeTime" class="fs15" label="提醒时间" v-validate="'required'" name="提醒时间" placeholder="请选择" @click="timeShow = true" :readonly="true"/>
+      <van-field v-model="noticeTime" class="fs12" label="提醒时间" v-validate="'required'" name="提醒时间" placeholder="请选择" @click="timeShow = true" :readonly="true"/>
     </van-cell-group>
     <van-cell-group>
-      <van-field v-model="eventContent" label="事件内容" v-validate="'required'" name="事件内容" placeholder="请输入" class="text fs15" type="textarea"/>
+      <van-field v-model="eventContent" label="事件内容" v-validate="'required'" name="事件内容" placeholder="请输入" class="text fs12" type="textarea"/>
     </van-cell-group>
     <van-button type="danger" @click="save" class="bottom-btn fs16">保存</van-button>
     <van-popup v-model="show" position="bottom">
diff --git a/src/views/ebiz/milestone/milestoneList.vue b/src/views/ebiz/milestone/milestoneList.vue
index fe8ff26e6..04e8c4a3b 100644
--- a/src/views/ebiz/milestone/milestoneList.vue
+++ b/src/views/ebiz/milestone/milestoneList.vue
@@ -7,7 +7,7 @@
       @load="onLoad"
       
     >
-    <div class="bg-white radius5 mh15 pr15 pl10 mb20 mt5 pt10 fs15" v-for="(item,index) in list" :key="index">
+    <div class="bg-white radius5 mh15 pr15 pl10 mb20 mt5 pt10 fs12" v-for="(item,index) in list" :key="index">
       <van-row class="card-row">
         <van-col span="6" >提醒日期</van-col>
         <van-col span="18" >{{item.noticeDate}} </van-col>

From 7a193bd122cc05185cffff6c250672764ff397b8 Mon Sep 17 00:00:00 2001
From: gaolu <12345678>
Date: Thu, 28 Nov 2019 12:13:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E9=87=8D=E8=A6=81=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/milestone/milestoneList.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/milestone/milestoneList.vue b/src/views/ebiz/milestone/milestoneList.vue
index 04e8c4a3b..34dcdc1a3 100644
--- a/src/views/ebiz/milestone/milestoneList.vue
+++ b/src/views/ebiz/milestone/milestoneList.vue
@@ -2,10 +2,11 @@
   <div class="milestone pb45">
     <van-list
       v-model="loading"
+      :immediate-check="false"
       :finished="finished"
-      finished-text="没有更多了"
+      :finished-text="finishedText"
       @load="onLoad"
-      
+      class="pb45"
     >
     <div class="bg-white radius5 mh15 pr15 pl10 mb20 mt5 pt10 fs12" v-for="(item,index) in list" :key="index">
       <van-row class="card-row">
@@ -51,11 +52,12 @@ import { Dialog, List,Toast,Row, Col,} from 'vant'
         list:[],
         loading: false,
         finished: false,
-        pageNum:1
+        pageNum:1,
+        finishedText: '没有更多了',
       }
     },
     mounted(){
-      
+      this.onLoad()
     },
     methods:{
       onLoad() {

From 89a4e5125688bd1382c21bda9143bb1090d26f1d Mon Sep 17 00:00:00 2001
From: gaolu <12345678>
Date: Thu, 28 Nov 2019 12:17:36 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/milestone/addMilestone.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/milestone/addMilestone.vue b/src/views/ebiz/milestone/addMilestone.vue
index d78fbce45..faae5b31c 100644
--- a/src/views/ebiz/milestone/addMilestone.vue
+++ b/src/views/ebiz/milestone/addMilestone.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="addMilesone fs15">
+  <div class="addMilesone">
     <van-cell-group>
       <van-field v-model="noticeDate" class="fs12" label="提醒日期" v-validate="'required'" name="提醒日期" placeholder="请选择" @click="show = true" :readonly="true"/>
     </van-cell-group>
@@ -69,7 +69,7 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
         let data = {
           token: localStorage.getItem('token'),
           eventDTO:{
-            id: $this.item.id, //事件id  新增传null 修改必传
+            id: null, //事件id  新增传null 修改必传
             customerNumber: localStorage.getItem('customerNumber'),// 客户号
             eventContent: $this.eventContent,// 事件内容
             noticeDate: $this.noticeDate,//提示日期 yyyy-MM-dd

From 9113f25d2f82c81855bc5c7c1bf424e9541cf5fe Mon Sep 17 00:00:00 2001
From: gaolu <12345678>
Date: Thu, 28 Nov 2019 15:33:47 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=87=8D=E8=A6=81=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/milestone/addMilestone.vue  | 73 +++++++++++++++++++---
 src/views/ebiz/milestone/editMilestone.vue | 72 ++++++++++++++++++---
 src/views/ebiz/milestone/milestoneList.vue | 16 +++--
 3 files changed, 138 insertions(+), 23 deletions(-)

diff --git a/src/views/ebiz/milestone/addMilestone.vue b/src/views/ebiz/milestone/addMilestone.vue
index faae5b31c..eef22b0b4 100644
--- a/src/views/ebiz/milestone/addMilestone.vue
+++ b/src/views/ebiz/milestone/addMilestone.vue
@@ -27,6 +27,7 @@
         @confirm="okTime"
         @cancel="cancelTime"
         :filter="filter"
+        
       />
     </van-popup>
   </div>
@@ -48,7 +49,10 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
         timeShow:false,
         currentDate: new Date(),
         minDate:new Date(),
-        currentTime: '12:00'
+        currentTime: '12:00',
+        date: '',
+        minMinute: 0,
+        minHour: 0
       }
     },
     mounted(){
@@ -69,27 +73,28 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
         let data = {
           token: localStorage.getItem('token'),
           eventDTO:{
-            id: null, //事件id  新增传null 修改必传
             customerNumber: localStorage.getItem('customerNumber'),// 客户号
             eventContent: $this.eventContent,// 事件内容
             noticeDate: $this.noticeDate,//提示日期 yyyy-MM-dd
-            noticeTime: $this.noticeTime,// 提示时间 HH:mm:ss
+            noticeTime: $this.noticeTime+':00',// 提示时间 HH:mm:ss
             noticeStatus: "00"// 提示状态 00 未提醒（固定）
           }
         }
         console.log(123,data)
-          
         saveOrUpdate(data)
           .then(res => {
             if (res.result == 0) {
               $this.$toast('保存成功')
               setTimeout(()=>{
                 this.$jump({
-                  flag: 'h5',
+                  flag: 'goBack',
                   extra: {
-                    url: location.origin + '/#/milestone/list'
+                    refresh: '1',
+                    index: '-1',
                   },
                   routerInfo: {
+                    type: 2,
+                    index: -1,
                     path: '/milestone/list'
                   }
                 })
@@ -114,11 +119,40 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
           day = '0' + day
         }
         this.noticeDate = year + '-' + month + '-' + day
+        this.date = date.getTime()
+        if(date.getTime()==this.minDate.getTime()){
+          this.getTime()
+          if(this.noticeTime.split(':')[0]<this.minHour){
+            this.noticeTime=''
+          }else if(this.noticeTime.split(':')[0]=this.minHour){
+            if(this.noticeTime.split(':')[1]<this.minMinute){
+              this.noticeTime=''
+            }
+          }
+        }
       },
       okTime(value){
-        console.log(value)
-        this.timeShow = false;
-        this.noticeTime = value
+        console.log(value.split(':')[0])
+        
+        if(this.date==this.minDate.getTime()){
+          if(value.split(':')[0]<this.minHour){
+            this.$toast('不能小于当前时间')
+          }else if(value.split(':')[0]=this.minHour){
+            if(value.split(':')[1]<this.minMinute){
+              this.$toast('不能小于当前时间')
+            }else{
+              this.timeShow = false;
+              this.noticeTime = value
+            }
+          }else{
+            this.timeShow = false;
+            this.noticeTime = value
+          }
+        }else{
+          this.timeShow = false;
+          this.noticeTime = value
+        }
+        
       },
       cancelTime(){
         this.timeShow = false;
@@ -138,6 +172,27 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
           return options.filter(option => option % 15 === 0)
         }
         return options;
+      },
+      getTime(){
+        let date=new Date();
+        let hour=date.getHours();
+        let minute=date.getMinutes();
+        if (minute<15) {
+          minute='15';
+        }else if(minute>=15&&minute<30){
+          minute='30'
+        }else if(minute>=30&&minute<45){
+          minute='45'
+        }else if(minute>=45&&minute<60){
+          minute='00'
+          hour=hour+1
+        }
+        if (hour<10) {
+          hour='0'+hour;
+        }
+        this.currentTime = hour+':'+minute
+        this.minHour = hour
+        this.minMinute = minute
       }
     }
   }
diff --git a/src/views/ebiz/milestone/editMilestone.vue b/src/views/ebiz/milestone/editMilestone.vue
index efac0267e..222413aba 100644
--- a/src/views/ebiz/milestone/editMilestone.vue
+++ b/src/views/ebiz/milestone/editMilestone.vue
@@ -50,7 +50,10 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
         currentDate: new Date(),
         minDate:new Date(),
         currentTime: '12:00',
-        item: ''
+        item: '',
+        date: '',
+        minMinute: 0,
+        minHour: 0
       }
     },
     mounted(){
@@ -80,7 +83,7 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
             customerNumber: localStorage.getItem('customerNumber'),// 客户号
             eventContent: $this.eventContent,// 事件内容
             noticeDate: $this.noticeDate,//提示日期 yyyy-MM-dd
-            noticeTime: $this.noticeTime,// 提示时间 HH:mm:ss
+            noticeTime: $this.noticeTime+':00',// 提示时间 HH:mm:ss
             noticeStatus: "00"// 提示状态 00 未提醒（固定）
           }
         }
@@ -92,11 +95,14 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
               $this.$toast('保存成功')
               setTimeout(()=>{
                 this.$jump({
-                  flag: 'h5',
+                  flag: 'goBack',
                   extra: {
-                    url: location.origin + '/#/milestone/list'
+                    refresh: '1',
+                    index: '-1',
                   },
                   routerInfo: {
+                    type: 2,
+                    index: -1,
                     path: '/milestone/list'
                   }
                 })
@@ -120,12 +126,41 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
         if (day < 10) {
           day = '0' + day
         }
-        this.date = year + '-' + month + '-' + day
+        this.noticeDate = year + '-' + month + '-' + day
+        this.date = date.getTime()
+        if(date.getTime()==this.minDate.getTime()){
+          this.getTime()
+          if(this.noticeTime.split(':')[0]<this.minHour){
+            this.noticeTime=''
+          }else if(this.noticeTime.split(':')[0]=this.minHour){
+            if(this.noticeTime.split(':')[1]<this.minMinute){
+              this.noticeTime=''
+            }
+          }
+        }
       },
       okTime(value){
-        console.log(value)
-        this.timeShow = false;
-        this.time = value
+        console.log(value.split(':')[0])
+        
+        if(this.date==this.minDate.getTime()){
+          if(value.split(':')[0]<this.minHour){
+            this.$toast('不能小于当前时间')
+          }else if(value.split(':')[0]=this.minHour){
+            if(value.split(':')[1]<this.minMinute){
+              this.$toast('不能小于当前时间')
+            }else{
+              this.timeShow = false;
+              this.noticeTime = value
+            }
+          }else{
+            this.timeShow = false;
+            this.noticeTime = value
+          }
+        }else{
+          this.timeShow = false;
+          this.noticeTime = value
+        }
+        
       },
       cancelTime(){
         this.timeShow = false;
@@ -145,6 +180,27 @@ Vue.use(Field).use(CellGroup).use(DatetimePicker).use(Popup);
           return options.filter(option => option % 15 === 0)
         }
         return options;
+      },
+      getTime(){
+        let date=new Date();
+        let hour=date.getHours();
+        let minute=date.getMinutes();
+        if (minute<15) {
+          minute='15';
+        }else if(minute>=15&&minute<30){
+          minute='30'
+        }else if(minute>=30&&minute<45){
+          minute='45'
+        }else if(minute>=45&&minute<60){
+          minute='00'
+          hour=hour+1
+        }
+        if (hour<10) {
+          hour='0'+hour;
+        }
+        this.currentTime = hour+':'+minute
+        this.minHour = hour
+        this.minMinute = minute
       }
     }    
   }
diff --git a/src/views/ebiz/milestone/milestoneList.vue b/src/views/ebiz/milestone/milestoneList.vue
index 34dcdc1a3..3c9a28f82 100644
--- a/src/views/ebiz/milestone/milestoneList.vue
+++ b/src/views/ebiz/milestone/milestoneList.vue
@@ -49,7 +49,7 @@ import { Dialog, List,Toast,Row, Col,} from 'vant'
     },
     data(){
       return{
-        list:[],
+        list:[{noticeTime:'12:13:22'},{noticeTime:'12:13:22'}],
         loading: false,
         finished: false,
         pageNum:1,
@@ -72,13 +72,17 @@ import { Dialog, List,Toast,Row, Col,} from 'vant'
           .then(res => {
             if (res.result == 0) {
               $this.pageNum++
-              $this.list = $this.list.concat(res.content.list)
+              let list = res.content.list
+              list.forEach(item => {
+                item.noticeTime=item.noticeTime.split(':')[0]+':'+item.noticeTime.split(':')[1]
+              });
+              $this.list = $this.list.concat(list)
               if ($this.list.length < res.content.total) {
-                that.loading = false
-                that.finished = false
+                $this.loading = false
+                $this.finished = false
               } else {
-                that.finished = true
-                that.loading = false
+                $this.finished = true
+                $this.loading = false
               }
             }
           })

From efc02b4d3e5fd3c609855ac076979af47b707b48 Mon Sep 17 00:00:00 2001
From: gaolu <12345678>
Date: Thu, 28 Nov 2019 15:35:25 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=87=8D=E8=A6=81=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/milestone/milestoneList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/milestone/milestoneList.vue b/src/views/ebiz/milestone/milestoneList.vue
index 3c9a28f82..524726371 100644
--- a/src/views/ebiz/milestone/milestoneList.vue
+++ b/src/views/ebiz/milestone/milestoneList.vue
@@ -49,7 +49,7 @@ import { Dialog, List,Toast,Row, Col,} from 'vant'
     },
     data(){
       return{
-        list:[{noticeTime:'12:13:22'},{noticeTime:'12:13:22'}],
+        list:[],
         loading: false,
         finished: false,
         pageNum:1,