update - 产品追溯导出、生产执行报表联动下拉框检索

src/views/report/productTraceabilityReport/index.vue

@@ -69,16 +69,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <!--      <el-col :span="1.5">-->
+            <el-col :span="1.5">
-      <!--        <el-button-->
+              <el-button
-      <!--          type="warning"-->
+                type="warning"
-      <!--          plain-->
+                plain
-      <!--          icon="el-icon-download"-->
+                icon="el-icon-download"
-      <!--          size="mini"-->
+                size="mini"
-      <!--          @click="handleExport"-->
+                @click="handleExport"
-      <!--        >导出-->
+              >导出
-      <!--        </el-button>-->
+              </el-button>
-      <!--      </el-col>-->
+            </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
@@ -320,9 +320,9 @@ export default {
 
     /** 导出按钮操作 */
     handleExport() {
-      this.download('/report/productionReport/export', {
+      this.download('/report/qualityReport/productTraceabilityReportList/export', {
         ...this.queryParams
-      }, `report_${new Date().getTime()}.xlsx`)
+      }, `产品追溯报表_${new Date().getTime()}.xlsx`)
     }
 
   }

src/views/report/productionExecutionReport/index.vue

@@ -36,6 +36,14 @@
         />
       </el-form-item>
       <el-form-item label="工位">
+        <el-select v-model="selectedType" placeholder="请选择工位类型" clearable :style="{ 'width': '150px' }">
+          <el-option
+            v-for="dict in dict.type.station_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
         <el-select v-model="queryParams.stationCode" placeholder="请选择工位" clearable>
           <el-option
             v-for="item in findStationList"
