From e982acce9997dfe2f183becfd46e3d15de387ed1 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 7 May 2024 15:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=9E=8B=E6=9C=BA=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/machineProduction/index.vue | 25 +++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/machineProduction/index.vue b/src/views/mes/machineProduction/index.vue
index 779f76d..3748bb7 100644
--- a/src/views/mes/machineProduction/index.vue
+++ b/src/views/mes/machineProduction/index.vue
@@ -11,14 +11,24 @@
       <el-form-item label="生产时间" prop="productDateArray">
         <el-date-picker
           v-model="queryParams.productDateArray"
-          format="yyyy-MM-dd"
-          type="daterange"
+          format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
         >
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="班次" prop="shiftId">
+        <el-select v-model="queryParams.shiftId" default-first-option clearable>
+          <el-option
+            v-for="item in shiftList"
+            :key="item.shiftId"
+            :label="item.shiftDesc"
+            :value="item.shiftId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="产品编号" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
@@ -111,7 +121,7 @@ export default {
       machineProList: [],
       //产品列表
       products: [],
-
+      shiftList: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -125,6 +135,7 @@ export default {
         workorderName: null,
         parentOrder: null,
         orderId: null,
+        shiftId: null,
         orderCode: null,
         productId: null,
         productCode: null,
@@ -140,7 +151,9 @@ export default {
   created() {
     this.getDate();
     this.getList();
-
+    getProShifts().then(response => {
+			this.shiftList = response.data
+		})
   },
   methods: {
     /**获取默认查询时间段**/
@@ -163,10 +176,10 @@ export default {
       if (this.queryParams.productDateArray != null) {
         this.queryParams.productDateStart = moment(
           this.queryParams.productDateArray[0]
-        ).format("YYYY-MM-DD");
+        ).format("YYYY-MM-DD HH:mm:ss");
         this.queryParams.productDateEnd = moment(
           this.queryParams.productDateArray[1]
-        ).format("YYYY-MM-DD");
+        ).format("YYYY-MM-DD HH:mm:ss");
       }
 
       this.loading = true;