update -报表加编号

5 months ago · b764222788
parent e5bcead91c
commit b764222788
12 changed files with 150 additions and 34 deletions
--- a/src/views/report/boxTraceabilityReport/index.vue
+++ b/src/views/report/boxTraceabilityReport/index.vue
@ -79,7 +79,10 @@
        >差异明细导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="boxTraceabilityList" @selection-change="handleSelectionChange">
@ -195,6 +198,7 @@ import {
  boxTraceabilityDetailReport,
  boxTraceabilityReport,
 } from '@//api/report/reportAPI'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ProductOffLine',
@ -273,13 +277,19 @@ export default {
        { key: 12, label: `报废记录数`, visible: true }
      ],
      // 产线选项
-      productLineList: []
+      productLineList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
    findProductLineList({ productLineType: 1 }).then(response => {
      this.productLineList = response.data
    })
+    //获取自定义数据
+    getCustomData(391).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/boxTurnoverTraceabilityReport/index.vue
+++ b/src/views/report/boxTurnoverTraceabilityReport/index.vue
@ -95,7 +95,10 @@
        >流转详情导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -190,6 +193,7 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'BoxTurnoverTraceabilityReport',
@ -251,7 +255,9 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
@ -264,6 +270,10 @@ export default {
    // const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    // this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    // this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
+    //获取自定义数据
+    getCustomData(392).then(response => {
+      this.customData = response.data.customData
+    })
    this.getList()
  },
  methods: {
--- a/src/views/report/codeBandingReport/index.vue
+++ b/src/views/report/codeBandingReport/index.vue
@ -78,7 +78,10 @@
          @click="handleExport"
        >导出</el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="codeBandingList" @selection-change="handleSelectionChange">
@ -119,6 +122,7 @@
 import { listCodeBanding } from "@/api/report/codeBanding";
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'
 export default {
  name: "CodeBandingReport",
  data() {
@ -190,12 +194,17 @@ export default {
      ],
      // 产线选项
      productLineList: [],
+      //自定义数据
+      customData: null
    };
  },
  created() {
    findProductLineList({ productLineType: 1 }).then(response => {
      this.productLineList = response.data
    })
+    getCustomData(394).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/electricalInspection/index.vue
+++ b/src/views/report/electricalInspection/index.vue
@ -91,7 +91,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="electricalInspectionList" @selection-change="handleSelectionChange">
@ -222,6 +225,7 @@ import {
  updateElectricalInspection
 } from '@/api/report/electricalInspection'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ElectricalInspection',
@ -276,10 +280,16 @@ export default {
        { key: 5, label: `记录时间`, visible: false },
        { key: 6, label: `产品型号`, visible: true },
        { key: 7, label: `异常描述`, visible: true }
-      ]
+      ],
+      //自定义数据
+      customData: null
    }
  },
  created() {
+    //获取自定义数据
+    getCustomData(387).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
    this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/fewerMistakesReport/index.vue
+++ b/src/views/report/fewerMistakesReport/index.vue
@ -65,7 +65,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -107,6 +110,7 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ReportInfo',
@ -166,7 +170,9 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
@ -176,6 +182,10 @@ export default {
    findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
      this.findStationList = response.data
    })
+    //获取自定义数据
+    getCustomData(385).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate
    this.daterangeBeginTime[1] = nowDate
--- a/src/views/report/lastShotRecord/index.vue
+++ b/src/views/report/lastShotRecord/index.vue
@ -58,7 +58,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="lastShotRecordList" @selection-change="handleSelectionChange">
@ -131,6 +134,7 @@ import {
 } from '@/api/report/lastShotRecord'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'LastShotRecord',
@ -229,14 +233,19 @@ export default {
        { key: 30, label: `工位名称`, visible: true }
      ],
      // 产线选项
-      productLineList: []
+      productLineList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
    findProductLineList({ productLineType: 1 }).then(response => {
      this.productLineList = response.data
    })
-
+    //获取自定义数据
+    getCustomData(389).then(response => {
+      this.customData = response.data.customData
+    })
    this.type = this.$route.query.type;

    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
--- a/src/views/report/productTraceabilityReport/index.vue
+++ b/src/views/report/productTraceabilityReport/index.vue
@ -61,16 +61,16 @@
          ></el-option>
        </el-select>
      </el-form-item>
-<!--      <el-form-item label="是否降级品" prop="isDowngrade">-->
-<!--        <el-select v-model="queryParams.isDowngrade" placeholder="请选择是否降级品" clearable>-->
-<!--          <el-option-->
-<!--            v-for="item in isDowngradeList"-->
-<!--            :key="item.key"-->
-<!--            :label="item.label"-->
-<!--            :value="item.key"-->
-<!--          ></el-option>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="是否降级品" prop="isDowngrade">-->
+      <!--        <el-select v-model="queryParams.isDowngrade" placeholder="请选择是否降级品" clearable>-->
+      <!--          <el-option-->
+      <!--            v-for="item in isDowngradeList"-->
+      <!--            :key="item.key"-->
+      <!--            :label="item.label"-->
+      <!--            :value="item.key"-->
+      <!--          ></el-option>-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
      <el-form-item label="起止时间">
        <el-date-picker
          v-model="daterangeBeginTime"
