From 404861342e0c62b10fd2a847a6aab748c057553c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Tue, 5 Aug 2025 15:47:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=A4=E4=B8=AA=E7=BB=B4=E4=BF=AE=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=20=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=80=80=E5=9B=9E=E7=AD=9B=E9=80=89=202.=E9=80=80?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE=20=20=E6=95=B4=E8=A1=8C?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E7=BA=A2=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reportWorkOrder/reportDefectOrder.vue        | 16 +++++++++++++++-
 .../reportWorkOrder/reportDefectOrder2.vue       | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder.vue b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
index 4528b5b..17514f0 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@@ -24,6 +24,12 @@
           <el-option label="一般" value="一般"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'是否退回'">
+        <el-select v-model="searchData.isReturn" placeholder="请选择" clearable style="width: 100px">
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'反馈单号'">
         <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
@@ -99,7 +105,8 @@
       :data="dataList"
       @selection-change="selectionChangeHandle"
       border
-      style="width: 100%;">
+      style="width: 100%;"
+      :row-style="rowStyle">
       <el-table-column
         type="selection"
         header-align="center"
@@ -2250,6 +2257,13 @@
       selectionChangeHandle (val) {
           this.dataListSelections = val
       },
+      rowStyle({row}){
+        let isReturn = row.isReturn
+        // 区分不同的样式对应不同的颜色
+        if (isReturn=='Y') {
+          return { 'background-color': '#FFD3D3', cursor: 'pointer' }
+        }
+      },
 
       // 选择到达人员
       chooseReachOperator (row) {
diff --git a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
index b0bed4c..792a061 100644
--- a/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder2.vue
@@ -24,6 +24,12 @@
           <el-option label="一般" value="一般"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item :label="'是否退回'">
+        <el-select v-model="searchData.isReturn" placeholder="请选择" clearable style="width: 100px">
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item :label="'反馈单号'">
         <el-input v-model="searchData.planID" clearable style="width: 120px"></el-input>
       </el-form-item>
@@ -97,7 +103,8 @@
       :height="height"
       :data="dataList"
       border
-      style="width: 100%;">
+      style="width: 100%;"
+      :row-style="rowStyle">
       <el-table-column
         prop="buDesc"
         header-align="center"
@@ -2152,6 +2159,13 @@ export default {
         dropColumns: [],//需要剔除的列，例如dropColumns: ["netWeight"]，即剔除净重列
       });
     },
+    rowStyle({row}){
+      let isReturn = row.isReturn
+      // 区分不同的样式对应不同的颜色
+      if (isReturn=='Y') {
+        return { 'background-color': '#FFD3D3', cursor: 'pointer' }
+      }
+    },
 
     //导出excel
     // async createExportData () {