update - 测温、补打条码报表优化

src/views/report/electricalInspection/index.vue

@@ -9,6 +9,16 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
+      <el-form-item label="产线" prop="productLineCode">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="产品条码" prop="barcode">
         <el-input
           v-model="queryParams.barcode"
@@ -226,6 +236,7 @@ import {
 } from '@/api/report/electricalInspection'
 import { parseTime } from '@//utils/ruoyi'
 import { getCustomData } from '@//api/base/customData'
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
   name: 'ElectricalInspection',
@@ -263,6 +274,7 @@ export default {
         uuid: null,
         result: null,
         barcode: null,
+        productLineCode: 'CX_02',
         testTime: null,
         testData: null,
         recordTime: null
@@ -282,7 +294,9 @@ export default {
         { key: 7, label: `异常描述`, visible: true }
       ],
       //自定义数据
-      customData: null
+      customData: null,
+      // 产线选项
+      productLineList: [],
     }
   },
   created() {
@@ -290,6 +304,9 @@ export default {
     getCustomData(387).then(response => {
       this.customData = response.data.customData
     })
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
     this.daterangeRecordTime[1] = nowDate + ' 23:59:59'

src/views/report/pourRecordReport/index.vue

@@ -1,6 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="产线" prop="PRODUCT_LINE_CODE">
+        <el-select v-model="queryParams.PRODUCT_LINE_CODE" placeholder="请选择产线" clearable>
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="箱体码" prop="perfusionBoxcode">
         <el-input
           v-model="queryParams.perfusionBoxcode"
@@ -81,6 +91,7 @@
       </el-table-column>
       <el-table-column label="产量" align="center" prop="yield" v-if="columns[15].visible"/>
       <el-table-column label="灌注完成状态字" align="center" prop="finishStatus" v-if="columns[16].visible" width="120"/>
+      <el-table-column label="产线" align="center" prop="PRODUCT_LINE_CODE" v-if="columns[17].visible" width="120"/>
     </el-table>
 
     <pagination
@@ -101,6 +112,7 @@ import {
   getPerfusionRecord
 } from '@/api/report/perfusionRecord'
 import { parseTime } from '@//utils/ruoyi'
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
   name: 'PerfusionRecord',
@@ -145,6 +157,7 @@ export default {
         updatedBy: null,
         updatedTime: null,
         perfusionResult: null,
+        PRODUCT_LINE_CODE: 'CX_02',
         yield: null,
         finishStatus: null
       },
@@ -169,11 +182,17 @@ export default {
         { key: 13, label: `更新时间`, visible: true },
         { key: 14, label: `灌注结果`, visible: true },
         { key: 15, label: `产量`, visible: true },
-        { key: 16, label: `灌注完成状态字`, visible: false }
-      ]
+        { key: 16, label: `灌注完成状态字`, visible: false },
+        { key: 17, label: `产线`, visible: false },
+      ],
+      // 产线选项
+      productLineList: [],
     }
   },
   created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeCreatedTime[0] = nowDate + ' 00:00:00'
     this.daterangeCreatedTime[1] = nowDate + ' 23:59:59'

src/views/report/supplementBarCode/index.vue

@@ -1,6 +1,16 @@
 <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="productLineCode">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="SAP计划编号" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
@@ -209,6 +219,7 @@
 
 <script>
 import { listSupplementBarCode, getSupplementBarCode, delSupplementBarCode, addSupplementBarCode, updateSupplementBarCode } from "@/api/report/supplementBarCode";
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
   name: "SupplementBarCode",
@@ -246,7 +257,8 @@ export default {
         printTime: null,
         printBartype: null,
         printName: null,
-        isPrint: null
+        isPrint: null,
+        productLineCode: null
       },
       // 表单参数
       form: {},
@@ -266,10 +278,15 @@ export default {
             { key: 9, label: `打印原因`, visible: true },
             { key: 10, label: `记录时间`, visible: true },
             { key: 11, label: `记录人`, visible: true },
-        ]
+        ],
+      // 产线选项
+      productLineList: [],
     };
   },
   created() {
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
     this.getList();
   },
   methods: {

src/views/report/temperatureRecordReport/index.vue

@@ -17,6 +17,16 @@
       <!--          @keyup.enter.native="handleQuery"-->
       <!--        />-->
       <!--      </el-form-item>-->
+      <el-form-item label="产线" prop="productLineCode">
+        <el-select v-model="queryParams.productLineCode" placeholder="请选择产线" clearable>
+          <el-option
+            v-for="item in productLineList"
+            :key="item.productLineCode"
+            :label="item.productLineName"
+            :value="item.productLineCode"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="产品条码" prop="cpno">
         <el-input
           v-model="queryParams.cpno"
@@ -157,6 +167,7 @@ import {
 } from '@/api/report/temperatureHistory'
 import { parseTime } from '@//utils/ruoyi'
 import { getCustomData } from '@//api/base/customData'
+import { findProductLineList } from '@//api/base/productLine'
 
 export default {
   name: 'TemperatureHistory',
@@ -198,6 +209,7 @@ export default {
         testedtime: null,
         etemp: null,
         begindatetime: null,
+        productLineCode: 'CX_02',
         cpresult: null,
         enddatetime: null,
         username: null,
@@ -249,7 +261,9 @@ export default {
         { key: 27, label: `供电频率`, visible: true }
       ],
       //自定义数据
-      customData: null
+      customData: null,
+      // 产线选项
+      productLineList: [],
     }
   },
   created() {
@@ -257,6 +271,9 @@ export default {
     getCustomData(388).then(response => {
       this.customData = response.data.customData
     })
+    findProductLineList({ productLineType: 1 }).then(response => {
+      this.productLineList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBegindatetime[0] = nowDate + ' 00:00:00'
     this.daterangeBegindatetime[1] = nowDate + ' 23:59:59'