From 7cce18b133cddb775ea3b0ae8539e6b174eeda90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?=
 <9634538+git_rabbit@user.noreply.gitee.com>
Date: Tue, 27 Feb 2024 08:35:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E6=A3=80=E7=94=9F=E6=88=90=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=96=B9=E6=B3=95=EF=BC=8C=E5=B7=A5=E5=8D=95=E5=8F=B7?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=88=86=E9=A1=B5=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qualityManagement/FQC/qualityStatistics.vue | 2 +-
 src/views/qualityManagement/FQC/thirtyFQC.vue         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 7468ae1..17b4357 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -39,7 +39,7 @@
       </el-form>
     </div>
 	<div style="width: 100%;display: flex;justify-content: flex-end;">
-		<pagination :pageSizes="[6,60,120,300]" :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" @pagination="getList" />
+		<pagination :pageSizes="[12,60,120,300]" :total="pagination.total" :page.sync="pagination.pageNum" :limit.sync="pagination.pageSize" @pagination="getList" />
 	</div>
     <div style="width: 100%">
       <div style="font-size: 20px;text-align: center; margin 0 auto">{{ reportType_options[search.reportType].label }}</div>
diff --git a/src/views/qualityManagement/FQC/thirtyFQC.vue b/src/views/qualityManagement/FQC/thirtyFQC.vue
index 1ca5098..844aedc 100644
--- a/src/views/qualityManagement/FQC/thirtyFQC.vue
+++ b/src/views/qualityManagement/FQC/thirtyFQC.vue
@@ -904,19 +904,21 @@ export default {
     },
     //todo 工单完成
     workOrderCompleted() {
+		// 待保存的工单Id
+		const saveWorkorderID = JSON.parse(JSON.stringify(this.CurrentWorkorder.clientWorkorder));
       this.$modal
         .confirm('是否确认完成本工单？')
         .then(() => {
           this.getNext_current_workorder()
           //todo  更改这个工单状态为2
-          return update_workorder_status({ workorderID: this.CurrentWorkorder.clientWorkorder })
+          return update_workorder_status({ workorderID: saveWorkorderID })
         })
         .then((res) => {
           if (res.code == 200) {
             this.$notify.success('工单完成')
             //todo 生成质量统计表 ！！！！需要工单和班组
             let query={
-              workorderID: this.CurrentWorkorder.clientWorkorder,
+              workorderID: saveWorkorderID,
               team:this.CurrentWorkorder.team,
               firstquality_time:this.$store.state.quality.firstquality_time,
             }