From e279f0e18810d2c2f0268b05513837bdc666464d Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Sat, 30 Mar 2024 11:34:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=BF=94=E4=BF=AE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/report/repairMeasures.js             |  8 ++++++
 src/views/report/qualityInspection/index.vue | 27 +++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/api/report/repairMeasures.js b/src/api/report/repairMeasures.js
index 0233d29..46cf1b0 100644
--- a/src/api/report/repairMeasures.js
+++ b/src/api/report/repairMeasures.js
@@ -42,3 +42,11 @@ export function delRepairMeasures(objId) {
     method: 'delete'
   })
 }
+
+// 查询返修措施维护详细
+export function findRepairMeasuresList(objId) {
+  return request({
+    url: '/report/repairMeasures/getRepairMeasures',
+    method: 'get'
+  })
+}
diff --git a/src/views/report/qualityInspection/index.vue b/src/views/report/qualityInspection/index.vue
index 0082e87..bcb7631 100644
--- a/src/views/report/qualityInspection/index.vue
+++ b/src/views/report/qualityInspection/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="100px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="箱体码" prop="barCode">
         <el-input
           v-model="queryParams.barCode"
@@ -25,16 +25,16 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-      <el-form-item label="质量缺陷名称" prop="qualityDefectName">
+      <el-form-item label="缺陷名称" prop="qualityDefectName">
         <el-input
           v-model="queryParams.qualityDefectName"
-          placeholder="请输入质量缺陷名称"
+          placeholder="请输入缺陷名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="处理措施" prop="treatmentMeasure">
-        <el-select v-model="queryParams.treatmentMeasure" placeholder="请选择处理措施" clearable>
+        <el-select v-model="queryParams.treatmentMeasure" placeholder="请选择处理措施" clearable style="width: 140px;">
           <el-option
             v-for="dict in dict.type.treatment_measures"
             :key="dict.value"
@@ -43,8 +43,18 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="处理结果" prop="processResult">
+        <el-select v-model="queryParams.processResult" placeholder="请选择处理结果" clearable style="width: 140px;">
+          <el-option
+            v-for="item in repairMeasuresList"
+            :key="item.repairName"
+            :label="item.repairName"
+            :value="item.repairName"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="质检工位" prop="stationCode">
-        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位">
+        <el-select v-model="queryParams.stationCode" placeholder="请选择质检工位" clearable style="width: 140px;">
           <el-option
             v-for="item in productLineList"
             :key="item.productLineCode"
@@ -296,6 +306,7 @@ import {
 } from '@/api/report/qualityInspection'
 import { parseTime } from '@//utils/ruoyi'
 import { findProductLineList } from '@//api/base/productLine'
+import { findRepairMeasuresList } from '@//api/report/repairMeasures'
 
 export default {
   name: 'QualityInspection',
@@ -372,13 +383,17 @@ export default {
         { key: 20, label: `检测人员名称`, visible: true },
         { key: 21, label: `工位名称`, visible: true }
       ],
-      productLineList: []
+      productLineList: [],
+      repairMeasuresList: [],
     }
   },
   created() {
     findProductLineList({ productLineType: 2, stationType: 2 }).then(response => {
       this.productLineList = response.data
     })
+    findRepairMeasuresList().then(response => {
+      this.repairMeasuresList = response.data
+    })
     const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
     this.daterangeBeginTime[0] = nowDate + ' 00:00:00'
     this.daterangeBeginTime[1] = nowDate + ' 23:59:59'