refactor(wms/report): 重构镀锌、酸轧线报表页面，统一使用通用模板组件

1.  新增了zinc_old和zha_old旧版报表备份目录，保留原有实现
2.  将所有报表页面替换为通用的ActionTemplate组件
3.  为镀锌线、酸轧线的各类报表配置了固定的生产线、仓库选项和操作类型
4.  移除了动态加载报表配置的逻辑，改为硬编码固定配置

klp-ui/src/views/wms/report/zha/comprehensive.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
   name: 'ComprehensiveReport',
   components: {
-    ComprehensiveTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'all',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/day.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'DayReport',
+  name: 'ComprehensiveReport',
   components: {
-    DayTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'day',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/loss.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'LossReport',
+  name: 'ComprehensiveReport',
   components: {
-    LossTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'loss',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/month.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'MonthReport',
+  name: 'ComprehensiveReport',
   components: {
-    MonthTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'month',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/out.vue

@@ -1,47 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'OutReport',
+  name: 'ComprehensiveReport',
   components: {
-    OutTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      baseQueryParams: {},
+      reportType: 'out',
-      warehouseOptions: [],
+      productionLine: '酸轧线',
-      productionLine: '',
+      warehouseOptions: [
-    }
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-  },
+        { label: '镀锌原料库', value: '1988150263284953089' },
-  mounted() {
+        { label: '脱脂原料库', value: '1988150545175736322' },
-    this.getReportConfig()
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  },
+        { label: '技术部', value: '2019583656787259393' },
-  methods: {
+        { label: '小钢卷库', value: '2019583325311414274' },
-    getReportConfig() {
+        { label: '废品库', value: '2019583429955104769' },
-      this.loading = true
+        { label: '退货库', value: '2019583137616310273' },
-      listReportConfig({
+      ],
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/team.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'TeamReport',
+  name: 'ComprehensiveReport',
   components: {
-    TeamTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'team',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha/year.vue

@@ -1,51 +1,31 @@
 <template>
-  <div>
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    <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 ActionTemplate from '@/views/wms/report/template/action.vue'
-import { listReportConfig } from '@/api/wms/reportConfig.js'
 
 export default {
-  name: 'YearReport',
+  name: 'ComprehensiveReport',
   components: {
-    YearTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      loading: true,
+      actionType: '11,120',
-      actionTypes: [],
+      reportType: 'year',
-      actionQueryParams: {},
+      productionLine: '酸轧线',
-      baseQueryParams: {},
+      warehouseOptions: [
-      warehouseOptions: [],
+        { label: '酸连轧成品库', value: '1988150099140866050' },
-      productionLine: '',
+        { label: '镀锌原料库', value: '1988150263284953089' },
-    }
+        { label: '脱脂原料库', value: '1988150545175736322' },
-  },
+        { label: '酸连轧纵剪分条原料库', value: '1988150150521090049' },
-  mounted() {
+        { label: '技术部', value: '2019583656787259393' },
-    this.getReportConfig()
+        { label: '小钢卷库', value: '2019583325311414274' },
-  },
+        { label: '废品库', value: '2019583429955104769' },
-  methods: {
+        { label: '退货库', value: '2019583137616310273' },
-    getReportConfig() {
+      ],
-      this.loading = true
-      listReportConfig({
-        reportCode: 'acid'
-      }).then(res => {
-        console.log(res)
-        if (res.rows.length == 1) {
-          const config = JSON.parse(res.rows[0].configJson)
-          this.actionTypes = config.actionTypes
-          this.actionQueryParams = config.actionQueryParams
-          this.baseQueryParams = config.baseQueryParams
-          this.warehouseOptions = config.warehouseOptions
-          this.productionLine = config.productionLine
-          this.loading = false
-        }
-      })
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zha_old/comprehensive.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'ComprehensiveReport',
+  components: {
+    ComprehensiveTemplate,
+  },
+  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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/day.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'DayReport',
+  components: {
+    DayTemplate,
+  },
+  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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/loss.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/month.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'MonthReport',
+  components: {
+    MonthTemplate,
+  },
+  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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/out.vue

@@ -0,0 +1,47 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'OutReport',
+  components: {
+    OutTemplate,
+  },
+  data() {
+    return {
+      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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/team.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'TeamReport',
+  components: {
+    TeamTemplate,
+  },
+  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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zha_old/year.vue

@@ -0,0 +1,51 @@
+<template>
+  <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 { listReportConfig } from '@/api/wms/reportConfig.js'
+
+export default {
+  name: 'YearReport',
+  components: {
+    YearTemplate,
+  },
+  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) {
+          const config = JSON.parse(res.rows[0].configJson)
+          this.actionTypes = config.actionTypes
+          this.actionQueryParams = config.actionQueryParams
+          this.baseQueryParams = config.baseQueryParams
+          this.warehouseOptions = config.warehouseOptions
+          this.productionLine = config.productionLine
+          this.loading = false
+        }
+      })
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc/comprehensive.vue

@@ -1,26 +1,30 @@
 <template>
-  <ComprehensiveTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import ComprehensiveTemplate from '@/views/wms/report/template/comprehensive.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
 
 export default {
   name: 'ComprehensiveReport',
   components: {
-    ComprehensiveTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'all',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc/day.vue

@@ -1,26 +1,30 @@
 <template>
-  <DayTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import DayTemplate from '@/views/wms/report/template/day.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
 
 export default {
-  name: 'DayReport',
+  name: 'ComprehensiveReport',
   components: {
-    DayTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'day',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc/loss.vue

@@ -1,26 +1,30 @@
 <template>
-  <LossTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  ></LossTemplate>
 </template>
 
 <script>
-  import LossTemplate from '@/views/wms/report/template/loss.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-  import { zincConfig } from '@/views/wms/report/js/config.js'
 
-  export default {
+export default {
-    name: 'LossReport',
+  name: 'ComprehensiveReport',
-    components: {
+  components: {
-      LossTemplate,
+    ActionTemplate,
-    },
+  },
-    data() {
+  data() {
-      return {
+    return {
-        ...zincConfig,
+      actionType: 501,
-      }
+      reportType: 'loss',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
-</script>
+}
+</script>

klp-ui/src/views/wms/report/zinc/month.vue

@@ -1,26 +1,30 @@
 <template>
-  <MonthTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import MonthTemplate from '@/views/wms/report/template/month.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
 
 export default {
-  name: 'MonthReport',
+  name: 'ComprehensiveReport',
   components: {
-    MonthTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'month',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc/out.vue

@@ -1,24 +1,30 @@
 <template>
-  <OutTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import OutTemplate from "@/views/wms/report/template/out.vue";
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
 
 export default {
-  name: 'ZhaTemplate',
+  name: 'ComprehensiveReport',
   components: {
-    OutTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'out',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc/team.vue

@@ -1,26 +1,30 @@
 <template>
-  <TeamTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import TeamTemplate from '@/views/wms/report/template/team.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
 
 export default {
-  name: 'TeamReport',
+  name: 'ComprehensiveReport',
   components: {
-    TeamTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'team',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc/year.vue

@@ -1,27 +1,30 @@
 <template>
-  <YearTemplate
+  <ActionTemplate :actionType="actionType" :reportType="reportType" :productionLine="productionLine" :warehouseOptions="warehouseOptions" />
-    :actionTypes="actionTypes"
-    :actionQueryParams="actionQueryParams"
-    :baseQueryParams="baseQueryParams"
-    :warehouseOptions="warehouseOptions"
-    :productionLine="productionLine"
-  />
 </template>
 
 <script>
-import YearTemplate from '@/views/wms/report/template/year.vue'
+import ActionTemplate from '@/views/wms/report/template/action.vue'
-import { zincConfig } from '@/views/wms/report/js/config.js'
-
 
 export default {
-  name: 'YearReport',
+  name: 'ComprehensiveReport',
   components: {
-    YearTemplate,
+    ActionTemplate,
   },
   data() {
     return {
-      ...zincConfig,
+      actionType: 501,
+      reportType: 'year',
+      productionLine: '镀锌线',
+      warehouseOptions: [
+        { value: '1988150323162836993', label: '镀锌成品库' },
+        { value: '1988150487185289217', label: '镀锌纵剪分条原料库' },
+        { value: '2056545127927787522', label: '镀锌待打包' },
+        { value: '2019583656787259393', label: '技术部' },
+        { value: '2019583325311414274', label: '小钢卷库' },
+        { value: '2019583429955104769', label: '废品库' },
+        { value: '2019583137616310273', label: '退货库' },
+      ],
     }
   }
 }
-</script>
+</script>

klp-ui/src/views/wms/report/zinc_old/comprehensive.vue

@@ -0,0 +1,26 @@
+<template>
+  <ComprehensiveTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import ComprehensiveTemplate from '@/views/wms/report/template/comprehensive.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+export default {
+  name: 'ComprehensiveReport',
+  components: {
+    ComprehensiveTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc_old/day.vue

@@ -0,0 +1,26 @@
+<template>
+  <DayTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import DayTemplate from '@/views/wms/report/template/day.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+export default {
+  name: 'DayReport',
+  components: {
+    DayTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc_old/loss.vue

@@ -0,0 +1,26 @@
+<template>
+  <LossTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  ></LossTemplate>
+</template>
+
+<script>
+  import LossTemplate from '@/views/wms/report/template/loss.vue'
+  import { zincConfig } from '@/views/wms/report/js/config.js'
+
+  export default {
+    name: 'LossReport',
+    components: {
+      LossTemplate,
+    },
+    data() {
+      return {
+        ...zincConfig,
+      }
+    }
+  }
+</script>

klp-ui/src/views/wms/report/zinc_old/month.vue

@@ -0,0 +1,26 @@
+<template>
+  <MonthTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import MonthTemplate from '@/views/wms/report/template/month.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+export default {
+  name: 'MonthReport',
+  components: {
+    MonthTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc_old/out.vue

@@ -0,0 +1,24 @@
+<template>
+  <OutTemplate
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import OutTemplate from "@/views/wms/report/template/out.vue";
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+export default {
+  name: 'ZhaTemplate',
+  components: {
+    OutTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc_old/team.vue

@@ -0,0 +1,26 @@
+<template>
+  <TeamTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import TeamTemplate from '@/views/wms/report/template/team.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+export default {
+  name: 'TeamReport',
+  components: {
+    TeamTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>

klp-ui/src/views/wms/report/zinc_old/year.vue

@@ -0,0 +1,27 @@
+<template>
+  <YearTemplate
+    :actionTypes="actionTypes"
+    :actionQueryParams="actionQueryParams"
+    :baseQueryParams="baseQueryParams"
+    :warehouseOptions="warehouseOptions"
+    :productionLine="productionLine"
+  />
+</template>
+
+<script>
+import YearTemplate from '@/views/wms/report/template/year.vue'
+import { zincConfig } from '@/views/wms/report/js/config.js'
+
+
+export default {
+  name: 'YearReport',
+  components: {
+    YearTemplate,
+  },
+  data() {
+    return {
+      ...zincConfig,
+    }
+  }
+}
+</script>