From fa27045f502b2853464df524976e1e00cb2b2a17 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 16 Oct 2023 17:06:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=9C=8B=E6=9D=BF=E6=96=99=E7=BD=90?=
 =?UTF-8?q?=E8=BD=A6=E6=95=B0=E8=8E=B7=E5=8F=96=EF=BC=9B2=E3=80=81?=
 =?UTF-8?q?=E5=B0=8F=E6=97=B6=E4=BA=A7=E9=87=8F=E5=8A=A0=E7=8F=AD=E6=AC=A1?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E9=92=9F=E6=95=B0=E5=81=9A=E6=B4=BB,?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=9B3=E3=80=81?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=AE=8C=E6=88=90=E8=AE=B0=E5=BD=95=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E7=8F=AD=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/reportWork.js              |  8 +++++++
 src/views/mes/hourProduction/index.vue | 29 +++++++++++++++++++-------
 src/views/mes/processFinish/index.vue  | 17 +++++++++++++--
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js
index 2f75e45..faa87dc 100644
--- a/src/api/mes/reportWork.js
+++ b/src/api/mes/reportWork.js
@@ -98,3 +98,11 @@ export function getHourProductionList(query) {
 		params: query
 	});
 }
+
+// 获取班次信息
+export function getProShifts() {
+	return request({
+	  url: '/mes/reportWork/getProShifts/',
+	  method: 'get'
+	})
+  }
\ No newline at end of file
diff --git a/src/views/mes/hourProduction/index.vue b/src/views/mes/hourProduction/index.vue
index ce3c5c5..3935551 100644
--- a/src/views/mes/hourProduction/index.vue
+++ b/src/views/mes/hourProduction/index.vue
@@ -4,13 +4,20 @@
 		    <el-form-item label="生产时间段" prop="productDateArray">
                 <el-date-picker
 				v-model="queryParams.productDateArray"
-				format="yyyy-MM-dd HH:00:00"
+				format="yyyy-MM-dd HH:mm:00"
 				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" placeholder="请选择班次" clearable>
+					<el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+								:value="item.shiftId"
+						></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="工单编号" prop="workorderCode">
 				<el-input
 					v-model="queryParams.workorderCode"
@@ -83,7 +90,8 @@
 </template>
 
 <script>
-import {getHourProductionTitle, getHourProductionList} from "@/api/mes/reportWork";
+import {getHourProductionTitle, getHourProductionList,getProShifts} from "@/api/mes/reportWork";
+
 import moment from 'moment';
 export default {
 	name: "Prepare",
@@ -126,12 +134,19 @@ export default {
 				productDate: null,
 			},
 			// 表单参数
-			form: {}
+			form: {},
+			// 班次list
+            workShift: []
 		};
 	},
 	created() {
         this.getDate();
 		this.getList();
+
+		// 获取班次信息
+		getProShifts().then(response => {
+			this.workShift = response.data
+		})
 	},
 	methods: {
         /**获取默认查询时间段**/
@@ -152,8 +167,8 @@ export default {
 		/** 查询设备小时产量列表 */
 		getList() {
 			if(this.queryParams.productDateArray!=null){
-				this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD HH:00:00');
-				this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD HH:00:00');
+				this.queryParams.productDateStart = moment(this.queryParams.productDateArray[0]).format('YYYY-MM-DD HH:mm:00');
+				this.queryParams.productDateEnd = moment(this.queryParams.productDateArray[1]).format('YYYY-MM-DD HH:mm:00');
 			}
 			
 			this.loading = true;
@@ -223,9 +238,9 @@ export default {
 
 		/** 导出按钮操作 */
 		handleExport() {
-			this.download('mes/reportWork/processFinishExport', {
+			this.download('mes/reportWork/getHourProductionExport', {
 				...this.queryParams
-			}, `processFinish_${new Date().getTime()}.xlsx`)
+			}, `hourProduction_${new Date().getTime()}.xlsx`)
 		},
 		getSummaries(param) {
 			const { columns, data } = param;
diff --git a/src/views/mes/processFinish/index.vue b/src/views/mes/processFinish/index.vue
index 7b0326c..b94a459 100644
--- a/src/views/mes/processFinish/index.vue
+++ b/src/views/mes/processFinish/index.vue
@@ -11,6 +11,13 @@
 					end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
+			<el-form-item label="班次" prop="shiftId">
+				<el-select v-model="queryParams.shiftId" placeholder="请选择班次" clearable>
+					<el-option v-for="item in workShift" :key="item.shiftId" :label="item.shiftDesc"
+								:value="item.shiftId"
+						></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="工单编号" prop="workorderCode">
 				<el-input
 					v-model="queryParams.workorderCode"
@@ -105,7 +112,7 @@
 </template>
 
 <script>
-import { getProcessFinishList} from "@/api/mes/reportWork";
+import { getProcessFinishList,getProShifts} from "@/api/mes/reportWork";
 import moment from 'moment';
 export default {
 	name: "Prepare",
@@ -158,11 +165,17 @@ export default {
 			// 表单参数
 			form: {},
 			// 表单校验
-			rules: {}
+			rules: {},
+			// 班次list
+            workShift: []
 		};
 	},
 	created() {
 		this.getList();
+		// 获取班次信息
+		getProShifts().then(response => {
+			this.workShift = response.data
+		})
 	},
 	methods: {
 		indexMethod(index){