update - 测温、灌注报表

src/api/report/reportAPI.js

@@ -71,3 +71,22 @@ export function productTraceabilityReportList(query) {
     params: query
   })
 }
+
+// 测温记录报表
+export function temperatureRecordReportList(query) {
+  return request({
+    url: '/report/qualityReport/temperatureRecordReportList',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 灌注记录报表
+export function pourRecordReportList(query) {
+  return request({
+    url: '/report/qualityReport/pourRecordReportList',
+    method: 'get',
+    params: query
+  })
+}

src/views/report/pourRecordReport/index.vue

@@ -0,0 +1,263 @@
+<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-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.workCenterCode"
+            :label="item.workCenterName"
+            :value="item.workCenterCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品编码" prop="MATERIAL_CODE">
+        <el-input
+          v-model="queryParams.MATERIAL_CODE"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="MATERIAL_NAME">
+        <el-input
+          v-model="queryParams.MATERIAL_NAME"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="SAP订单编号" prop="ORDER_CODE">
+        <el-input
+          v-model="queryParams.ORDER_CODE"
+          placeholder="请输入SAP计划编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工位">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
+          <el-option
+            v-for="item in findStationList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="起止时间">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <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="PERFUSION_BOXCODE" v-if="columns[1].visible"/>
+      <el-table-column label="左侧冷媒型号" align="center" prop="PERFUSION_REFRIGERANTTYPELEFT" v-if="columns[2].visible"/>
+      <el-table-column label="右侧侧冷媒型号" align="center" prop="PERFUSION_REFRIGERANTTYPERIGHT" v-if="columns[3].visible"/>
+      <el-table-column label="设置灌注量" align="center" prop="PERFUSION_SETVOLUME" v-if="columns[4].visible"/>
+      <el-table-column label="实际灌注量" align="center" prop="PERFUSION_ACTUALVOLUME" v-if="columns[5].visible"/>
+      <el-table-column label="灌注压力_R" align="center" prop="PERFUSION_R" v-if="columns[6].visible"/>
+      <el-table-column label="灌注压力_L" align="center" prop="PERFUSION_L" v-if="columns[7].visible"/>
+      <el-table-column label="灌注时长" align="center" prop="PERFUSION_DURATION" v-if="columns[7].visible"/>
+      <el-table-column label="系统" align="center" prop="PERFUSION_SYSTEM" v-if="columns[7].visible"/>
+      <el-table-column label="灌注结果" align="center" prop="PERFUSION_RESULT" v-if="columns[7].visible"/>
+      <el-table-column label="记录时间" align="center" prop="CREATED_TIME" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <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-search"-->
+<!--            @click="handleOrderDetails(scope.row)"-->
+<!--            v-hasPermi="['report:pointDnb:edit']"-->
+<!--          >检验详情</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+    <!--    <pagination-->
+    <!--      v-show="total>0"-->
+    <!--      :total="total"-->
+    <!--      :page.sync="queryParams.pageNum"-->
+    <!--      :limit.sync="queryParams.pageSize"-->
+    <!--      @pagination="getList"-->
+    <!--    />-->
+
+  </div>
+</template>
+
+<script>
+import {
+  pourRecordReportList
+} from '@/api/report/reportAPI'
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+
+export default {
+  name: 'ReportInfo',
+  dicts: ['is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报表表格数据
+      reportList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 更新时间时间范围
+      daterangeBeginTime: [],
+      // 查询参数
+      queryParams: {
+        // pageNum: 1,
+        // pageSize: 10,
+        beginBeginTime: null,
+        endBeginTime: null,
+        WORK_CENTER_CODE: null,
+        PRODUCT_LINE_NAME: null,
+        ORDER_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        BEGIN_DATE: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `工位`, visible: true },
+        { key: 2, label: `订单编号`, visible: true },
+        { key: 3, label: `物料编码`, visible: true },
+        { key: 4, label: `物料名称`, visible: true },
+        { key: 5, label: `产品编码`, visible: true },
+        { key: 6, label: `产品型号`, visible: true },
+        { key: 7, label: `数量`, visible: true },
+      ],
+      // 产线选项
+      productLineList: [],
+      // 工位选项
+      findStationList: []
+    }
+  },
+  created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
+    findProductLineList({productLineType: 2}).then(response => {
+      this.findStationList = response.data;
+    });
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate
+    this.daterangeBeginTime[1] = nowDate
+    this.getList()
+  },
+  methods: {
+    /** 查询工单信息列表 */
+    getList() {
+      this.loading = true
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.endBeginTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.beginBeginTime = null
+        this.queryParams.endBeginTime = null
+      }
+      pourRecordReportList(this.queryParams).then(response => {
+        this.reportList = response.data
+        this.total = response.total;
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.daterangeBeginTime = []
+      this.form = {
+        WORK_CENTER_CODE: null,
+        PRODUCT_LINE_NAME: null,
+        ORDER_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        BEGIN_DATE: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 查看明细 */
+    handleOrderDetails(row) {
+      this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/report/productionReport/export', {
+        ...this.queryParams
+      }, `report_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+</script>

src/views/report/temperatureRecordReport/index.vue

@@ -0,0 +1,274 @@
+<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-select v-model="queryParams.WORK_CENTER_CODE" placeholder="请选择产线">
+          <el-option
+            v-for="item in productLineList"
+            :key="item.workCenterCode"
+            :label="item.workCenterName"
+            :value="item.workCenterCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品编码" prop="MATERIAL_CODE">
+        <el-input
+          v-model="queryParams.MATERIAL_CODE"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="MATERIAL_NAME">
+        <el-input
+          v-model="queryParams.MATERIAL_NAME"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="SAP订单编号" prop="ORDER_CODE">
+        <el-input
+          v-model="queryParams.ORDER_CODE"
+          placeholder="请输入SAP计划编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工位">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
+          <el-option
+            v-for="item in findStationList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="起止时间">
+        <el-date-picker
+          v-model="daterangeBeginTime"
+          style="width: 340px"
+          value-format="yyyy-MM-dd"
+          type="datetimerange"
+          range-separator="-"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <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="LINE_NO" v-if="columns[1].visible"/>
+      <el-table-column label="工位号" align="center" prop="GONGW_NO" v-if="columns[2].visible"/>
+      <el-table-column label="产品条码" align="center" prop="CP_NO" 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="CP_MODEL" v-if="columns[4].visible"/>
+      <el-table-column label="基准型号" align="center" prop="FACTORY_MODEL" v-if="columns[5].visible"/>
+      <el-table-column label="工作电压" align="center" prop="VOLTAGE" v-if="columns[6].visible"/>
+      <el-table-column label="测试通道" align="center" prop="POINT2" v-if="columns[7].visible"/>
+      <el-table-column label="计划测试时间" align="center" prop="TEST_TIME" v-if="columns[7].visible"/>
+      <el-table-column label="实际测试时间" align="center" prop="TESTED_TIME" v-if="columns[7].visible"/>
+      <el-table-column label="环温" align="center" prop="ETEMP" v-if="columns[7].visible"/>
+      <el-table-column label="开始测试时间" align="center" prop="BEGIN_DATETIME" v-if="columns[7].visible"/>
+      <el-table-column label="测试结果" align="center" prop="CP_RESULT" v-if="columns[7].visible"/>
+      <el-table-column label="测试结束时间" align="center" prop="END_DATETIME" v-if="columns[7].visible"/>
+      <el-table-column label="系统用户" align="center" prop="USER_NAME" v-if="columns[7].visible"/>
+      <el-table-column label="备注" align="center" prop="REMARK" v-if="columns[7].visible"/>
+      <el-table-column label="第几次测试" align="center" prop="TEST_NO" v-if="columns[7].visible"/>
+      <el-table-column label="温度数据" align="center" prop="TEMP_MES" v-if="columns[7].visible"/>
+      <el-table-column label="计划测试时间" align="center" prop="TEST_TIME" v-if="columns[7].visible"/>
+      <el-table-column label="功率数据" align="center" prop="POWER_MES" v-if="columns[7].visible"/>
+      <el-table-column label="部件测试数据" align="center" prop="PART_MES" v-if="columns[7].visible"/>
+      <el-table-column label="故障代码" align="center" prop="ERRORCODE_MES" v-if="columns[7].visible"/>
+      <el-table-column label="记录插入时间" align="center" prop="RECORD_TIME" v-if="columns[7].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-search"-->
+<!--            @click="handleOrderDetails(scope.row)"-->
+<!--            v-hasPermi="['report:pointDnb:edit']"-->
+<!--          >检验详情</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+    </el-table>
+    <!--    <pagination-->
+    <!--      v-show="total>0"-->
+    <!--      :total="total"-->
+    <!--      :page.sync="queryParams.pageNum"-->
+    <!--      :limit.sync="queryParams.pageSize"-->
+    <!--      @pagination="getList"-->
+    <!--    />-->
+
+  </div>
+</template>
+
+<script>
+import {
+  temperatureRecordReportList
+} from '@/api/report/reportAPI'
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+
+export default {
+  name: 'ReportInfo',
+  dicts: ['is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 报表表格数据
+      reportList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 更新时间时间范围
+      daterangeBeginTime: [],
+      // 查询参数
+      queryParams: {
+        // pageNum: 1,
+        // pageSize: 10,
+        beginBeginTime: null,
+        endBeginTime: null,
+        WORK_CENTER_CODE: null,
+        PRODUCT_LINE_NAME: null,
+        ORDER_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        BEGIN_DATE: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+      columns: [
+        { key: 0, label: `主键标识`, visible: false },
+        { key: 1, label: `工位`, visible: true },
+        { key: 2, label: `订单编号`, visible: true },
+        { key: 3, label: `物料编码`, visible: true },
+        { key: 4, label: `物料名称`, visible: true },
+        { key: 5, label: `产品编码`, visible: true },
+        { key: 6, label: `产品型号`, visible: true },
+        { key: 7, label: `数量`, visible: true },
+      ],
+      // 产线选项
+      productLineList: [],
+      // 工位选项
+      findStationList: []
+    }
+  },
+  created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
+    findProductLineList({productLineType: 2}).then(response => {
+      this.findStationList = response.data;
+    });
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeBeginTime[0] = nowDate
+    this.daterangeBeginTime[1] = nowDate
+    this.getList()
+  },
+  methods: {
+    /** 查询工单信息列表 */
+    getList() {
+      this.loading = true
+      if (null != this.daterangeBeginTime && '' != this.daterangeBeginTime) {
+        this.queryParams.beginBeginTime = this.daterangeBeginTime[0]
+        this.queryParams.endBeginTime = this.daterangeBeginTime[1]
+      } else {
+        this.queryParams.beginBeginTime = null
+        this.queryParams.endBeginTime = null
+      }
+      temperatureRecordReportList(this.queryParams).then(response => {
+        this.reportList = response.data
+        this.total = response.total;
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.daterangeBeginTime = []
+      this.form = {
+        WORK_CENTER_CODE: null,
+        PRODUCT_LINE_NAME: null,
+        ORDER_CODE: null,
+        MATERIAL_CODE: null,
+        MATERIAL_NAME: null,
+        BEGIN_DATE: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      // this.queryParams.pageNum = 1;
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 查看明细 */
+    handleOrderDetails(row) {
+      this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
+    },
+
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/report/productionReport/export', {
+        ...this.queryParams
+      }, `report_${new Date().getTime()}.xlsx`)
+    }
+
+  }
+}
+</script>