From e0f8ca0ed36cb2e8a639fe5ca69f452d8670879c Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Fri, 25 Apr 2025 17:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=A7=E5=93=81=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2/=E5=AE=8C=E4=BA=A7=E6=B8=85=E7=BA=BF=E7=82=B9?=
 =?UTF-8?q?=E6=A3=80=E8=A1=A8=E7=AD=89=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yangwl <1726150332@qq.com>
---
 src/views/mes/firstInspection/index.vue      | 37 +++++++++++++++-----
 src/views/mes/pointInspection/index.vue      | 31 ++++++++++++----
 src/views/mes/selfMutualInspection/index.vue | 36 ++++++++++++++-----
 3 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/src/views/mes/firstInspection/index.vue b/src/views/mes/firstInspection/index.vue
index 6bcd8a9..4c97c04 100644
--- a/src/views/mes/firstInspection/index.vue
+++ b/src/views/mes/firstInspection/index.vue
@@ -18,11 +18,11 @@
         </el-row>
         <br />
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>生产车间:黑蚊香车间</div>
             <br />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               生产产线:
               <el-select
@@ -43,7 +43,7 @@
             </div>
             <br />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               检查日期:
               <el-date-picker
@@ -58,6 +58,19 @@
             </div>
             <br />
           </el-col>
+
+          <el-col :span="6">
+            <div>
+              班次:
+              <el-select v-model="headerParameters.shiftId" placeholder="请选择班次" clearable>
+                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+                           :value="item.shiftId"
+                ></el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+
           <el-col :span="8">
             <div>
               产品名称:
@@ -374,7 +387,7 @@ import {
   updateTable,
   getWorkList,
 } from "@/api/mes/selfMutualInspection";
-
+import {  getProShifts }  from '@/api/plan/order'
 export default {
   name: "Item",
   dicts: ["device_item_type", "device_loop_type"],
@@ -419,6 +432,7 @@ export default {
         id: null, //主表ID
         workorderId: null, //工单的id
         reportName: "ConversionReportLeft", //表类型
+        shiftId: null,
         productionWorkshop: null, //生产车间
         lineCode: null, //生产产线编码
         lineName: null, //生产产线名称
@@ -434,10 +448,14 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 班次
+      workShift: [],
+
     };
   },
   created() {
     this.getLineCode();
+    this.getProShift();
     this.getList();
   },
 
@@ -555,7 +573,11 @@ export default {
         this.lineCodeOption = response;
       });
     },
-
+    // 获取班次信息
+    getProShift() {
+        getProShifts().then(response => {
+          this.workShift = response.data
+        })},
     getProductList() {
       getProductList(this.headerParameters).then((response) => {
         this.productCodeOption = response;
@@ -570,7 +592,7 @@ export default {
 
           if (!found) {
             this.headerParameters.id = null;
-          } 
+          }
         }
       });
     },
