修改默认日期时间段

src/views/Warehousing/cargoClearance/index.vue

@@ -69,6 +69,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @keyup.enter.native="handleQuery"
+                :picker-options="pickerOptions"
+                unlink-panels
               >
               </el-date-picker>
             </el-form-item>
@@ -684,24 +686,64 @@ export default {
       formId: null,
       ids: [],
       copyStatus: null,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;

src/views/Warehousing/goodsTransfer/index.vue

@@ -69,6 +69,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @keyup.enter.native="handleQuery"
+                :picker-options="pickerOptions"
+                unlink-panels
               >
               </el-date-picker>
             </el-form-item>
@@ -705,24 +707,64 @@ export default {
       formId: null,
       ids: [],
       copyStatus: null,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;

src/views/Warehousing/inStock/index.vue

@@ -51,6 +51,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @keyup.enter.native="handleQuery"
+                :picker-options="pickerOptions"
+                unlink-panels
               >
               </el-date-picker>
             </el-form-item>
@@ -866,24 +868,64 @@ export default {
       // 公司名称
       company: '',
       fSbuOptions: [],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + ' 23:59:59']
 
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;

src/views/Warehousing/outStock/index.vue

@@ -50,6 +50,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @keyup.enter.native="handleQuery"
+                :picker-options="pickerOptions"
+                unlink-panels
               >
               </el-date-picker>
             </el-form-item>
@@ -757,24 +759,64 @@ export default {
       ids: [],
       copyStatus: null,
       fTrucknoList:[],
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     queryVehicle().then(res=>{
       this.fTrucknoList = res.data

src/views/Warehousing/stockTransfer/index.vue

@@ -69,6 +69,8 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 @keyup.enter.native="handleQuery"
+                :picker-options="pickerOptions"
+                unlink-panels
               >
               </el-date-picker>
             </el-form-item>
@@ -719,24 +721,64 @@ export default {
       formId: null,
       ids: [],
       copyStatus: null,
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   // 使用子组件
   components: { draggable, AddOrUpdate },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.queryParams.timeInterval = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -100,6 +100,8 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             @keyup.enter.native="handleQuery"
+            :picker-options="pickerOptions"
+            unlink-panels
         >
         </el-date-picker>
       </el-form-item>
@@ -1362,25 +1364,64 @@ export default {
         fCorpid: [{required: true, message: " ", trigger: "blur",}],
         fBillingDeadline: [{required: true, message: " ", trigger: "blur",}],
         fGoodsid: [{required: true, message: " ", trigger: "blur",}]
-      }
+      },
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
 
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000*60*60*24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.queryParams.timeInterval2 = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
-    // this.$set(this.queryParams,'timeInterval', [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59'])
+    this.queryParams.timeInterval2 = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     this.getList();
     this.getDicts("tax_rate").then((response) => {

src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -24,7 +24,9 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']">
+            :default-time="['00:00:00', '23:59:59']"
+            :picker-options="pickerOptions"
+            unlink-panels>
         </el-date-picker>
       </el-form-item>
       <el-form-item label="巡检人" prop="fInspectorid">
@@ -508,23 +510,63 @@ export default {
       // 表单校验
       rules: {},
       twarehousecheckdetailList: {},
-      picturefId: ''
+      picturefId: '',
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
     };
   },
   created() {
     let date = new Date();
-    let year = parseInt(date.getFullYear())
-    let month = parseInt(date.getMonth() + 1)
-    let currentMonth = date.getMonth()
-    let nextMonth = ++currentMonth
-    let nextMonthFirstDay = new Date(date.getFullYear(), nextMonth, 1)  // 下个月的第一天
-    let oneDay = 1000 * 60 * 60 * 24
-    let lastTime = new Date(nextMonthFirstDay - oneDay) // 下个月的第一天减去一天，就是上个月的最后一天
-    let day = lastTime.getDate()
-    if (day < 10) {
-      day = '0' + day
+    let lYear = parseInt(date.getFullYear())
+    let lMonth = parseInt(date.getMonth())
+    if (lMonth == 0) {
+      lMonth = 12
+      lYear = lYear - 1
+    }
+    let nYear = parseInt(date.getFullYear())
+    let nMonth = parseInt(date.getMonth() + 2)
+    if (nMonth > 12) {
+      nMonth = nMonth - 12
+      nYear = nYear + 1
+    }
+    let day30 = [4, 6, 9, 11]
+    let day31 = [1, 3, 5, 7, 8, 10, 12]
+    let nDay = null
+    if (day31.indexOf(nMonth) > -1) {
+      nDay = 31
+    } else if (day30.indexOf(nMonth) > -1) {
+      nDay = 30
+    } else if ((nYear % 4 == 0) && (nYear % 100 != 0 || nYear % 400 == 0)) {
+      nDay = 29
+    } else {
+      nDay = 28
     }
-    this.fPlanneddate = [year + '-' + month + '-' + '01 00:00:00', year + '-' + month + '-' + day + ' 23:59:59']
+    this.fPlanneddate = [lYear + '-' + lMonth + '-' + '01 00:00:00', nYear + '-' + nMonth + '-' + nDay + '23:59:59']
 
     currentLogin().then(res => {
       console.log(res)