From 95c23462c91097a54167a83a914999dc11766328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <2178503051@qq.com>
Date: Mon, 25 May 2026 16:19:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms/report):=20=E6=96=B0=E5=A2=9E=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=BF=E6=8D=A2=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  新增wms报表通用配置的CRUD接口文件
2.  替换所有酸轧报表页面的本地静态配置为从后台接口动态获取
3.  添加加载状态提示，优化页面初始加载体验
---
 klp-ui/src/api/wms/reportConfig.js            | 44 ++++++++++++++
 .../views/wms/report/zha/comprehensive.vue    | 42 ++++++++++---
 klp-ui/src/views/wms/report/zha/day.vue       | 44 ++++++++++----
 klp-ui/src/views/wms/report/zha/loss.vue      | 60 +++++++++++++------
 klp-ui/src/views/wms/report/zha/month.vue     | 42 ++++++++++---
 klp-ui/src/views/wms/report/zha/out.vue       | 38 +++++++++---
 klp-ui/src/views/wms/report/zha/team.vue      | 42 ++++++++++---
 klp-ui/src/views/wms/report/zha/year.vue      | 42 ++++++++++---
 8 files changed, 282 insertions(+), 72 deletions(-)
 create mode 100644 klp-ui/src/api/wms/reportConfig.js

