From 3c1d5eb01ae4b8ad3f41a872826d345bbe4f7994 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 26 Mar 2026 22:38:27 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=A3=80=E9=AA=8C=E5=8D=95=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/wm/returnissue/line/index.ts      |  2 +-
 src/api/mes/wm/returnsales/line/index.ts      |  8 +++---
 .../wm/returnissue/ReturnIssueLineList.vue    |  2 +-
 .../wm/returnsales/ReturnSalesLineList.vue    | 26 ++++++++++++++-----
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/api/mes/wm/returnissue/line/index.ts b/src/api/mes/wm/returnissue/line/index.ts
index f12586a35..981513781 100644
--- a/src/api/mes/wm/returnissue/line/index.ts
+++ b/src/api/mes/wm/returnissue/line/index.ts
@@ -13,7 +13,7 @@ export interface WmReturnIssueLineVO {
   batchId?: number
   qcFlag?: boolean
   qualityStatus?: number
-  ipqcId?: number
+  rqcId?: number
   remark?: string
 }
 
diff --git a/src/api/mes/wm/returnsales/line/index.ts b/src/api/mes/wm/returnsales/line/index.ts
index 3750f2dee..37fe4a2ff 100644
--- a/src/api/mes/wm/returnsales/line/index.ts
+++ b/src/api/mes/wm/returnsales/line/index.ts
@@ -9,9 +9,11 @@ export interface WmReturnSalesLineVO {
   itemName?: string
   specification?: string
   unitMeasureName?: string
-  quantityReturned: number
-  batchId?: number
-  batchCode?: string
+  quantity: number
+  batchId: number
+  batchCode: string
+  qcFlag: boolean
+  rqcId: number
   qualityStatus?: number
   remark?: string
 }
diff --git a/src/views/mes/wm/returnissue/ReturnIssueLineList.vue b/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
index 657151f4d..30099dffb 100644
--- a/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
+++ b/src/views/mes/wm/returnissue/ReturnIssueLineList.vue
@@ -261,7 +261,7 @@ const resetForm = () => {
     issueId: undefined,
     itemId: undefined,
     quantity: undefined,
-    qcFlag: false, // TODO @AI：前端需要有填写的地方么？
+    qcFlag: false,
     remark: undefined
   }
   formRef.value?.resetFields()
diff --git a/src/views/mes/wm/returnsales/ReturnSalesLineList.vue b/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
index 6560731a1..f0242b1b5 100644
--- a/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
+++ b/src/views/mes/wm/returnsales/ReturnSalesLineList.vue
@@ -33,6 +33,11 @@
       <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
       <el-table-column label="退货数量" align="center" prop="quantity" width="100" />
       <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
+      <el-table-column label="是否需要质检" align="center" prop="qcFlag">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.qcFlag" />
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="isUpdate || isStock"
         label="操作"
@@ -82,9 +87,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="退货数量" prop="quantityReturned">
+          <el-form-item label="退货数量" prop="quantity">
             <el-input-number
-              v-model="formData.quantityReturned"
+              v-model="formData.quantity"
               :precision="2"
               :min="0"
               controls-position="right"
@@ -99,7 +104,12 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="24">
+        <el-col :span="8">
+          <el-form-item label="需要质检" prop="qcFlag">
+            <el-switch v-model="formData.qcFlag" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
             <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
           </el-form-item>
@@ -121,6 +131,7 @@
 </template>
 
 <script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
 import { WmReturnSalesLineApi, WmReturnSalesLineVO } from '@/api/mes/wm/returnsales/line'
 import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
 import ReturnSalesDetailList from './ReturnSalesDetailList.vue'
@@ -181,13 +192,15 @@ const formData = ref({
   id: undefined,
   returnId: undefined as number | undefined,
   itemId: undefined,
-  quantityReturned: undefined,
+  quantity: undefined,
   batchCode: undefined,
+  qcFlag: true,
   remark: undefined
 })
 const formRules = reactive({
   itemId: [{ required: true, message: '物料不能为空', trigger: 'change' }],
-  quantityReturned: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }]
+  quantity: [{ required: true, message: '退货数量不能为空', trigger: 'blur' }],
+  qcFlag: [{ required: true, message: '需要质检不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -236,8 +249,9 @@ const resetForm = () => {
     id: undefined,
     returnId: undefined,
     itemId: undefined,
-    quantityReturned: undefined,
+    quantity: undefined,
     batchCode: undefined,
+    qcFlag: false,
     remark: undefined
   }
   formRef.value?.resetFields()