@ -99,7 +99,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -199,6 +202,7 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ProductTraceabilityReport',
@ -262,13 +266,19 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
    findProductLineList({ productLineType: 1 }).then(response => {
      this.productLineList = response.data
    })
+    //获取自定义数据
+    getCustomData(382).then(response => {
+      this.customData = response.data.customData
+    })
    // findProductLineList({productLineType: 2}).then(response => {
    //   this.findStationList = response.data;
    // });
--- a/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
+++ b/src/views/report/qualityDefectsStatisticalAnalysisReport/index.vue
@ -67,7 +67,10 @@
        >缺陷明细导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -146,6 +149,7 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ReportInfo',
@ -207,7 +211,9 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
@ -217,6 +223,10 @@ export default {
    findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
      this.findStationList = response.data
    })
+    //获取自定义数据
+    getCustomData(384).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/qualityIssuesReport/index.vue
+++ b/src/views/report/qualityIssuesReport/index.vue
@ -81,7 +81,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -121,6 +124,7 @@ import {
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'ReportInfo',
@ -179,7 +183,9 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  created() {
@ -189,6 +195,10 @@ export default {
    findProductLineList({ productLineType: 2 }).then(response => {
      this.findStationList = response.data
    })
+    //获取自定义数据
+    getCustomData(386).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/repairRateReport/index.vue
+++ b/src/views/report/repairRateReport/index.vue
@ -89,7 +89,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
@ -123,6 +126,7 @@ import {
 import {findProductLineList} from '@//api/base/productLine'
 import {parseTime} from '@//utils/ruoyi'
 import Chart from "@/components/board/Chart";
+import { getCustomData } from '@//api/base/customData'

 const vw = (document.documentElement.clientWidth || document.body.clientWidth) / 100
 export default {
@ -190,7 +194,9 @@ export default {
      // 产线选项
      productLineList: [],
      // 工位选项
-      findStationList: []
+      findStationList: [],
+      //自定义数据
+      customData: null
    }
  },
  watch: {
@ -218,7 +224,10 @@ export default {
    this.queryParams.endBeginTime = this.daterangeBeginTime[1]
    // this.getList()
    this.getChart()
-
+    //获取自定义数据
+    getCustomData(383).then(response => {
+      this.customData = response.data.customData
+    })
  },
  methods: {
    getChart() {
--- a/src/views/report/scanOfflineRecordReport/index.vue
+++ b/src/views/report/scanOfflineRecordReport/index.vue
@ -78,7 +78,10 @@
          @click="handleExport"
        >导出</el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="productOffLineList" @selection-change="handleSelectionChange">
@ -126,6 +129,7 @@
 import { listProductOffLine } from "@/api/report/productOffLine";
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'
 export default {
  name: "ProductOffLine",
  data() {
@ -208,12 +212,17 @@ export default {
      ],
      // 产线选项
      productLineList: [],
+      //自定义数据
+      customData: null
    };
  },
  created() {
    findProductLineList({ productLineType: 1 }).then(response => {
      this.productLineList = response.data
    })
+    getCustomData(393).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
--- a/src/views/report/temperatureRecordReport/index.vue
+++ b/src/views/report/temperatureRecordReport/index.vue
@ -70,7 +70,10 @@
        >导出
        </el-button>
      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      <div style="float: right">
+        <span style="font-weight: 700; padding-right: 20px">{{ this.customData }}</span>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+      </div>
    </el-row>

    <el-table v-loading="loading" :data="temperatureHistoryList" @selection-change="handleSelectionChange">
@ -145,6 +148,7 @@ import {
  updateTemperatureHistory
 } from '@/api/report/temperatureHistory'
 import { parseTime } from '@//utils/ruoyi'
+import { getCustomData } from '@//api/base/customData'

 export default {
  name: 'TemperatureHistory',
@ -235,10 +239,16 @@ export default {
        { key: 25, label: `低压启动测试电压`, visible: true },
        { key: 26, label: `同步时间`, visible: true },
        { key: 27, label: `供电频率`, visible: true }
-      ]
+      ],
+      //自定义数据
+      customData: null
    }
  },
  created() {
+    //获取自定义数据
+    getCustomData(388).then(response => {
+      this.customData = response.data.customData
+    })
    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
    this.daterangeBegindatetime[0] = nowDate + ' 00:00:00'
    this.daterangeBegindatetime[1] = nowDate + ' 23:59:59'