diff --git a/klp-ui/src/api/wms/reportConfig.js b/klp-ui/src/api/wms/reportConfig.js
new file mode 100644
index 000000000..c5b54376c
--- /dev/null
+++ b/klp-ui/src/api/wms/reportConfig.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询WMS报通用配置列表
+export function listReportConfig(query) {
+  return request({
+    url: '/wms/reportConfig/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询WMS报通用配置详细
+export function getReportConfig(configId) {
+  return request({
+    url: '/wms/reportConfig/' + configId,
+    method: 'get'
+  })
+}
+
+// 新增WMS报通用配置
+export function addReportConfig(data) {
+  return request({
+    url: '/wms/reportConfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改WMS报通用配置
+export function updateReportConfig(data) {
+  return request({
+    url: '/wms/reportConfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除WMS报通用配置
+export function delReportConfig(configId) {
+  return request({
+    url: '/wms/reportConfig/' + configId,
+    method: 'delete'
+  })
+}
diff --git a/klp-ui/src/views/wms/report/zha/comprehensive.vue b/klp-ui/src/views/wms/report/zha/comprehensive.vue
index 5815f6eac..5b96adb30 100644
--- a/klp-ui/src/views/wms/report/zha/comprehensive.vue
+++ b/klp-ui/src/views/wms/report/zha/comprehensive.vue
@@ -1,16 +1,14 @@
 <template>
-  <ComprehensiveTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <ComprehensiveTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import ComprehensiveTemplate from '@/views/wms/report/template/comprehensive.vue'
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
   name: 'ComprehensiveReport',
@@ -19,7 +17,33 @@ export default {
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/zha/day.vue b/klp-ui/src/views/wms/report/zha/day.vue
index 016a7ca9a..621d0424d 100644
--- a/klp-ui/src/views/wms/report/zha/day.vue
+++ b/klp-ui/src/views/wms/report/zha/day.vue
@@ -1,25 +1,49 @@
 <template>
-  <DayTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <DayTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import DayTemplate from '@/views/wms/report/template/day.vue'
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'LossReport',
+  name: 'DayReport',
   components: {
     DayTemplate,
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/zha/loss.vue b/klp-ui/src/views/wms/report/zha/loss.vue
index 981a225dd..d7354b7ef 100644
--- a/klp-ui/src/views/wms/report/zha/loss.vue
+++ b/klp-ui/src/views/wms/report/zha/loss.vue
@@ -1,26 +1,50 @@
 <template>
-  <LossTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  ></LossTemplate>
+  <div>
+    <LossTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
-  import LossTemplate from '@/views/wms/report/template/loss.vue'
-  import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import LossTemplate from '@/views/wms/report/template/loss.vue'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
-  export default {
-    name: 'LossReport',
-    components: {
-      LossTemplate,
-    },
-    data() {
-      return {
-        ...suanzhaConfig,
-      }
+export default {
+  name: 'LossReport',
+  components: {
+    LossTemplate,
+  },
+  data() {
+    return {
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
+}
 </script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/zha/month.vue b/klp-ui/src/views/wms/report/zha/month.vue
index 8ad4d36af..d45640196 100644
--- a/klp-ui/src/views/wms/report/zha/month.vue
+++ b/klp-ui/src/views/wms/report/zha/month.vue
@@ -1,16 +1,14 @@
 <template>
-  <MonthTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <MonthTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import MonthTemplate from '@/views/wms/report/template/month.vue'
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
   name: 'MonthReport',
@@ -19,7 +17,33 @@ export default {
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/zha/out.vue b/klp-ui/src/views/wms/report/zha/out.vue
index db63d5a97..3fcb24917 100644
--- a/klp-ui/src/views/wms/report/zha/out.vue
+++ b/klp-ui/src/views/wms/report/zha/out.vue
@@ -1,23 +1,45 @@
 <template>
-  <OutTemplate
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <OutTemplate v-if="!loading" :baseQueryParams="baseQueryParams"
+      :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import OutTemplate from "@/views/wms/report/template/out.vue";
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'ZhaTemplate',
+  name: 'OutReport',
   components: {
     OutTemplate,
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/zha/team.vue b/klp-ui/src/views/wms/report/zha/team.vue
index c7cdb8f3d..44a3e292f 100644
--- a/klp-ui/src/views/wms/report/zha/team.vue
+++ b/klp-ui/src/views/wms/report/zha/team.vue
@@ -1,16 +1,14 @@
 <template>
-  <TeamTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <TeamTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import TeamTemplate from '@/views/wms/report/template/team.vue'
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
   name: 'TeamReport',
@@ -19,7 +17,33 @@ export default {
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/klp-ui/src/views/wms/report/zha/year.vue b/klp-ui/src/views/wms/report/zha/year.vue
index 4a79e743a..b43bb6fb3 100644
--- a/klp-ui/src/views/wms/report/zha/year.vue
+++ b/klp-ui/src/views/wms/report/zha/year.vue
@@ -1,16 +1,14 @@
 <template>
-  <YearTemplate
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
+  <div>
+    <YearTemplate v-if="!loading" :actionTypes="actionTypes" :actionQueryParams="actionQueryParams"
+      :baseQueryParams="baseQueryParams" :warehouseOptions="warehouseOptions" :productionLine="productionLine" />
+    <el-empty v-else description="正在加载报表配置..." />
+  </div>
 </template>
 
 <script>
 import YearTemplate from '@/views/wms/report/template/year.vue'
-import { suanzhaConfig } from '@/views/wms/report/js/config.js'
+import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
   name: 'YearReport',
@@ -19,7 +17,33 @@ export default {
   },
   data() {
     return {
-      ...suanzhaConfig,
+      loading: true,
+      actionTypes: [],
+      actionQueryParams: {},
+      baseQueryParams: {},
+      warehouseOptions: [],
+      productionLine: '',
+    }
+  },
+  mounted() {
+    this.getReportConfig()
+  },
+  methods: {
+    getReportConfig() {
+      this.loading = true
+      listReportConfig({
+        reportCode: 'acid'
+      }).then(res => {
+        console.log(res)
+        if (res.rows.length == 1) {
+          this.actionTypes = res.rows[0].actionTypes
+          this.actionQueryParams = res.rows[0].actionQueryParams
+          this.baseQueryParams = res.rows[0].baseQueryParams
+          this.warehouseOptions = res.rows[0].warehouseOptions
+          this.productionLine = res.rows[0].productionLine
+          this.loading = false
+        }
+      })
     }
   }
 }