Forráskód Böngészése

质量月报 - 页面默认加载上月数据、list接口修改、导出(部分代码)

wangggziwen 1 éve
szülő
commit
7655d6f87e
27 módosított fájl, 150 hozzáadás és 137 törlés
  1. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS0501Controller.java
  2. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS1301Controller.java
  3. 3 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2002Controller.java
  4. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2005Controller.java
  5. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2007Controller.java
  6. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2011Controller.java
  7. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2400Controller.java
  8. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3004Controller.java
  9. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3009Controller.java
  10. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3010Controller.java
  11. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3011Controller.java
  12. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3012Controller.java
  13. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3022Controller.java
  14. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4012Controller.java
  15. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4013Controller.java
  16. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4501Controller.java
  17. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5001Controller.java
  18. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5003Controller.java
  19. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5010Controller.java
  20. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5012Controller.java
  21. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6101Controller.java
  22. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6107Controller.java
  23. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6301Controller.java
  24. 2 4
      master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportZ404Controller.java
  25. 36 0
      master/src/main/java/com/ruoyi/project/production/controller/vo/MonthlyQualityReportQueryVO.java
  26. 8 0
      ui/src/api/production/quality.js
  27. 57 41
      ui/src/views/production/quality/index.vue

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS0501Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS0501Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS0501 tMonthlyQualityReportS0501)
+    public AjaxResult list(TMonthlyQualityReportS0501 tMonthlyQualityReportS0501)
     {
-        startPage();
-        List<TMonthlyQualityReportS0501> list = tMonthlyQualityReportS0501Service.selectTMonthlyQualityReportS0501List(tMonthlyQualityReportS0501);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS0501Service.selectTMonthlyQualityReportS0501List(tMonthlyQualityReportS0501));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS1301Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS1301Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS1301 tMonthlyQualityReportS1301)
+    public AjaxResult list(TMonthlyQualityReportS1301 tMonthlyQualityReportS1301)
     {
-        startPage();
-        List<TMonthlyQualityReportS1301> list = tMonthlyQualityReportS1301Service.selectTMonthlyQualityReportS1301List(tMonthlyQualityReportS1301);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS1301Service.selectTMonthlyQualityReportS1301List(tMonthlyQualityReportS1301));
     }
 
     /**

+ 3 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2002Controller.java

@@ -38,11 +38,10 @@ public class TMonthlyQualityReportS2002Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS2002 tMonthlyQualityReportS2002)
+    public AjaxResult list(TMonthlyQualityReportS2002 tMonthlyQualityReportS2002)
     {
-        startPage();
-        List<TMonthlyQualityReportS2002> list = tMonthlyQualityReportS2002Service.selectTMonthlyQualityReportS2002List(tMonthlyQualityReportS2002);
-        return getDataTable(list);
+
+        return AjaxResult.success(tMonthlyQualityReportS2002Service.selectTMonthlyQualityReportS2002List(tMonthlyQualityReportS2002));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2005Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS2005Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS2005 tMonthlyQualityReportS2005)
+    public AjaxResult list(TMonthlyQualityReportS2005 tMonthlyQualityReportS2005)
     {
-        startPage();
-        List<TMonthlyQualityReportS2005> list = tMonthlyQualityReportS2005Service.selectTMonthlyQualityReportS2005List(tMonthlyQualityReportS2005);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS2005Service.selectTMonthlyQualityReportS2005List(tMonthlyQualityReportS2005));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2007Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS2007Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS2007 tMonthlyQualityReportS2007)
+    public AjaxResult list(TMonthlyQualityReportS2007 tMonthlyQualityReportS2007)
     {
-        startPage();
-        List<TMonthlyQualityReportS2007> list = tMonthlyQualityReportS2007Service.selectTMonthlyQualityReportS2007List(tMonthlyQualityReportS2007);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS2007Service.selectTMonthlyQualityReportS2007List(tMonthlyQualityReportS2007));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2011Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS2011Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS2011 tMonthlyQualityReportS2011)
+    public AjaxResult list(TMonthlyQualityReportS2011 tMonthlyQualityReportS2011)
     {
-        startPage();
-        List<TMonthlyQualityReportS2011> list = tMonthlyQualityReportS2011Service.selectTMonthlyQualityReportS2011List(tMonthlyQualityReportS2011);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS2011Service.selectTMonthlyQualityReportS2011List(tMonthlyQualityReportS2011));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS2400Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS2400Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS2400 tMonthlyQualityReportS2400)
+    public AjaxResult list(TMonthlyQualityReportS2400 tMonthlyQualityReportS2400)
     {
-        startPage();
-        List<TMonthlyQualityReportS2400> list = tMonthlyQualityReportS2400Service.selectTMonthlyQualityReportS2400List(tMonthlyQualityReportS2400);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS2400Service.selectTMonthlyQualityReportS2400List(tMonthlyQualityReportS2400));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3004Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3004Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3004 tMonthlyQualityReportS3004)
+    public AjaxResult list(TMonthlyQualityReportS3004 tMonthlyQualityReportS3004)
     {
-        startPage();
-        List<TMonthlyQualityReportS3004> list = tMonthlyQualityReportS3004Service.selectTMonthlyQualityReportS3004List(tMonthlyQualityReportS3004);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3004Service.selectTMonthlyQualityReportS3004List(tMonthlyQualityReportS3004));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3009Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3009Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3009 tMonthlyQualityReportS3009)
+    public AjaxResult list(TMonthlyQualityReportS3009 tMonthlyQualityReportS3009)
     {
-        startPage();
-        List<TMonthlyQualityReportS3009> list = tMonthlyQualityReportS3009Service.selectTMonthlyQualityReportS3009List(tMonthlyQualityReportS3009);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3009Service.selectTMonthlyQualityReportS3009List(tMonthlyQualityReportS3009));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3010Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3010Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3010 tMonthlyQualityReportS3010)
+    public AjaxResult list(TMonthlyQualityReportS3010 tMonthlyQualityReportS3010)
     {
-        startPage();
-        List<TMonthlyQualityReportS3010> list = tMonthlyQualityReportS3010Service.selectTMonthlyQualityReportS3010List(tMonthlyQualityReportS3010);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3010Service.selectTMonthlyQualityReportS3010List(tMonthlyQualityReportS3010));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3011Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3011Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3011 tMonthlyQualityReportS3011)
+    public AjaxResult list(TMonthlyQualityReportS3011 tMonthlyQualityReportS3011)
     {
-        startPage();
-        List<TMonthlyQualityReportS3011> list = tMonthlyQualityReportS3011Service.selectTMonthlyQualityReportS3011List(tMonthlyQualityReportS3011);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3011Service.selectTMonthlyQualityReportS3011List(tMonthlyQualityReportS3011));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3012Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3012Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3012 tMonthlyQualityReportS3012)
+    public AjaxResult list(TMonthlyQualityReportS3012 tMonthlyQualityReportS3012)
     {
-        startPage();
-        List<TMonthlyQualityReportS3012> list = tMonthlyQualityReportS3012Service.selectTMonthlyQualityReportS3012List(tMonthlyQualityReportS3012);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3012Service.selectTMonthlyQualityReportS3012List(tMonthlyQualityReportS3012));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS3022Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS3022Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS3022 tMonthlyQualityReportS3022)
+    public AjaxResult list(TMonthlyQualityReportS3022 tMonthlyQualityReportS3022)
     {
-        startPage();
-        List<TMonthlyQualityReportS3022> list = tMonthlyQualityReportS3022Service.selectTMonthlyQualityReportS3022List(tMonthlyQualityReportS3022);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS3022Service.selectTMonthlyQualityReportS3022List(tMonthlyQualityReportS3022));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4012Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS4012Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS4012 tMonthlyQualityReportS4012)
+    public AjaxResult list(TMonthlyQualityReportS4012 tMonthlyQualityReportS4012)
     {
-        startPage();
-        List<TMonthlyQualityReportS4012> list = tMonthlyQualityReportS4012Service.selectTMonthlyQualityReportS4012List(tMonthlyQualityReportS4012);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS4012Service.selectTMonthlyQualityReportS4012List(tMonthlyQualityReportS4012));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4013Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS4013Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS4013 tMonthlyQualityReportS4013)
+    public AjaxResult list(TMonthlyQualityReportS4013 tMonthlyQualityReportS4013)
     {
-        startPage();
-        List<TMonthlyQualityReportS4013> list = tMonthlyQualityReportS4013Service.selectTMonthlyQualityReportS4013List(tMonthlyQualityReportS4013);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS4013Service.selectTMonthlyQualityReportS4013List(tMonthlyQualityReportS4013));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS4501Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS4501Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS4501 tMonthlyQualityReportS4501)
+    public AjaxResult list(TMonthlyQualityReportS4501 tMonthlyQualityReportS4501)
     {
-        startPage();
-        List<TMonthlyQualityReportS4501> list = tMonthlyQualityReportS4501Service.selectTMonthlyQualityReportS4501List(tMonthlyQualityReportS4501);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS4501Service.selectTMonthlyQualityReportS4501List(tMonthlyQualityReportS4501));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5001Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS5001Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS5001 tMonthlyQualityReportS5001)
+    public AjaxResult list(TMonthlyQualityReportS5001 tMonthlyQualityReportS5001)
     {
-        startPage();
-        List<TMonthlyQualityReportS5001> list = tMonthlyQualityReportS5001Service.selectTMonthlyQualityReportS5001List(tMonthlyQualityReportS5001);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS5001Service.selectTMonthlyQualityReportS5001List(tMonthlyQualityReportS5001));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5003Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS5003Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS5003 tMonthlyQualityReportS5003)
+    public AjaxResult list(TMonthlyQualityReportS5003 tMonthlyQualityReportS5003)
     {
-        startPage();
-        List<TMonthlyQualityReportS5003> list = tMonthlyQualityReportS5003Service.selectTMonthlyQualityReportS5003List(tMonthlyQualityReportS5003);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS5003Service.selectTMonthlyQualityReportS5003List(tMonthlyQualityReportS5003));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5010Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS5010Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS5010 tMonthlyQualityReportS5010)
+    public AjaxResult list(TMonthlyQualityReportS5010 tMonthlyQualityReportS5010)
     {
-        startPage();
-        List<TMonthlyQualityReportS5010> list = tMonthlyQualityReportS5010Service.selectTMonthlyQualityReportS5010List(tMonthlyQualityReportS5010);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS5010Service.selectTMonthlyQualityReportS5010List(tMonthlyQualityReportS5010));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS5012Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS5012Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS5012 tMonthlyQualityReportS5012)
+    public AjaxResult list(TMonthlyQualityReportS5012 tMonthlyQualityReportS5012)
     {
-        startPage();
-        List<TMonthlyQualityReportS5012> list = tMonthlyQualityReportS5012Service.selectTMonthlyQualityReportS5012List(tMonthlyQualityReportS5012);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS5012Service.selectTMonthlyQualityReportS5012List(tMonthlyQualityReportS5012));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6101Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS6101Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS6101 tMonthlyQualityReportS6101)
+    public AjaxResult list(TMonthlyQualityReportS6101 tMonthlyQualityReportS6101)
     {
-        startPage();
-        List<TMonthlyQualityReportS6101> list = tMonthlyQualityReportS6101Service.selectTMonthlyQualityReportS6101List(tMonthlyQualityReportS6101);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS6101Service.selectTMonthlyQualityReportS6101List(tMonthlyQualityReportS6101));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6107Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS6107Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS6107 tMonthlyQualityReportS6107)
+    public AjaxResult list(TMonthlyQualityReportS6107 tMonthlyQualityReportS6107)
     {
-        startPage();
-        List<TMonthlyQualityReportS6107> list = tMonthlyQualityReportS6107Service.selectTMonthlyQualityReportS6107List(tMonthlyQualityReportS6107);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS6107Service.selectTMonthlyQualityReportS6107List(tMonthlyQualityReportS6107));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportS6301Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportS6301Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportS6301 tMonthlyQualityReportS6301)
+    public AjaxResult list(TMonthlyQualityReportS6301 tMonthlyQualityReportS6301)
     {
-        startPage();
-        List<TMonthlyQualityReportS6301> list = tMonthlyQualityReportS6301Service.selectTMonthlyQualityReportS6301List(tMonthlyQualityReportS6301);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportS6301Service.selectTMonthlyQualityReportS6301List(tMonthlyQualityReportS6301));
     }
 
     /**

+ 2 - 4
master/src/main/java/com/ruoyi/project/production/controller/TMonthlyQualityReportZ404Controller.java

@@ -38,11 +38,9 @@ public class TMonthlyQualityReportZ404Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('production:quality:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TMonthlyQualityReportZ404 tMonthlyQualityReportZ404)
+    public AjaxResult list(TMonthlyQualityReportZ404 tMonthlyQualityReportZ404)
     {
-        startPage();
-        List<TMonthlyQualityReportZ404> list = tMonthlyQualityReportZ404Service.selectTMonthlyQualityReportZ404List(tMonthlyQualityReportZ404);
-        return getDataTable(list);
+        return AjaxResult.success(tMonthlyQualityReportZ404Service.selectTMonthlyQualityReportZ404List(tMonthlyQualityReportZ404));
     }
 
     /**

+ 36 - 0
master/src/main/java/com/ruoyi/project/production/controller/vo/MonthlyQualityReportQueryVO.java

@@ -0,0 +1,36 @@
+package com.ruoyi.project.production.controller.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * @author Wang Zi Wen
+ * @email wangggziwen@163.com
+ * @date 2023/11/09 14:58:58
+ */
+public class MonthlyQualityReportQueryVO {
+    /** 开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date startDate;
+
+    /** 结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    private Date endDate;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

+ 8 - 0
ui/src/api/production/quality.js

@@ -0,0 +1,8 @@
+// 导出质量月报
+export function exportQuality(query) {
+  return request({
+    url: '/production/quality/export',
+    method: 'get',
+    params: query
+  })
+}

+ 57 - 41
ui/src/views/production/quality/index.vue

@@ -2189,6 +2189,7 @@ import { listS6101, getS6101, delS6101, addS6101, updateS6101, exportS6101 } fro
 import { listS6107, getS6107, delS6107, addS6107, updateS6107, exportS6107 } from "@/api/production/s6107";
 import { listS6301, getS6301, delS6301, addS6301, updateS6301, exportS6301 } from "@/api/production/s6301";
 import { listZ404, getZ404, delZ404, addZ404, updateZ404, exportZ404 } from "@/api/production/z404";
+import { exportQuality } from "@/api/production/quality";
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
@@ -2340,16 +2341,34 @@ export default {
         }
    },
   created() {
-      //设置表格高度对应屏幕高度
-      this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
-      })
+    this.setDefaultSampleDate();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+        this.clientHeight = document.body.clientHeight -250
+    })
     this.getList();
     this.getTreeselect();
   },
   methods: {
+    /** 设置默认时间范围 */
+    setDefaultSampleDate() {
+      let startDate = new Date();
+      startDate.setMonth(startDate.getMonth() - 1);
+      startDate.setDate(1);
+      this.sampleDate[0] = startDate.getFullYear() + "-" + Number(startDate.getMonth() + 1) + "-" + startDate.getDate();
+
+      let endDate = new Date();
+      endDate.setDate(0);
+      this.sampleDate[1] = endDate.getFullYear() + "-" + Number(endDate.getMonth() + 1) + "-" + endDate.getDate();
+    },
     /** 查询质量月报列表 */
     getList() {
+      this.queryParams.startDate = this.sampleDate[0];
+      this.queryParams.endDate = this.sampleDate[1];
+      console.log(this.sampleDate[0])
+      console.log(this.sampleDate[1])
+      console.log(this.queryParams.startDate)
+      console.log(this.queryParams.endDate)
       this.getListS0501();
       this.getListS1301();
       this.getListS2002();
@@ -2378,168 +2397,168 @@ export default {
     getListS0501() {
       this.loadingS0501 = true;
       listS0501(this.queryParams).then(response => {
-        this.s0501List = response.rows;
+        this.s0501List = response.data;
         this.loadingS0501 = false;
       });
     },
     getListS1301() {
       this.loadingS1301 = true;
       listS1301(this.queryParams).then(response => {
-        this.s1301List = response.rows;
+        this.s1301List = response.data;
         this.loadingS1301 = false;
       });
     },
     getListS2002() {
       this.loadingS2002 = true;
       listS2002(this.queryParams).then(response => {
-        this.s2002List = response.rows;
+        this.s2002List = response.data;
         this.loadingS2002 = false;
       });
     },
     getListS2005() {
       this.loadingS2005 = true;
       listS2005(this.queryParams).then(response => {
-        this.s2005List = response.rows;
+        this.s2005List = response.data;
         this.loadingS2005 = false;
       });
     },
     getListS2007() {
       this.loadingS2007 = true;
       listS2007(this.queryParams).then(response => {
-        this.s2007List = response.rows;
+        this.s2007List = response.data;
         this.loadingS2007 = false;
       });
     },
     getListS2011() {
       this.loadingS2011 = true;
       listS2011(this.queryParams).then(response => {
-        this.s2011List = response.rows;
+        this.s2011List = response.data;
         this.loadingS2011 = false;
       });
     },
     getListS2400() {
       this.loadingS2400 = true;
       listS2400(this.queryParams).then(response => {
-        this.s2400List = response.rows;
+        this.s2400List = response.data;
         this.loadingS2400 = false;
       });
     },
     getListS3004() {
       this.loadingS3004 = true;
       listS3004(this.queryParams).then(response => {
-        this.s3004List = response.rows;
+        this.s3004List = response.data;
         this.loadingS3004 = false;
       });
     },
     getListS3009() {
       this.loadingS3009 = true;
       listS3009(this.queryParams).then(response => {
-        this.s3009List = response.rows;
+        this.s3009List = response.data;
         this.loadingS3009 = false;
       });
     },
     getListS3010() {
       this.loadingS3010 = true;
       listS3010(this.queryParams).then(response => {
-        this.s3010List = response.rows;
+        this.s3010List = response.data;
         this.loadingS3010 = false;
       });
     },
     getListS3011() {
       this.loadingS3011 = true;
       listS3011(this.queryParams).then(response => {
-        this.s3011List = response.rows;
+        this.s3011List = response.data;
         this.loadingS3011 = false;
       });
     },
     getListS3012() {
       this.loadingS3012 = true;
       listS3012(this.queryParams).then(response => {
-        this.s3012List = response.rows;
+        this.s3012List = response.data;
         this.loadingS3012 = false;
       });
     },
     getListS3022() {
       this.loadingS3022 = true;
       listS3022(this.queryParams).then(response => {
-        this.s3022List = response.rows;
+        this.s3022List = response.data;
         this.loadingS3022 = false;
       });
     },
     getListS4012() {
       this.loadingS4012 = true;
       listS4012(this.queryParams).then(response => {
-        this.s4012List = response.rows;
+        this.s4012List = response.data;
         this.loadingS4012 = false;
       });
     },
     getListS4013() {
       this.loadingS4013 = true;
       listS4013(this.queryParams).then(response => {
-        this.s4013List = response.rows;
+        this.s4013List = response.data;
         this.loadingS4013 = false;
       });
     },
     getListS4501() {
       this.loadingS4501 = true;
       listS4501(this.queryParams).then(response => {
-        this.s4501List = response.rows;
+        this.s4501List = response.data;
         this.loadingS4501 = false;
       });
     },
     getListS5001() {
       this.loadingS5001 = true;
       listS5001(this.queryParams).then(response => {
-        this.s5001List = response.rows;
+        this.s5001List = response.data;
         this.loadingS5001 = false;
       });
     },
     getListS5003() {
       this.loadingS5003 = true;
       listS5003(this.queryParams).then(response => {
-        this.s5003List = response.rows;
+        this.s5003List = response.data;
         this.loadingS5003 = false;
       });
     },
     getListS5010() {
       this.loadingS5010 = true;
       listS5010(this.queryParams).then(response => {
-        this.s5010List = response.rows;
+        this.s5010List = response.data;
         this.loadingS5010 = false;
       });
     },
     getListS5012() {
       this.loadingS5012 = true;
       listS5012(this.queryParams).then(response => {
-        this.s5012List = response.rows;
+        this.s5012List = response.data;
         this.loadingS5012 = false;
       });
     },
     getListS6101() {
       this.loadingS6101 = true;
       listS6101(this.queryParams).then(response => {
-        this.s6101List = response.rows;
+        this.s6101List = response.data;
         this.loadingS6101 = false;
       });
     },
     getListS6107() {
       this.loadingS6107 = true;
       listS6107(this.queryParams).then(response => {
-        this.s6107List = response.rows;
+        this.s6107List = response.data;
         this.loadingS6107 = false;
       });
     },
     getListS6301() {
       this.loadingS6301 = true;
       listS6301(this.queryParams).then(response => {
-        this.s6301List = response.rows;
+        this.s6301List = response.data;
         this.loadingS6301 = false;
       });
     },
     getListZ404() {
       this.loadingZ404 = true;
       listZ404(this.queryParams).then(response => {
-        this.z404List = response.rows;
+        this.z404List = response.data;
         this.loadingZ404 = false;
       });
     },
@@ -3191,8 +3210,6 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.startDate = this.sampleDate[0];
-      this.queryParams.endDate = this.sampleDate[1];
       this.getList();
     },
     /** 重置按钮操作 */
@@ -3775,17 +3792,16 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      alert("功能开发中")
-      // const queryParams = this.queryParams;
-      // this.$confirm('是否确认导出所有质量月报S0501数据项?', "警告", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning"
-      //   }).then(function() {
-      //     return exportS0501(queryParams);
-      //   }).then(response => {
-      //     this.download(response.msg);
-      //   })
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有质量月报数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportQuality(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
     },
     /** 导入按钮操作 */
     handleImport() {