From a8756c980e2f3c830adfd3445249ba20c8f8c5f8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 11 Dec 2024 17:16:27 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-11=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/qc/qc.js                         |  2 ++
 src/views/modules/qc/FQASResultEntry.vue |  2 +-
 src/views/modules/qc/IPQCResultEntry.vue | 37 ++++++++++++++++++------
 src/views/modules/qc/IQCResultEntry.vue  |  2 +-
 src/views/modules/qc/OQCResultEntry.vue  |  2 +-
 5 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index 7a157ca..bd96b22 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -144,6 +144,8 @@ export const boxNoEnter = data => createAPI(`/pms/qc/boxNoEnter`,'post',data)
 export const queryPartList = data => createAPI(`/pms/qc/queryPartList`,'post',data)
 export const umSearch = data => createAPI(`/pms/qc/umSearch`,'post',data)
 
+export const getShiftList = data => createAPI(`/pms/qc/getShiftList`,'post',data)
+
 // ===================================== IQC检验 =====================================
 export const qcIQCInspectionSearch = data => createAPI(`/pms/qc/qcIQCInspectionSearch`,'post',data)
 export const iqcDetailSearch = data => createAPI(`/pms/qc/iqcDetailSearch`,'post',data)
diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index cf7c6e8..1eb7936 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -2110,7 +2110,7 @@
 
       rowDetailStyle ({row}) {
         if (this.currentDetailRow.itemNo === row.itemNo) {
-          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+          return { 'background-color': '#50DCDC', cursor: 'pointer' };
         }
       },
 
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 212be22..61a8b40 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -61,14 +61,21 @@
       <el-form-item :label="'派工单号'">
         <el-input v-model="searchData.seqNo" clearable style="width: 173px"></el-input>
       </el-form-item>
-      <el-form-item :label="'加工中心名称'">
-        <el-input v-model="searchData.workCenterDesc" clearable style="width: 120px"></el-input>
+      <el-form-item :label="'加工中心'">
+        <el-input v-model="searchData.workCenterNo" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'工序'">
         <el-input v-model="searchData.operationDesc" clearable style="width: 80px"></el-input>
       </el-form-item>
       <el-form-item :label="'班次'">
-        <el-input v-model="searchData.shiftDesc" clearable style="width: 80px"></el-input>
+        <el-select v-model="searchData.shiftDesc" placeholder="请选择" clearable style="width: 80px">
+          <el-option
+            v-for = "i in shiftList"
+            :key = "i.shiftDesc"
+            :label = "i.shiftDesc"
+            :value = "i.shiftDesc">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="'状态'">
         <el-select v-model="searchData.states" multiple style="width: 340px">
@@ -922,6 +929,7 @@
     actionIPQCInspection, // 开始检验
     dataAcquisition, // 数据采集
     boxNoEnter, // 箱号回车事件
+    getShiftList, // 获取班次
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -1042,7 +1050,7 @@
           seqNo: '',
           states: ['未开始','待检验'],
           createBy: '',
-          workCenterDesc: '',
+          workCenterNo: '',
           shiftDesc: ''
         },
         pageIndex: 1,
@@ -2325,6 +2333,7 @@
         partModelFlag: false,
         umList: [],
         userBuList: [],
+        shiftList: [],
         authSearch: false,
         authSave: false,
         authCheck: false,
@@ -2426,6 +2435,8 @@
       this.getButtonAuthData()
       // 获取用户的 site 和 bu
       this.getSiteAndBuByUserName()
+      // 获取班次
+      this.getShiftList()
       // 收藏
       this.favoriteIsOk()
       // 检验类型
@@ -2453,10 +2464,6 @@
       }
     },
 
-    activated () {
-
-    },
-
     methods: {
       // 列表数据总结
       getSummaries (param) {
@@ -2713,6 +2720,18 @@
         })
       },
 
+      // 获取班次
+      getShiftList () {
+        let tempData = {
+          site: this.$store.state.user.site,
+        }
+        getShiftList(tempData).then(({data}) => {
+          if (data.code === 0) {
+            this.shiftList = data.rows
+          }
+        })
+      },
+
       // ======= 正则校验 =======
       handleInput (value, type) {
         // 大于等于0，且只能输入4位小数
@@ -2908,7 +2927,7 @@
 
       rowDetailStyle ({row}) {
         if (this.currentDetailRow.itemNo === row.itemNo) {
-          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+          return { 'background-color': '#50DCDC', cursor: 'pointer' };
         }
       },
 
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 7c6476d..8bbbc74 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -2704,7 +2704,7 @@
 
       rowDetailStyle ({row}) {
         if (this.currentDetailRow.itemNo === row.itemNo) {
-          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+          return { 'background-color': '#50DCDC', cursor: 'pointer' };
         }
       },
 
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index 4c5f3c0..103a128 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -2084,7 +2084,7 @@
 
       rowDetailStyle ({row}) {
         if (this.currentDetailRow.itemNo === row.itemNo) {
-          return { 'background-color': '#E8F7F6', cursor: 'pointer' };
+          return { 'background-color': '#50DCDC', cursor: 'pointer' };
         }
       },