From 058b20ef5abe3fdbdbcd966f2006240f8984da6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 27 Dec 2024 17:32:14 +0800
Subject: [PATCH] 1

---
 .../FqcWarehouseBoard/index.vue               | 11 ++-
 .../FQC/qualityStatistics.vue                 |  3 +-
 .../WmGP12QualityStatistics.vue               | 94 ++++---------------
 .../WmPolishQualityStatistics.vue             |  3 +-
 .../WmPolishWorkQualityStatistics.vue         |  3 +-
 5 files changed, 36 insertions(+), 78 deletions(-)

diff --git a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
index dac7db3..2bc37eb 100644
--- a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
+++ b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue
@@ -187,6 +187,15 @@
 							
 						</el-col>
 					</el-row>
+					<el-row :gutter="20">
+						<el-col :span="12">
+							<div>
+								<span class="span-text-1-small"> 维修件 </span>
+								<span class="span-num-1-small color-green">{{ boardData.statisticsProductMaintenanceQualifiedTotal }}</span>
+							</div>
+						</el-col>
+						<el-col :span="12"> </el-col>
+					</el-row>
 					<el-row :gutter="20">
 						<el-col :span="12">
 							<div>
@@ -530,7 +539,7 @@ export default {
 		// 成品总入库
 		finishProductInTotal() {
 			// GP12合格+后道合格
-			return this.boardData.gP12QualifiedTotal + this.boardData.afterPolishInTotal
+			return this.boardData.gP12QualifiedTotal + this.boardData.afterPolishInTotal + (this.boardData.statisticsProductMaintenanceQualifiedTotal ?? 0)
 		},
 	},
 	created() {
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 34ae86e..bd99741 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -437,8 +437,9 @@ export default {
 		},
 		// 总合格率
 		passRate() {
+			let _totalQuantity = this.totalQuantity * 1.0
 			if (this.totalQuantity > 0) {
-				return Math.ceil((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+				return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
 			} else {
 				return '0%'
 			}
diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
index 569f1b6..7990fa6 100644
--- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
+++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
@@ -9,27 +9,12 @@
 <template>
 	<div class="app-container">
 		<!-- :model属性用于表单验证使用 比如下面的el-form-item 的 prop属性用于对表单值进行验证操作 -->
-		<el-form
-			:model="queryParams"
-			size="small"
-			label-position="right"
-			inline
-			ref="queryForm"
-			:label-width="labelWidth"
-			v-show="showSearch"
-			@submit.native.prevent
-		>
+		<el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm" :label-width="labelWidth" v-show="showSearch" @submit.native.prevent>
 			<el-form-item label="开始时间" prop="startTime">
 				<el-date-picker v-model="queryParams.startTime" type="datetime" :clearable="true" placeholder="开始时间"></el-date-picker>
 			</el-form-item>
 			<el-form-item label-width="40" label="至" prop="endTime">
-				<el-date-picker
-					v-model="queryParams.endTime"
-					type="datetime"
-					:clearable="true"
-					placeholder="结束时间"
-					default-time="23:59:59"
-				></el-date-picker>
+				<el-date-picker v-model="queryParams.endTime" type="datetime" :clearable="true" placeholder="结束时间" default-time="23:59:59"></el-date-picker>
 			</el-form-item>
 			<el-form-item label="零件号" prop="partnumber">
 				<el-input v-model.trim="queryParams.partnumber" placeholder="请输入零件号" clearable />
@@ -55,25 +40,10 @@
 		<!-- 工具区域 -->
 		<el-row :gutter="10" class="mb8">
 			<el-col :span="1.5">
-				<el-button
-					type="primary"
-					plain
-					icon="el-icon-plus"
-					size="mini"
-					@click="handleAdd"
-					>新增记录</el-button
-				>
+				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增记录</el-button>
 			</el-col>
 			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					:disabled="multiple"
-					plain
-					icon="el-icon-delete"
-					size="mini"
-					@click="handleDelete"
-					>批量删除</el-button
-				>
+				<el-button type="danger" :disabled="multiple" plain icon="el-icon-delete" size="mini" @click="handleDelete">批量删除</el-button>
 			</el-col>
 			<el-col :span="1.5">
 				<el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport">导出 </el-button>
@@ -89,17 +59,9 @@
 			<span style="font-size: 18px; font-weight: 600; margin-left: 20px">报废数:{{ totalBaofeiTotal }}</span>
 		</div>
 		<!-- 数据区域 -->
-		<el-table
-			:data="dataList"
-			v-loading="loading"
-			ref="table"
-			border
-			highlight-current-row
-			@sort-change="sortChange"
-			@selection-change="handleSelectionChange"
-		>
+		<el-table :data="dataList" v-loading="loading" ref="table" border highlight-current-row @sort-change="sortChange" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="50" align="center" />
-			<el-table-column prop="workorderId"  label="工单号" min-width="160" align="center" :show-overflow-tooltip="true" />
+			<el-table-column prop="workorderId" label="工单号" min-width="160" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="partnumber" label="零件号" min-width="160" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="description" label="描述" min-width="200" align="center" :show-overflow-tooltip="true" />
 			<el-table-column prop="specification" label="规格" align="center" :show-overflow-tooltip="true" />
@@ -130,31 +92,12 @@
 
 			<el-table-column label="操作" align="center" fixed="right" width="140">
 				<template slot-scope="scope">
-					<el-button
-						size="mini"
-						type="success"
-						icon="el-icon-edit"
-						title="编辑"
-						@click="handleUpdate(scope.row)"
-					></el-button>
-					<el-button
-						size="mini"
-						type="danger"
-						icon="el-icon-delete"
-						title="删除"
-						@click="handleDelete(scope.row)"
-					></el-button>
+					<el-button size="mini" type="success" icon="el-icon-edit" title="编辑" @click="handleUpdate(scope.row)"></el-button>
+					<el-button size="mini" type="danger" icon="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></el-button>
 				</template>
 			</el-table-column>
 		</el-table>
-		<pagination
-			class="mt10"
-			background
-			:total="total"
-			:page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize"
-			@pagination="getList"
-		/>
+		<pagination class="mt10" background :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
 		<!-- 添加或修改 -->
 		<el-dialog :title="title" :lock-scroll="false" :visible.sync="open" width="70%" @opened="dialogOpened" :close-on-click-modal="false">
@@ -256,7 +199,7 @@ import {
 	delWmGp12QualityStatistics,
 	updateWmGp12QualityStatistics,
 	getWmGp12QualityStatistics,
-	exportTableData
+	exportTableData,
 } from '@/api/wmsManagement/wmGp12QualityStatistics.js'
 import ThePartNumberSelect from './ThePartNumberSelect.vue'
 export default {
@@ -284,7 +227,7 @@ export default {
 				pageSize: 10,
 				startTime: null,
 				endTime: null,
-				type:-1,
+				type: -1,
 				sort: 'createdTime',
 				sortType: 'desc',
 			},
@@ -350,7 +293,7 @@ export default {
 			typeOptions: [],
 			// 数据列表
 			dataList: [],
-			allDataList:[],
+			allDataList: [],
 			// 总记录数
 			total: 0,
 			// 提交按钮是否显示
@@ -389,8 +332,9 @@ export default {
 		},
 		// 总合格率
 		passRate() {
+			let _totalQuantity = this.totalQuantity * 1.0
 			if (this.totalQuantity > 0) {
-				return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+				return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
 			} else {
 				return '0%'
 			}
@@ -436,7 +380,7 @@ export default {
 				requireNumber: 0,
 				team: 'GP12',
 				isReturnWorkpiece: false,
-				isPolish:false,
+				isPolish: false,
 				qualifiedNumber: 0,
 				qualifiedRate: 0,
 				paoguangTotal: 0,
@@ -562,9 +506,11 @@ export default {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning',
-			}).then(async () => {
-				await exportTableData(queryParams)
-			}).catch()
+			})
+				.then(async () => {
+					await exportTableData(queryParams)
+				})
+				.catch()
 		},
 	},
 }
diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
index a6ebe00..3f7cbde 100644
--- a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
+++ b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
@@ -381,8 +381,9 @@ export default {
 		},
 		// 总合格率
 		passRate() {
+			let _totalQuantity = this.totalQuantity * 1.0
 			if (this.totalQuantity > 0) {
-				return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+				return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
 			} else {
 				return '0%'
 			}
diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
index d950738..8ccaed8 100644
--- a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
+++ b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
@@ -308,8 +308,9 @@ export default {
 		},
 		// 总合格率
 		passRate() {
+			let _totalQuantity = this.totalQuantity * 1.0
 			if (this.totalQuantity > 0) {
-				return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+				return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
 			} else {
 				return '0%'
 			}