zxz 2 년 전
부모
커밋
bf7d3703d6
2개의 변경된 파일13개의 추가작업 그리고 13개의 파일을 삭제
  1. 3 3
      src/views/profitable/warehouseprofits.vue
  2. 10 10
      src/views/profitable/warehouseprofitsdetails.vue

+ 3 - 3
src/views/profitable/warehouseprofits.vue

@@ -99,7 +99,7 @@
       return {
         value: [],
         profitList: [{
-          name: "玉米",
+          name: '玉米',
           count: 2000,
         }],
         datalist2:[],
@@ -183,9 +183,9 @@
        getPassYearFormatDate() {
         var nowDate = new Date()
         var _date = new Date()
-        var year = nowDate.getFullYear()-1
+        var year = nowDate.getFullYear()
         var year1 = _date.getFullYear()
-        var month = nowDate.getMonth() + 1
+        var month = nowDate.getMonth()
         var month1 = _date.getMonth() + 1
         var strDate = nowDate.getDate()
         var strDate1 = _date.getDate()

+ 10 - 10
src/views/profitable/warehouseprofitsdetails.vue

@@ -68,17 +68,17 @@
     components: {},
     data() {
       return {
-        value: "",
+        value: '',
         tableData: [],
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
         warehouse:[],
         deptCircularPage: {},
-        searchType:"",
-        searchKeyWord:"",
-        startDate:"",
-        endDate:"",
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
         outtotal:0,
         intotal:0,
       }
@@ -107,10 +107,10 @@
       getPassYearFormatDate () {
           var nowDate = new Date()
           var _date = new Date()
-          nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
-          var year = nowDate.getFullYear()-1
+          // nowDate.setTime(nowDate.getTime()-24*60*60*1000*30)
+          var year = nowDate.getFullYear()
           var year1 = _date.getFullYear()
-          var month = nowDate.getMonth() + 1
+          var month = nowDate.getMonth()
           var month1 = _date.getMonth() + 1
           var strDate = nowDate.getDate()
           var strDate1 = _date.getDate()
@@ -135,8 +135,8 @@
          getwarehousedetails({
             // warehouseType: 1,
             // compId: localStorage.getItem('ws-pf_compId'),
-            startDate:this.startDate,
-            endDate:this.endDate,
+            warehouseStartDate:this.startDate,
+          warehouseEndDate:this.endDate,
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize,