From b265f78311f5bb0769f32a31f7006cc787bd2f53 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 27 三月 2024 19:00:09 +0800
Subject: [PATCH] 质检相关报工页面新增、接口联调

---
 src/views/dashboard/components/TaskControl.vue |  112 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index ea82cb1..c9f5cb5 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -22,7 +22,20 @@
       </BigButton>
       <template v-if="task?.Procedure.Status === 2 || task?.Procedure.Status === 3">
         <BigButton class="btn" bg-color="#ff9933" :disabled="task?.Procedure.Status === 3">鎵撳嵃</BigButton>
-        <BigButton class="btn" bg-color="#00cc33" :disabled="task?.Procedure.Status === 3" @click="openReportModal">
+        <BigButton
+          v-if="task?.ShowCheck"
+          class="btn"
+          bg-color="#00cc33"
+          :disabled="task?.Procedure.Status === 3"
+          @click="openQualityModal"
+          >璐ㄦ</BigButton
+        >
+        <BigButton
+          class="btn"
+          :bg-color="task?.ShowCheck ? '#0066ff' : '#00cc33'"
+          :disabled="task?.Procedure.Status === 3"
+          @click="openReportModal"
+        >
           鎶ュ伐
         </BigButton>
         <el-popconfirm
@@ -47,10 +60,21 @@
   <TaskControlModal v-model="showTaskControlModal" :task="task" @produce-start="onProduceStart"></TaskControlModal>
   <ReportProductionModal
     v-model="showReportModal"
+    :model-title="modelTitle"
     :amount="plcInfo?.finishNumber ?? 0"
     @close="showReportModal = false"
     @submit="onReportProduction"
   ></ReportProductionModal>
+  <ReportProductionModal1
+    v-model="showReportModal1"
+    :model-title="modelTitle"
+    :amount="plcInfo?.finishNumber ?? 0"
+    :pass-amount="passAmount"
+    :rework-amount="reworkAmount"
+    :scrapped-amount="scrappedAmount"
+    @close="showReportModal1 = false"
+    @submit="onReportCheck"
+  ></ReportProductionModal1>
 </template>
 <script setup lang="ts">
 import type { Task, Worker } from '@/api/task'
@@ -59,11 +83,14 @@
 import { useDateFormat } from '@vueuse/core'
 import TaskControlModal from '@/views/dashboard/components/TaskControlModal.vue'
 import { CircleCloseFilled } from '@element-plus/icons-vue'
-import { apiReportWork, procedureUpdate } from '@/api'
+import { apiReportWork, procedureUpdate, bulletinReport, bulletinQualityInspection, getQualityInspection } from '@/api'
 import { ElMessage } from 'element-plus'
 import ReportProductionModal from '@/views/dashboard/components/ReportProductionModal.vue'
+import ReportProductionModal1 from '@/views/dashboard/components/ReportProductionModal1.vue'
 import { usePLCStore } from '@/stores/plc'
 import { storeToRefs } from 'pinia'
+import { log } from 'console'
+import { isDoStatement } from 'typescript'
 
 const props = defineProps<{
   task?: Task
@@ -76,6 +103,10 @@
 }>()
 
 const showTaskControlModal = ref(false)
+const modelTitle = ref('')
+const passAmount = ref(0)
+const reworkAmount = ref(0)
+const scrappedAmount = ref(0)
 
 /**
  * 寮�濮嬬敓浜�
@@ -151,6 +182,9 @@
 const { plcInfo } = storeToRefs(plcStore)
 // 鎶ュ伐
 const showReportModal = ref(false)
+// 鎶ュ伐
+const showReportModal1 = ref(false)
+const reprotIds = ref([])
 function openReportModal() {
   // 鏈変汉鍛樻墠鍙互鎶ュ伐
   if (!workers.value || workers.value.length == 0) {
@@ -179,6 +213,38 @@
   }
 
   if (workers.value[0].workerId) {
+    modelTitle.value = '鐢熶骇鎶ュ伐'
+    if (task?.value?.ShowCheck) {
+      getQualityInspection({
+        procedureId: task.value?.Procedure.ID,
+        workerId: workers.value[0].workerId
+      }).then((res) => {
+        console.log(res, '999999')
+        passAmount.value = res.data.passAmount
+        reworkAmount.value = res.data.reworkAmount
+        scrappedAmount.value = res.data.scrappedAmount
+        reprotIds.value = res.data.ids
+        showReportModal1.value = true
+      })
+    } else {
+      showReportModal.value = true
+    }
+  }
+}
+
+// 璐ㄦ
+function openQualityModal() {
+  // 鏈変汉鍛樻墠鍙互鎶ュ伐
+  if (!workers.value || workers.value.length == 0) {
+    ElMessage({
+      message: '娌℃湁浜哄憳淇℃伅涓嶅厑璁歌川妫�锛�',
+      type: 'error',
+      duration: 3000
+    })
+    return true
+  }
+  if (workers.value[0].workerId) {
+    modelTitle.value = '鎻愪氦璐ㄦ'
     showReportModal.value = true
   }
 }
@@ -193,7 +259,9 @@
   }
   // 鏈変汉鍛樻墠鍙互鎶ュ伐
   if (workers.value[0].workerId) {
-    apiReportWork({
+    let requestUrl = task?.value.ShowCheck ? bulletinQualityInspection : apiReportWork
+    let tipStr = task?.value.ShowCheck ? '璐ㄦ' : '鎶ュ伐'
+    requestUrl({
       workOrderProcedureID: Number(task.value?.Procedure.ID),
       reportAmount: amount,
       workerID: workers.value[0].workerId,
@@ -202,6 +270,44 @@
       .then((res) => {
         if (res.code === 200) {
           ElMessage({
+            message: `${tipStr}鎴愬姛`,
+            type: 'success',
+            duration: 2000
+          })
+          showReportModal.value = false
+        } else {
+          ElMessage({
+            message: `${tipStr}澶辫触`,
+            type: 'error',
+            duration: 3000
+          })
+        }
+      })
+      .catch((err) => {
+        console.error(err)
+      })
+  }
+}
+/**
+ * 璐ㄦ鍚庣殑涓婃姤鍔犲伐鏁�
+ * @param amount 鍔犲伐鏁�
+ */
+function onReportCheck(amount: number) {
+  if (!task?.value) {
+    return
+  }
+  // 鏈変汉鍛樻墠鍙互鎶ュ伐
+  if (workers.value[0].workerId) {
+    bulletinReport({
+      workOrderProcedureID: Number(task.value?.Procedure.ID),
+      reportAmount: amount,
+      workerID: workers.value[0].workerId,
+      workerName: workers.value[0].workerName,
+      ids: reprotIds
+    })
+      .then((res) => {
+        if (res.code === 200) {
+          ElMessage({
             message: '鎶ュ伐鎴愬姛',
             type: 'success',
             duration: 2000

--
Gitblit v1.8.0