Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/sass/apps/Announce/AppAnnounce/components/Add.vue

@@ -248,6 +248,7 @@
                   v-model="dateForm.choiceTime"
                   type="datetime"
                   size="small"
+                  :picker-options="pickerOptions"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择定时发送时间">
                 </el-date-picker>
@@ -322,7 +323,12 @@
         },
         girdNames: '',
         id: '',
-        tagsList: []
+        tagsList: [],
+        pickerOptions: {
+          disabledDate: e => {
+            return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24)
+          }
+        }
       }
     },
 
@@ -560,7 +566,11 @@
       onDateForm () {
         this.$refs.dateForm.validate((valid) => {
           if (valid) {
-            this.confirm(1)
+            if (new Date(this.dateForm.choiceTime).getTime() < Date.now()) {
+              return this.$message.error('定时发送时间不得早于当前时间')
+            } else {
+              this.confirm(1)
+            }
           }
         })
       },

project/sass/apps/Announce/AppAnnounce/components/Detail.vue

@@ -180,9 +180,9 @@
               <div class="bottom-search">
                 <div class="left">
                   <el-radio-group v-model="search2.sendStatus" size="small" @change="search2.current = 1, getGroupInfo()">
-                    <el-radio-button size="small" label="0">未执行</el-radio-button>
+                    <el-radio-button size="small" label="0">未送达</el-radio-button>
-                    <el-radio-button size="small" label="1">已执行</el-radio-button>
+                    <el-radio-button size="small" label="1">已送达</el-radio-button>
-                    <el-radio-button size="small" label="2">无法执行</el-radio-button>
+                    <el-radio-button size="small" label="2">无法送达</el-radio-button>
                   </el-radio-group>
                   <div class="userSelcet" placeholder="请选择创建人">
                     <span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
@@ -388,13 +388,12 @@
           const nowTime = this.$moment(new Date())
           const min = nowTime.diff(this.info.remindTime, 'minute')
           this.min = (60 - min)
-          console.log(nowTime.diff(this.info.remindTime, 'minute'))
 
           if (this.min <= 0) {
             this.isDisabled = false
+            clearInterval(this.timer)
           } else {
             this.isDisabled = true
-            clearInterval(this.timer)
           }
         }, 1000)
       },