@@ -123,7 +131,7 @@ import { parseTime } from '@//utils/ruoyi'
 
 export default {
   name: 'ReportInfo',
-  dicts: ['is_flag'],
+  dicts: ['is_flag','station_type'],
   data() {
     return {
       // 遮罩层
@@ -142,6 +150,8 @@ export default {
       totalSum: 0,
       // 报表表格数据
       reportList: [],
+      // 用于存储选择的工位类型
+      selectedType: '1',
       // 弹出层标题
       title: '',
       // 是否显示弹出层
@@ -155,7 +165,7 @@ export default {
         beginBeginTime: null,
         endBeginTime: null,
         productLineCode: 'CX_02',
-        stationCode: null,
+        stationCode: '1009',
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
@@ -181,14 +191,22 @@ export default {
       // 产线选项
       productLineList: [],
       // 工位选项
-      findStationList: []
+      findStationList: [],
+      // 返回工位List
+      stationList: []
     }
   },
   watch: {
     'queryParams.productLineCode': function(newVal, oldVal) {
       // 执行方法，可以在这里调用你的方法
       this.getStationList()
-    }
+    },
+    selectedType(newType) {
+      // 根据选择的工位类型筛选工位列表
+      this.findStationList = this.stationList.filter(item => item.stationType == newType);
+      // 重置选择的工位
+      // this.selectedStation = '';
+    },
   },
   created() {
     findProductLineList({ productLineType: 1 }).then(response => {
@@ -196,7 +214,8 @@ export default {
     }).then(() => {
       return findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
     }).then(response => {
-      this.findStationList = response.data
+      this.stationList = response.data
+      this.findStationList = this.stationList.filter(item => item.stationType == this.selectedType);
     })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
@@ -265,7 +284,8 @@ export default {
       this.queryParams.stationCode = null
       findProductLineList({ productLineType: 2, parentId: this.queryParams.productLineCode })
         .then(response => {
-          this.findStationList = response.data
+          this.stationList = response.data
+          this.findStationList = [];
         })
     },
 

src/views/report/qualityIssuesReport/index.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="产线" prop="PRODUCT_LINE_NAME">
+      <el-form-item label="产线" prop="PRODUCT_LINE_CODE">
-        <el-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线">
+        <el-select v-model="queryParams.PRODUCT_LINE_CODE" placeholder="请选择产线">
           <el-option
             v-for="item in productLineList"
-            :key="item.workCenterCode"
+            :key="item.productLineCode"
-            :label="item.workCenterName"
+            :label="item.productLineName"
-            :value="item.workCenterCode"
+            :value="item.productLineCode"
           ></el-option>
         </el-select>
       </el-form-item>
@@ -49,7 +49,7 @@
         <el-date-picker
           v-model="daterangeBeginTime"
           style="width: 340px"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd HH:mm:ss"
           type="datetimerange"
           range-separator="-"
           start-placeholder="开始时间"
@@ -79,26 +79,23 @@
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
-      <el-table-column label="工厂" align="center" prop="PRODUCT_STATION" v-if="columns[1].visible"/>
+      <el-table-column label="工厂" align="center" prop="FACTORY_NAME" v-if="columns[1].visible"/>
-      <el-table-column label="产线" align="center" prop="ORDER_CODE" v-if="columns[2].visible"/>
+      <el-table-column label="产线" align="center" prop="PRODUCT_LINE_NAME" v-if="columns[2].visible"/>
-      <el-table-column label="缺陷名称" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible">
+      <el-table-column label="缺陷名称" align="center" prop="QUALITY_DEFECT_NAME" v-if="columns[3].visible">
-        <template slot-scope="scope">
+
-          <span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="数量" align="center" prop="MATERIAL_NAME" v-if="columns[4].visible"/>
-      <el-table-column label="缺陷占比" align="center" prop="PRODUCT_CODE" v-if="columns[5].visible"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleOrderDetails(scope.row)"
-            v-hasPermi="['report:pointDnb:edit']"
-          >查看订单明细</el-button>
-        </template>
       </el-table-column>
+      <el-table-column label="数量" align="center" prop="Q_SUM" v-if="columns[4].visible"/>
+      <el-table-column label="缺陷占比" align="center" prop="OFFLINE_NUM" v-if="columns[5].visible"/>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleOrderDetails(scope.row)"-->
+<!--          >查看订单明细</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <!--    <pagination-->
     <!--      v-show="total>0"-->
@@ -113,11 +110,10 @@
 
 <script>
 import {
-  productionExecutionReportList
+  productionExecutionReportList, qualityIssuesReportList
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
-import { getPointDnb } from '@//api/report/pointDnb'
 
 export default {
   name: 'ReportInfo',
@@ -151,7 +147,7 @@ export default {
         beginBeginTime: null,
         endBeginTime: null,
         WORK_CENTER_CODE: null,
-        PRODUCT_LINE_NAME: null,
+        PRODUCT_LINE_CODE: 'CX_02',
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
@@ -163,13 +159,11 @@ export default {
       rules: {},
       columns: [
         { key: 0, label: `主键标识`, visible: false },
-        { key: 1, label: `工位`, visible: true },
+        { key: 1, label: `工厂`, visible: true },
-        { key: 2, label: `订单编号`, visible: true },
+        { key: 2, label: `产线`, visible: true },
-        { key: 3, label: `物料编码`, visible: true },
+        { key: 3, label: `缺陷名称`, visible: true },
-        { key: 4, label: `物料名称`, visible: true },
+        { key: 4, label: `数量`, visible: true },
-        { key: 5, label: `产品编码`, visible: true },
+        { key: 5, label: `缺陷占比`, visible: true },
-        { key: 6, label: `产品型号`, visible: true },
-        { key: 7, label: `数量`, visible: true },
       ],
       // 产线选项
       productLineList: [],
@@ -185,8 +179,8 @@ export default {
       this.findStationList = response.data;
     });
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
-    this.daterangeBeginTime[0] = nowDate
+    this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
-    this.daterangeBeginTime[1] = nowDate
+    this.daterangeBeginTime[1] = nowDate + ' 23:59:59'
     this.getList()
   },
   methods: {
@@ -200,9 +194,9 @@ export default {
         this.queryParams.beginBeginTime = null
         this.queryParams.endBeginTime = null
       }
-      productionExecutionReportList(this.queryParams).then(response => {
+      qualityIssuesReportList(this.queryParams).then(response => {
-        // this.reportList = response.data
+        this.reportList = response.data
-        // this.total = response.total;
+        this.total = response.total;
         this.loading = false
       })
     },

src/views/report/qualityMaterial/index.vue

@@ -389,7 +389,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
+      // this.reset();
       this.open = true;
       this.title = "添加质检材料信息";
     },