zhulizhen 5 лет назад
Родитель
Сommit
54de149d7b
2 измененных файлов с 15 добавлено и 6 удалено
  1. 1 0
      src/utils/helper.js
  2. 14 6
      src/views/doBusiness/index.vue

+ 1 - 0
src/utils/helper.js

@@ -4,6 +4,7 @@
  * @return 时间戳
  */
 export function toTimestamp(str) {
+    if(str.length !== 14) console.warn('时间格式有误,长度应该为14')
     const arr = str.match(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})/)
     return +new Date(arr[1], arr[2], arr[3], arr[4], arr[5], arr[6])
 }

+ 14 - 6
src/views/doBusiness/index.vue

@@ -15,6 +15,7 @@
           >
           <el-time-picker
             is-range
+            :disabled="isDisabled(date)"
             :class="{isBlue:item.isUpdate}"
             v-model="item.timeRange"
             size="mini"
@@ -54,16 +55,18 @@ export default {
   computed:{
     gte(){
       let date = timestamp2String(+this.value)
-      let month = parseInt(date.slice(4,6))-1
-      console.log(date)
-      console.log(month)
-      return date.slice(0,4) + (month > 10 ? month : ('0'+month) )+ date.slice(6,8)
+      // let month = parseInt(date.slice(4,6))-1
+      return date.slice(0,6)+'01'
+      //  + (month >= 10 ? month : ('0'+month) )+ date.slice(6,8)
      
     },
     lt(){
        let date = timestamp2String(+this.value)
-       let month = parseInt(date.slice(4,6))+1
-       return date.slice(0,4) + (month > 10 ? month : ('0'+month) )+ date.slice(6,8)
+      //  let month = parseInt(date.slice(4,6))+1
+      //  console.log(date)
+      //  console.log(month)
+       return date.slice(0,6)+'31' 
+      //  + (month >= 10 ? month : ('0'+month) )+ date.slice(6,8)
     },
   },
   watch:{
@@ -74,6 +77,11 @@ export default {
     }
   },
   methods: {
+    isDisabled(date) {
+      const item = Number(timestamp2String(+date).substr(0, 8))
+      const now = Number(timestamp2String(+new Date()).substr(0, 8))
+      return item < now
+    },
     translate(){
       this.content.forEach(el=>{
         this.$set(el, 'timeRange', [new Date(toTimestamp(el.date+''+el.openTime)), new Date(toTimestamp(el.date+''+el.endTime))])