From db876fa411997c7c67e24e4d1a1767dda55fca6e Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Mon, 17 Aug 2026 10:26:48 +0800
Subject: [PATCH] =?UTF-8?q?feat(inspection):=20=E6=B7=BB=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96IQC=E7=BB=93=E6=9E=9C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增deleteMyInspectionDetail接口用于删除验货申请明细
- 在验货列表页面添加删除操作按钮，支持已排程和验货中状态的记录删除
- 移除不再使用的refreshInspectionResult和rollbackInspectionResult接口
- 优化IQC结果录入页面的消息提示，区分保存和保存审核操作
- 简化审核和取消审核后的处理逻辑，移除前端手动刷新验货结果的调用
- 更新IQC结果录入页面的导入映射，移除已废弃的函数引用
---
 src/api/inspection/inspectionRequestHeader.js |  3 +
 src/api/qc/qc.js                              |  5 --
 .../modules/inspection/myInspectionList.vue   | 30 ++++++-
 src/views/modules/qc/IQCResultEntry.vue       | 79 +++++--------------
 4 files changed, 50 insertions(+), 67 deletions(-)

diff --git a/src/api/inspection/inspectionRequestHeader.js b/src/api/inspection/inspectionRequestHeader.js
index e7c926f..da77ab3 100644
--- a/src/api/inspection/inspectionRequestHeader.js
+++ b/src/api/inspection/inspectionRequestHeader.js
@@ -79,6 +79,9 @@ export const updateInspectionRequest = (data) => createAPI(`/inspection/update`,
 // 查询我的验货清单
 export const getMyInspectionList = (data) => createAPI(`/inspection/getMyInspectionList`, 'post', data)
 
+// 我的验货清单删除明细（仅已排程/验货中状态，一并删除关联IQC检验单）
+export const deleteMyInspectionDetail = (data) => createAPI(`/inspection/deleteMyInspectionDetail`, 'post', data)
+
 // 创建IQC检验单
 export const createIqc = (data) => createAPI(`/qms/qc/createIqc`, 'post', data)
 
diff --git a/src/api/qc/qc.js b/src/api/qc/qc.js
index f95b4e1..4e0abbc 100644
--- a/src/api/qc/qc.js
+++ b/src/api/qc/qc.js
@@ -232,11 +232,6 @@ export const dataAcquisitionByItem = data => createAPI(`/qms/qc/dataAcquisitionB
 export const getSiteAndBuByUserName2 = data => createAPI(`/qms/qc/getSiteAndBuByUserName2`,'post',data)
 export const cancelApproval = data => createAPI(`/qms/qc/cancelApproval`,'post',data)
 
-// 刷新验货结果（将明细状态改为验货完成）
-export const refreshInspectionResult = data => createAPI(`/inspection/refreshInspectionResult`,'post',data)
-// 回滚验货结果（将明细状态从验货完成回滚到验货中）
-export const rollbackInspectionResult = data => createAPI(`/inspection/rollbackInspectionResult`,'post',data)
-
 export const goUpItemQC = data => createAPI(`/qms/qc/goUpItemQC`,'post',data)
 export const goDownItemQC = data => createAPI(`/qms/qc/goDownItemQC`,'post',data)
 export const cancelApproval2 = data => createAPI(`/qms/qc/cancelApproval2`,'post',data)
diff --git a/src/views/modules/inspection/myInspectionList.vue b/src/views/modules/inspection/myInspectionList.vue
index 0e4b43b..755d09b 100644
--- a/src/views/modules/inspection/myInspectionList.vue
+++ b/src/views/modules/inspection/myInspectionList.vue
@@ -34,10 +34,11 @@
       <el-table-column prop="inspectAddress" label="验货地址" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
       <el-table-column prop="inspectCityShort" label="城市简称" header-align="center" align="left" width="120" show-overflow-tooltip/>
       <el-table-column prop="inspectContract" label="联系人" header-align="center" align="center" width="100"/>
-      <el-table-column fixed="right" header-align="center" align="center" width="150" label="操作">
+      <el-table-column fixed="right" header-align="center" align="center" width="180" label="操作">
         <template slot-scope="scope">
           <a v-if="scope.row.statusDb === 'Scheduled'" class="customer-a" @click="startInspection(scope.row)">开始验货</a>
           <a v-if="scope.row.statusDb === 'Inspecting'" class="customer-a" @click="goToIQCResult(scope.row)">跳转</a>
+          <a v-if="scope.row.statusDb === 'Scheduled' || scope.row.statusDb === 'Inspecting'" class="customer-a" style="color: #f56c6c;" @click="deleteInspection(scope.row)">删除</a>
           <span v-if="scope.row.statusDb === 'ChangeApplying'" style="color: #f56c6c;">等待变更审核</span>
         </template>
       </el-table-column>
@@ -58,7 +59,7 @@
 </template>
 
 <script>
-import { getMyInspectionList, createIqc, startInspection } from '@/api/inspection/inspectionRequestHeader.js'
+import { getMyInspectionList, createIqc, startInspection, deleteMyInspectionDetail } from '@/api/inspection/inspectionRequestHeader.js'
 import { actionIQCInspection, qcIQCInspectionSearch } from '@/api/qc/qc.js'
 
 
@@ -170,6 +171,31 @@ export default {
       })
     },
 
+    // 删除验货申请明细
+    deleteInspection (row) {
+      this.$confirm(`确认删除该验货申请？\n申请单号：${row.requestNo}\n供应商：${row.supplierName}`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteMyInspectionDetail({
+          requestNo: row.requestNo,
+          itemNo: row.itemNo
+        }).then(({ data }) => {
+          if (data.code === 0) {
+            this.$message.success('删除成功')
+            this.getList()
+          } else {
+            this.$message.error((data && data.msg) || '删除失败')
+          }
+        }).catch((error) => {
+          this.$message.error('删除失败：' + error.message)
+        })
+      }).catch(() => {
+        // 用户取消操作
+      })
+    },
+
     // 开始验货
     startInspection (row) {
       this.$confirm(`确认开始验货？\n申请单号：${row.requestNo}\n供应商：${row.supplierName}`, '提示', {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index fa90018..5541ea0 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -788,9 +788,7 @@
     overLoadSearchPartInfo, // 查询物料属性信息
     getEamPropertiesItemByItemNo,
     getCollectorDataByItem,
-    getResponsibleOperatorList,
-    refreshInspectionResult, // 刷新验货结果
-    rollbackInspectionResult, // 回滚验货结果
+    getResponsibleOperatorList
   } from "@/api/qc/qc.js"
   import { buildQcBu } from './qcBuUtils'
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
@@ -2752,7 +2750,8 @@
             this.getDataList()
             this.detailInformationFlag = false
             this.$message({
-              message: '操作成功',
+              // 保存接口内已包含自动审核，后端同一事务完成
+              message: type === '2' ? '保存并审核成功' : '操作成功',
               type: 'success',
               duration: 1500,
               onClose: () => {}
@@ -3211,34 +3210,14 @@
           this.submitData.submitList = this.IQCSelections
           saveIQCSubmitResult(this.submitData).then(({data}) => {
             if (data && data.code === 0) {
-              // 审核成功后，调用刷新验货结果接口
-              const refreshPromises = this.IQCSelections.map(selection => {
-                return refreshInspectionResult({
-                  poOrderNo: selection.poOrderNo,
-                  poItemNo: selection.poItemNo,
-                  site: selection.site
-                })
-              })
-
-              Promise.all(refreshPromises).then(() => {
-                this.getDataList()
-                this.IQCSelections = []
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {}
-                })
-              }).catch(error => {
-                console.error('刷新验货结果失败:', error)
-                // 即使刷新失败，也更新列表
-                this.getDataList()
-                this.IQCSelections = []
-                this.$message({
-                  message: '审核成功，但刷新验货结果失败',
-                  type: 'warning',
-                  duration: 2000
-                })
+              // 刷新验货结果已在后端审核事务中一并执行，前端无需再调用
+              this.getDataList()
+              this.IQCSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {
@@ -3283,34 +3262,14 @@
           this.submitData.submitList = this.IQCSelections
           cancelApproval(this.submitData).then(({data}) => {
             if (data && data.code === 0) {
-              // 取消审核成功后，调用回滚验货结果接口
-              const rollbackPromises = this.IQCSelections.map(selection => {
-                return rollbackInspectionResult({
-                  poOrderNo: selection.poOrderNo,
-                  poItemNo: selection.poItemNo,
-                  site: selection.site
-                })
-              })
-
-              Promise.all(rollbackPromises).then(() => {
-                this.getDataList()
-                this.IQCSelections = []
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {}
-                })
-              }).catch(error => {
-                console.error('回滚验货结果失败:', error)
-                // 即使回滚失败，也更新列表
-                this.getDataList()
-                this.IQCSelections = []
-                this.$message({
-                  message: '取消审核成功，但回滚验货结果失败',
-                  type: 'warning',
-                  duration: 2000
-                })
+              // 回滚验货结果已在后端取消审核事务中一并执行，前端无需再调用
+              this.getDataList()
+              this.IQCSelections = []
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {}
               })
             } else {
               this.$alert(data.msg, '错误', {