@@ -603,7 +625,6 @@ export default {
       this.tableTittle0 = [];
       this.propertyNum = null;
       this.loading = true;
-
       getSelfMutualInspectionData(this.headerParameters).then((response) => {
         this.headerParameters.createBy = response.createBy; //检查人
         this.headerParameters.remark = response.remark; //备注
@@ -889,4 +910,4 @@ export default {
   border: 1px solid black;
   padding: 2px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mes/pointInspection/index.vue b/src/views/mes/pointInspection/index.vue
index 41e33d2..d0c02a6 100644
--- a/src/views/mes/pointInspection/index.vue
+++ b/src/views/mes/pointInspection/index.vue
@@ -19,7 +19,7 @@
         <div class="formCode">表单编号:08GL05C001-014A</div>
         <br />
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               生产产线:
               <el-select
@@ -40,7 +40,7 @@
             </div>
             <br />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               检查日期:
               <el-date-picker
@@ -53,7 +53,20 @@
               </el-date-picker>
             </div>
           </el-col>
-          <el-col :span="8">
+
+          <el-col :span="6">
+            <div>
+              班次:
+              <el-select v-model="headerParameters.shiftId" placeholder="请选择班次" clearable>
+                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+                           :value="item.shiftId"
+                ></el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+
+          <el-col :span="6">
             <el-button
               type="primary"
               icon="el-icon-search"
@@ -377,7 +390,7 @@ import {
   getLineCodeList,
   updatePointInspectionTable,
 } from "@/api/mes/selfMutualInspection";
-
+import {  getProShifts }  from '@/api/plan/order'
 export default {
   name: "Item",
   dicts: ["device_item_type", "device_loop_type"],
@@ -422,6 +435,7 @@ export default {
         productionWorkshop: null, //生产车间
         lineCode: null, //生产产线编码
         lineName: null, //生产产线名称
+        shiftId: null,
         createBy: null, //检查人
         productName: null, //产品名称
         checkDate: null, //检查日期
@@ -437,6 +451,7 @@ export default {
   created() {
     // this.getDate();
     this.getLineCode();
+    this.getProShift();
     this.getList();
   },
   methods: {
@@ -548,7 +563,11 @@ export default {
         this.lineCodeOption = response;
       });
     },
-
+    // 获取班次信息
+    getProShift() {
+      getProShifts().then(response => {
+        this.workShift = response.data
+      })},
     /** 重置按钮操作 */
     resetQuery() {
       (this.headerParameters.productionWorkshop = null), //生产车间
@@ -766,4 +785,4 @@ export default {
 .check-box {
   font-size: 3px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/mes/selfMutualInspection/index.vue b/src/views/mes/selfMutualInspection/index.vue
index 0426872..e1f8f22 100644
--- a/src/views/mes/selfMutualInspection/index.vue
+++ b/src/views/mes/selfMutualInspection/index.vue
@@ -18,11 +18,11 @@
         </el-row>
         <br />
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>生产车间:黑蚊香车间</div>
             <br />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               生产产线:
               <el-select
@@ -43,7 +43,7 @@
             </div>
             <br />
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               检查日期:
               <el-date-picker
@@ -58,7 +58,19 @@
             </div>
             <br />
           </el-col>
-          <el-col :span="8">
+
+          <el-col :span="6">
+            <div>
+              班次:
+              <el-select v-model="headerParameters.shiftId" placeholder="请选择班次" clearable>
+                <el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+                           :value="item.shiftId"
+                ></el-option>
+              </el-select>
+            </div>
+            <br />
+          </el-col>
+          <el-col :span="6">
             <div>
               产品名称:
               <el-select
@@ -99,7 +111,7 @@
             </div>
             <br />
           </el-col> -->
-          <el-col :span="8">
+          <el-col :span="6">
             <div>
               检 查 人 :
               <el-input
@@ -374,7 +386,7 @@ import {
   updateTable,
   getWorkList,
 } from "@/api/mes/selfMutualInspection";
-
+import {  getProShifts }  from '@/api/plan/order'
 export default {
   name: "Item",
   dicts: ["device_item_type", "device_loop_type"],
@@ -421,6 +433,7 @@ export default {
         reportName: "ConversionReport", //表类型
         productionWorkshop: null, //生产车间
         lineCode: null, //生产产线编码
+        shiftId: null,
         lineName: null, //生产产线名称
         createBy: null, //检查人
         productName: null, //产品名称
@@ -438,6 +451,7 @@ export default {
   },
   created() {
     this.getLineCode();
+    this.getProShift();
     this.getList();
   },
 
@@ -570,11 +584,15 @@ export default {
 
           if (!found) {
             this.headerParameters.id = null;
-          } 
+          }
         }
       });
     },
-
+    // 获取班次信息
+    getProShift() {
+      getProShifts().then(response => {
+        this.workShift = response.data
+      })},
     getWorkList() {
       getWorkList(this.headerParameters).then((response) => {
         this.workCodeOption = response;
@@ -889,4 +907,4 @@ export default {
   border: 1px solid black;
   padding: 2px;
 }
-</style>
\ No newline at end of file
+</style>