仓储业务-仓储费页面

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -89,9 +89,9 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="出库日期" prop="timeInterval">
+      <el-form-item label="计费日期" prop="timeInterval2">
         <el-date-picker
-            v-model="queryParams.timeInterval"
+            v-model="queryParams.timeInterval2"
             type="daterange"
             value-format="yyyy-MM-dd"
             clearable
@@ -1353,6 +1353,7 @@ export default {
         fGoodsid: null,
         fCntrtype: null,
         fCntqty: null,
+        timeInterval2: null
       },
       // 表单参数
       form: {},
@@ -1366,18 +1367,19 @@ export default {
   },
 
   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 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
+    }
+    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.getList();
@@ -1732,7 +1734,7 @@ export default {
       if (name == null || name === "") {
         return false;
       }
-      let queryParams = {pageNum: 1, pageSize: 10, fName: name};
+      let queryParams = {fName: name};
       listGoods(queryParams).then((response) => {
         this.goodsOptions = response.rows;
       });
@@ -1842,7 +1844,7 @@ export default {
       this.title = "出库单";
     },
     handleUpdate_s(row, status) {
-      const queryParams = {pageNum: 1, pageSize: 10, fName: ''};
+      const queryParams = {fName: ''};
       listGoods(queryParams).then((response) => {
         this.goodsOptions = response.rows;
       });
@@ -1888,7 +1890,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
-      const queryParams = {pageNum: 1, pageSize: 10, fName: ''};
+      const queryParams = {fName: ''};
       listGoods(queryParams).then((response) => {
         this.goodsOptions = response.rows;
       });