update - 质量报表

src/api/report/reportAPI.js

@@ -90,6 +90,15 @@ export function productTraceabilityReportList(query) {
   })
 }
 
+// 产品追溯明细
+export function productTraceabilityDetailList(query) {
+  return request({
+    url: '/report/qualityReport/productTraceabilityDetailList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 测温记录报表
 export function temperatureRecordReportList(query) {
   return request({

src/views/report/electricalInspection/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <!--      <el-form-item label="测试总结果" prop="result">-->
       <!--        <el-input-->
       <!--          v-model="queryParams.result"-->
@@ -28,6 +28,16 @@
           end-placeholder="结束日期"
         ></el-date-picker>
       </el-form-item>
+      <el-form-item label="测试总结果" prop="result">
+        <el-select v-model="queryParams.result" placeholder="请选择测试总结果" clearable>
+          <el-option
+            v-for="dict in dict.type.electrical_result"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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>
@@ -224,6 +234,7 @@ import { parseTime } from '@//utils/ruoyi'
 
 export default {
   name: 'ElectricalInspection',
+  dicts: ['electrical_result'],
   data() {
     return {
       // 遮罩层

src/views/report/pourRecordReport/index.vue

@@ -37,41 +37,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['report:perfusionRecord:add']"
-        >新增
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['report:perfusionRecord:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['report:perfusionRecord:remove']"
-        >删除
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -79,7 +44,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['report:perfusionRecord:export']"
         >导出
         </el-button>
       </el-col>
@@ -94,7 +58,7 @@
       <el-table-column label="右侧侧冷媒型号" align="center" prop="perfusionRefrigeranttyperight" v-if="columns[3].visible"/>
       <el-table-column label="设置灌注量" align="center" prop="perfusionSetvolume" v-if="columns[4].visible" width="100"/>
       <el-table-column label="实际灌注量" align="center" prop="perfusionActualvolume" v-if="columns[5].visible" width="100"/>
-      <el-table-column label="灌注压力_R" align="center" prop="perfusionR" v-if="columns[6].visible" width="100"/>
+      <el-table-column label="灌注压力_R" align="center" prop="perfusionR" v-if="columns[6].visible" width="120"/>
       <el-table-column label="灌注压力_L" align="center" prop="perfusionL" v-if="columns[7].visible" width="100"/>
       <el-table-column label="灌注时长" align="center" prop="perfusionDuration" v-if="columns[8].visible"/>
       <el-table-column label="系统" align="center" prop="perfusionSystem" v-if="columns[9].visible"/>

src/views/report/productTraceabilityReport/index.vue

@@ -2,12 +2,12 @@
   <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-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>
@@ -35,21 +35,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工位">
+      <el-form-item label="MES条码" prop="BOX_CODE">
-        <el-select v-model="queryParams.stationCode" placeholder="请选择工位">
+        <el-input
-          <el-option
+          v-model="queryParams.BOX_CODE"
-            v-for="item in findStationList"
+          placeholder="请输入MES条码"
-            :key="item.productLineCode"
+          clearable
-            :label="item.productLineName"
+          @keyup.enter.native="handleQuery"
-            :value="item.productLineCode"
+        />
-          ></el-option>
+      </el-form-item>
-        </el-select>
+      <el-form-item label="成品条码" prop="PRODUCT_SNCODE">
+        <el-input
+          v-model="queryParams.PRODUCT_SNCODE"
+          placeholder="请输入SAP成品条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
       <el-form-item label="起止时间">
         <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="开始时间"
@@ -77,20 +83,17 @@
     </el-row>
 
     <el-table v-loading="loading" :data="reportList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center"/>
+      <!--      <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="PRODUCT_STATION" 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" width="70"/>
-      <el-table-column label="SAP订单编号" align="center" prop="MATERIAL_CODE" v-if="columns[3].visible">
+      <el-table-column label="SAP订单编号" align="center" prop="ORDER_CODE" v-if="columns[3].visible"/>
-        <template slot-scope="scope">
+      <el-table-column label="销售订单号" align="center" prop="SALEORDER_CODE" v-if="columns[4].visible"/>
-          <span>{{ parseTime(scope.row.BEGIN_DATE, '{y}-{m}-{d}') }}</span>
+      <el-table-column label="销售订单行号" align="center" prop="SALEORDER_LINENUMBER" v-if="columns[5].visible"/>
-        </template>
+      <el-table-column label="产品编码" align="center" prop="MATERIAL_CODE" v-if="columns[6].visible"/>
-      </el-table-column>
+      <el-table-column label="产品名称" align="center" prop="MATERIAL_NAME" v-if="columns[7].visible" width="250"/>
-      <el-table-column label="销售订单号" align="center" prop="MATERIAL_NAME" v-if="columns[4].visible"/>
+      <el-table-column label="MES条码" align="center" prop="BOX_CODE" v-if="columns[8].visible" width="200"/>
-      <el-table-column label="销售订单行号" align="center" prop="PRODUCT_CODE" v-if="columns[5].visible"/>
+      <el-table-column label="成品条码" align="center" prop="PRODUCT_SNCODE" v-if="columns[9].visible" width="200"/>
-      <el-table-column label="物料编码" align="center" prop="PRODUCT_NAME" v-if="columns[6].visible"/>
-      <el-table-column label="MES条码" align="center" prop="COMPLETE_AMOUNT" v-if="columns[7].visible"/>
-      <el-table-column label="成品条码" align="center" prop="COMPLETE_AMOUNT" v-if="columns[7].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -98,32 +101,82 @@
             type="text"
             icon="el-icon-search"
             @click="handleOrderDetails(scope.row)"
-            v-hasPermi="['report:pointDnb:edit']"
+          >检验详情
-          >检验详情</el-button>
+          </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"
+    />
+
+    <!-- 详情信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row gutter="15">
+          <el-col :span="11">
+            <el-form-item label="SAP订单编号" prop="ORDER_CODE">
+              <el-input v-model="form.ORDER_CODE" placeholder="请输入SAP订单编号" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="MES条码" prop="BOX_CODE">
+              <el-input v-model="form.BOX_CODE" placeholder="请输入MES条码" :disabled="true"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider content-position="center">产品检验详情信息</el-divider>
+
+        <el-table :data="reportDetailList" :row-class-name="rowDetailIndex"
+                  ref="reportDetailRef"
+        >
+<!--          <el-table-column type="selection" width="50" align="center"/>-->
+          <el-table-column label="序号" prop="index" width="150">
+          </el-table-column>
+          <el-table-column label="质检工位" prop="PRODUCT_LINE_NAME" width="150">
+          </el-table-column>
+          <el-table-column label="处理措施" prop="TREATMENT_MEASURE" width="150">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.treatment_measures" :value="scope.row.TREATMENT_MEASURE"/>
+            </template>
+          </el-table-column>
+          <el-table-column label="返修结果" prop="PROCESS_RESULT" width="150">
+          </el-table-column>
+          <el-table-column label="检验时间" prop="INSPECTOR_TIME" width="150">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.INSPECTOR_TIME, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="检验人" prop="USER_NAME" width="150">
+          </el-table-column>
         </el-table>
-    <!--    <pagination-->
+      </el-form>
-    <!--      v-show="total>0"-->
+      <div slot="footer" class="dialog-footer">
-    <!--      :total="total"-->
+        <el-button @click="cancel">关 闭</el-button>
-    <!--      :page.sync="queryParams.pageNum"-->
+      </div>
-    <!--      :limit.sync="queryParams.pageSize"-->
+    </el-dialog>
-    <!--      @pagination="getList"-->
-    <!--    />-->
 
   </div>
+
+
+
 </template>
 
 <script>
 import {
-  productionExecutionReportList
+  productTraceabilityDetailList,
+  productTraceabilityReportList
 } from '@/api/report/reportAPI'
 import { findProductLineList } from '@//api/base/productLine'
 import { parseTime } from '@//utils/ruoyi'
 
 export default {
   name: 'ReportInfo',
-  dicts: ['is_flag'],
+  dicts: ['is_flag', 'treatment_measures'],
   data() {
     return {
       // 遮罩层
@@ -152,26 +205,29 @@ export default {
         // pageSize: 10,
         beginBeginTime: null,
         endBeginTime: null,
-        WORK_CENTER_CODE: null,
+        BOX_CODE: null,
-        PRODUCT_LINE_NAME: null,
+        PRODUCT_LINE_CODE: 'CX_02',
         ORDER_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
-        BEGIN_DATE: null
+        PRODUCT_SNCODE: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {},
+      reportDetailList: [],
       columns: [
         { key: 0, label: `主键标识`, visible: false },
         { key: 1, label: `工位`, visible: true },
-        { key: 2, label: `订单编号`, visible: true },
+        { key: 2, label: `产线`, visible: true },
-        { key: 3, label: `物料编码`, visible: true },
+        { key: 3, label: `SAP订单编号`, visible: true },
-        { key: 4, label: `物料名称`, visible: true },
+        { key: 4, label: `销售订单号`, visible: false },
-        { key: 5, label: `产品编码`, visible: true },
+        { key: 5, label: `销售订单行号`, visible: false },
-        { key: 6, label: `产品型号`, visible: true },
+        { key: 6, label: `产品编码`, visible: true },
-        { key: 7, label: `数量`, visible: true },
+        { key: 7, label: `产品名称`, visible: true },
+        { key: 8, label: `MES条码`, visible: true },
+        { key: 9, label: `成品条码`, visible: true }
       ],
       // 产线选项
       productLineList: [],
@@ -183,12 +239,12 @@ export default {
     findProductLineList({ productLineType: 1 }).then(response => {
       this.productLineList = response.data
     })
-    findProductLineList({productLineType: 2}).then(response => {
+    // findProductLineList({productLineType: 2}).then(response => {
-      this.findStationList = response.data;
+    //   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: {
@@ -202,9 +258,9 @@ export default {
         this.queryParams.beginBeginTime = null
         this.queryParams.endBeginTime = null
       }
-      productionExecutionReportList(this.queryParams).then(response => {
+      productTraceabilityReportList(this.queryParams).then(response => {
-        // this.reportList = response.data
+        this.reportList = response.rows
-        // this.total = response.total;
+        this.total = response.total
         this.loading = false
       })
     },
@@ -213,6 +269,10 @@ export default {
       this.open = false
       this.reset()
     },
+    /** 数据明细序号 */
+    rowDetailIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1
+    },
     // 表单重置
     reset() {
       this.daterangeBeginTime = []
@@ -220,6 +280,7 @@ export default {
         WORK_CENTER_CODE: null,
         PRODUCT_LINE_NAME: null,
         ORDER_CODE: null,
+        BOX_CODE: null,
         MATERIAL_CODE: null,
         MATERIAL_NAME: null,
         BEGIN_DATE: null
@@ -238,7 +299,16 @@ export default {
     },
     /** 查看明细 */
     handleOrderDetails(row) {
-      this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE});
+      // this.$tab.openPage("SAP订单信息","/order/orderInfo" , {ORDER_CODE: row.ORDER_CODE})
+      console.log(row)
+      this.form.BOX_CODE= row.BOX_CODE
+      this.form.ORDER_CODE= row.ORDER_CODE
+      productTraceabilityDetailList({ BOX_CODE: row.BOX_CODE }).then(response => {
+        this.reportDetailList = response.data
+        this.open = true
+        this.title = '产品检验详情'
+      })
+
     },
 
     // 多选框选中数据

src/views/report/qualityInspection/index.vue

@@ -108,14 +108,14 @@
     <el-table v-loading="loading" :data="qualityInspectionList" @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="barCode" v-if="columns[1].visible"/>
+      <el-table-column label="箱体码" align="center" prop="barCode" v-if="columns[1].visible" width="120"/>
-      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
+      <el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible" width="150"/>
       <el-table-column label="工序编号" align="center" prop="processCode" v-if="columns[3].visible"/>
       <el-table-column label="工序名称" align="center" prop="processName" v-if="columns[18].visible"/>
-      <el-table-column label="工位名称" align="center" prop="productLineName" v-if="columns[21].visible"/>
+      <el-table-column label="工位名称" align="center" prop="productLineName" v-if="columns[21].visible" width="120"/>
       <el-table-column label="检测项编号" align="center" prop="testItemCode" v-if="columns[4].visible"/>
-      <el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[5].visible"/>
+      <el-table-column label="质量缺陷编码" align="center" prop="qualityDefectCode" v-if="columns[5].visible" width="100"/>
-      <el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[6].visible"/>
+      <el-table-column label="质量缺陷名称" align="center" prop="qualityDefectName" v-if="columns[6].visible" width="120"/>
       <el-table-column label="处理措施" align="center" prop="treatmentMeasure" v-if="columns[7].visible">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.treatment_measures" :value="scope.row.treatmentMeasure"/>
@@ -128,16 +128,16 @@
         </template>
       </el-table-column>
       <el-table-column label="班组编号" align="center" prop="groupCode" v-if="columns[10].visible"/>
-      <el-table-column label="班组名称" align="center" prop="groupName" v-if="columns[10].visible"/>
+      <el-table-column label="班组名称" align="center" prop="groupName" v-if="columns[10].visible" width="120"/>
-      <el-table-column label="检测人员编号" align="center" prop="inspectorCode" v-if="columns[11].visible"/>
+      <el-table-column label="检测人员编号" align="center" prop="inspectorCode" v-if="columns[11].visible" width="100"/>
-      <el-table-column label="检测人员名称" align="center" prop="inspectorName" v-if="columns[20].visible"/>
+      <el-table-column label="检测人员名称" align="center" prop="inspectorName" v-if="columns[20].visible" width="120"/>
       <el-table-column label="检测时间" align="center" prop="inspectorTime" width="180" v-if="columns[12].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.inspectorTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="返修次数" align="center" prop="reworkNumber" v-if="columns[13].visible"/>
-      <el-table-column label="完成时间" align="center" prop="finishTime" width="180" v-if="columns[14].visible">
+      <el-table-column label="返修完成时间" align="center" prop="finishTime" width="180" v-if="columns[14].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
@@ -236,12 +236,12 @@
         <el-form-item label="返修次数" prop="reworkNumber">
           <el-input v-model="form.reworkNumber" placeholder="请输入返修次数" />
         </el-form-item>
-        <el-form-item label="完成时间" prop="finishTime">
+        <el-form-item label="返修完成时间" prop="finishTime">
           <el-date-picker clearable
             v-model="form.finishTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择完成时间">
+            placeholder="请选择返修完成时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="是否标识" prop="isFlag">
@@ -331,11 +331,11 @@ export default {
             { key: 7, label: `处理措施`, visible: true },
             { key: 8, label: `处理结果`, visible: true },
             { key: 9, label: `是否下静态线`, visible: false },
-            { key: 10, label: `班组编号`, visible: true },
+            { key: 10, label: `班组编号`, visible: false },
-            { key: 11, label: `检测人员编号`, visible: true },
+            { key: 11, label: `检测人员编号`, visible: false },
             { key: 12, label: `检测时间`, visible: true },
             { key: 13, label: `返修次数`, visible: true },
-            { key: 14, label: `完成时间`, visible: true },
+            { key: 14, label: `返修完成时间`, visible: true },
             { key: 15, label: `是否标识`, visible: false },
             { key: 16, label: `更新人`, visible: false },
             { key: 17, label: `更新时间`, visible: false },

src/views/report/scanOfflineRecordReport/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产线" prop="productLineCode">
         <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
           <el-option

src/views/report/temperatureRecordReport/index.vue

@@ -43,6 +43,16 @@
           start-placeholder="开始时间"
           end-placeholder="结束时间"
         ></el-date-picker>
+        <el-form-item label="测试结果" prop="cpresult">
+          <el-select v-model="queryParams.cpresult" placeholder="请选择测试结果" clearable>
+            <el-option
+              v-for="dict in dict.type.cp_result"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -132,6 +142,7 @@ import { parseTime } from '@//utils/ruoyi'
 
 export default {
   name: 'TemperatureHistory',
+  dicts: ['cp_result'],
   data() {
     return {
       // 遮罩层