From 422ae62d11819682adb4ca042c399878301bc631 Mon Sep 17 00:00:00 2001
From: qiankanghui <kanghui.qian@xujiesoft.com>
Date: Thu, 3 Sep 2026 14:30:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(quality):=20=E4=BF=AE=E5=A4=8D=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E9=97=AE=E9=A2=98=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BB=91=E5=AE=9A=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正了录入人和录入时间字段的数据绑定，将 entryByClaim 和 entryDateClaim
  改为 entryBy 和 entryDate
- 添加了回复和赔偿按钮的条件渲染逻辑，根据是否有数据决定显示"修改"或"回复/
  赔偿"
- 新增 hasReplyData 方法判断是否存在回复数据
- 新增 hasClaimData 方法判断是否存在赔偿数据
- 更新了赔偿功能的状态判断条件，支持已确认、已分析和已赔偿状态下的赔偿操作
---
 .../quality/com_qualityIssueDetail.vue        | 24 +++++++++----------
 .../modules/quality/qualityIssueList.vue      | 18 ++++++++++----
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/quality/com_qualityIssueDetail.vue b/src/views/modules/quality/com_qualityIssueDetail.vue
index 107a19a..ed8e384 100644
--- a/src/views/modules/quality/com_qualityIssueDetail.vue
+++ b/src/views/modules/quality/com_qualityIssueDetail.vue
@@ -236,18 +236,18 @@
               </el-form-item>
             </el-col>
           </el-row>
-<!--          <el-row :gutter="20">-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="录入人(索赔)">-->
-<!--                <el-input v-model="detailData.entryByClaim" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="录入时间(索赔)">-->
-<!--                <el-input v-model="detailData.entryDateClaim" disabled />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
+          <el-row :gutter="20">
+            <el-col :span="6">
+              <el-form-item label="录入人(索赔)">
+                <el-input v-model="detailData.entryBy" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="录入时间(索赔)">
+                <el-input v-model="detailData.entryDate" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
 
         <el-row :gutter="20" class="reduce-margin-top">
diff --git a/src/views/modules/quality/qualityIssueList.vue b/src/views/modules/quality/qualityIssueList.vue
index b9db944..28a01e6 100644
--- a/src/views/modules/quality/qualityIssueList.vue
+++ b/src/views/modules/quality/qualityIssueList.vue
@@ -103,14 +103,14 @@
           <a v-if="scope.row.status === '已确认' || scope.row.status === '已赔偿'"
              class="customer-a"
              @click="deleteQualityIssue(scope.row)">删除 </a>
-          <!-- 回复：已确认 或 已赔偿 -->
+          <!-- 回复/修改回复：已确认 或 已赔偿 -->
           <a v-if="scope.row.status === '已确认' || scope.row.status === '已赔偿'"
              class="customer-a"
-             @click="replyQualityIssue(scope.row)">回复 </a>
-          <!-- 赔偿：已确认 或 已分析，但不能是已赔偿（已赔偿状态不显示赔偿按钮）-->
-          <a v-if="(scope.row.status === '已确认' || scope.row.status === '已分析') && scope.row.status !== '已赔偿'"
+             @click="replyQualityIssue(scope.row)">{{ hasReplyData(scope.row) ? '修改回复' : '回复' }} </a>
+          <!-- 赔偿/修改赔偿：已确认 / 已分析 / 已赔偿 -->
+          <a v-if="scope.row.status === '已确认' || scope.row.status === '已分析' || scope.row.status === '已赔偿'"
              class="customer-a"
-             @click="compensationQualityIssue(scope.row)">赔偿 </a>
+             @click="compensationQualityIssue(scope.row)">{{ hasClaimData(scope.row) ? '修改赔偿' : '赔偿' }} </a>
           <!-- 关闭：仅已分析 -->
           <a v-if="scope.row.status === '已分析'"
              class="customer-a"
@@ -1042,6 +1042,14 @@ export default {
     })
   },
   methods: {
+    // 判断是否已有回复数据
+    hasReplyData (row) {
+      return !!(row && (row.analysis || row.correctiveAction || row.whyEscape || row.replyBy))
+    },
+    // 判断是否已有赔偿数据
+    hasClaimData (row) {
+      return !!(row && (row.claimFlag === 'Y' || row.claimAmount != null || row.disposalRemark))
+    },
     // 获取当前页面的 site 与当前登录用户名，新增/删除/修改统一由前端传给后端
     getCurrentOperator (actionText) {
       const site = this.$store.state.user.site