涂装抛光流程变更

src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue

@@ -37,6 +37,13 @@
 			<el-form-item label="创建人" prop="createBy">
 				<el-input v-model.trim="queryParams.createBy" placeholder="请输入创建人" clearable />
 			</el-form-item>
+			<el-form-item label="类别" prop="type">
+				<el-select v-model="queryParams.type" placeholder="请选择类别" @change="handleQuery">
+					<el-option label="全部" :value="-1"></el-option>
+					<el-option label="非抛光" :value="0"></el-option>
+					<el-option label="抛光品" :value="1"></el-option>
+				</el-select>
+			</el-form-item>
 			<!-- <el-form-item label="班组" prop="team">
 				<el-input v-model.trim="queryParams.team" placeholder="请输入班组" clearable />
 			</el-form-item> -->
@@ -68,9 +75,19 @@
 					>批量删除</el-button
 				>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出 </el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
-
+		<div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
+			<span style="font-size: 18px; font-weight: 600">投入数:{{ totalQuantity }}</span>
+			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">合格数:{{ totalQualifiedNumber }}</span>
+			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">合格率:{{ passRate }}</span>
+			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">抛光数:{{ totalPaoguangTotal }}</span>
+			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">打磨数:{{ totalDamoTotal }}</span>
+			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">报废数:{{ totalBaofeiTotal }}</span>
+		</div>
 		<!-- 数据区域 -->
 		<el-table
 			:data="dataList"
@@ -100,6 +117,12 @@
 					<el-tag effect="plain" v-if="scope.row.isReturnWorkpiece" type="warning">返工件</el-tag>
 				</template>
 			</el-table-column>
+			<el-table-column prop="type" label="抛光品" align="center">
+				<template slot-scope="scope">
+					<el-tag effect="plain" v-if="scope.row.type === 0" type="info">否</el-tag>
+					<el-tag effect="plain" v-if="scope.row.type === 1" type="danger">是</el-tag>
+				</template>
+			</el-table-column>
 			<el-table-column prop="startTime" label="开始时间" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="endTime" label="结束时间" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" />
@@ -156,6 +179,9 @@
 					<el-form-item label="是否为返工件" prop="isReturnWorkpiece">
 						<el-switch v-model="form.isReturnWorkpiece" active-color="#13ce66"> </el-switch>
 					</el-form-item>
+					<el-form-item label="是否为抛光品" prop="isPolish">
+						<el-switch v-model="form.isPolish" active-color="#13ce66"> </el-switch>
+					</el-form-item>
 				</div>
 				<div>
 					<el-form-item label="投入数" prop="requireNumber">
@@ -230,6 +256,7 @@ import {
 	delWmGp12QualityStatistics,
 	updateWmGp12QualityStatistics,
 	getWmGp12QualityStatistics,
+	exportTableData
 } from '@/api/wmsManagement/wmGp12QualityStatistics.js'
 import ThePartNumberSelect from './ThePartNumberSelect.vue'
 export default {
@@ -257,6 +284,7 @@ export default {
 				pageSize: 10,
 				startTime: null,
 				endTime: null,
+				type:-1,
 				sort: 'createdTime',
 				sortType: 'desc',
 			},
@@ -322,6 +350,7 @@ export default {
 			typeOptions: [],
 			// 数据列表
 			dataList: [],
+			allDataList:[],
 			// 总记录数
 			total: 0,
 			// 提交按钮是否显示
@@ -337,6 +366,36 @@ export default {
 			ThePartNumberSelectRef: null,
 		}
 	},
+	computed: {
+		// 投入数
+		totalQuantity() {
+			return this.allDataList.reduce((acc, data) => acc + data.requireNumber, 0)
+		},
+		// 合格数
+		totalQualifiedNumber() {
+			return this.allDataList.reduce((acc, data) => acc + data.qualifiedNumber, 0)
+		},
+		// 抛光数
+		totalPaoguangTotal() {
+			return this.allDataList.reduce((acc, data) => acc + data.paoguangTotal, 0)
+		},
+		// 打磨数
+		totalDamoTotal() {
+			return this.allDataList.reduce((acc, data) => acc + data.damoTotal, 0)
+		},
+		// 报废数
+		totalBaofeiTotal() {
+			return this.allDataList.reduce((acc, data) => acc + data.baofeiTotal, 0)
+		},
+		// 总合格率
+		passRate() {
+			if (this.totalQuantity > 0) {
+				return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+			} else {
+				return '0%'
+			}
+		},
+	},
 	created() {
 		// 列表数据查询
 		this.getList()
@@ -354,6 +413,14 @@ export default {
 					this.loading = false
 				}
 			})
+			let params = JSON.parse(JSON.stringify(this.queryParams))
+			params.pageNum = 1
+			params.pageSize = 100000
+			listWmGp12QualityStatistics(params).then((res) => {
+				if (res.code == 200) {
+					this.allDataList = res.data.result
+				}
+			})
 		},
 		// 取消按钮
 		cancel() {
@@ -369,6 +436,7 @@ export default {
 				requireNumber: 0,
 				team: 'GP12',
 				isReturnWorkpiece: false,
+				isPolish:false,
 				qualifiedNumber: 0,
 				qualifiedRate: 0,
 				paoguangTotal: 0,
@@ -487,6 +555,17 @@ export default {
 		PartNumberSelect(value) {
 			this.form.partnumber = value
 		},
+		/** 导出按钮操作 **/
+		handleExport() {
+			const queryParams = this.queryParams
+			this.$confirm('是否确认导出所查询数据项?', '警告', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}).then(async () => {
+				await exportTableData(queryParams)
+			}).catch()
+		},
 	},
 }
 </script>

src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue

@@ -60,6 +60,7 @@
 		<!-- 仓库零件数 -->
 		<div style="display: flex; align-items: center; justify-content: center; margin-bottom: 10px">
 			<span style="font-size: 18px; font-weight: 600">一次合格品仓库零件数:{{ partTotal }}</span>
+			<span style="font-size: 18px; font-weight: 600;margin-left: 20px;">当前查询结果零件数:{{ totalQuantity }}</span>
 		</div>
 		<!-- 数据区域 -->
 		<el-table
@@ -378,6 +379,7 @@ export default {
 			statusOptions: [],
 			// 数据列表
 			dataList: [],
+			allDataList:[],
 			// 总记录数
 			total: 0,
 			// 提交按钮是否显示
@@ -416,6 +418,12 @@ export default {
 			],
 		}
 	},
+	computed: {
+		// 当前查询库存数量
+		totalQuantity() {
+			return this.allDataList.reduce((acc, data) => acc + data.quantity, 0)
+		},
+	},
 	created() {
 		// 列表数据查询
 		this.getList()
@@ -433,6 +441,14 @@ export default {
 					this.loading = false
 				}
 			})
+			let params = JSON.parse(JSON.stringify(this.queryParams))
+			params.pageNum = 1
+			params.pageSize = 100000
+			listWmOneTimeInventory(params).then((res) => {
+				if (res.code == 200) {
+					this.allDataList = res.data.result
+				}
+			})
 			getPartNumber().then((res) => {
 				if (res.code === 200) {
 					this.partTotal = res.data