From d182af7d2a0efbcaa99afa66a39efaf5d796b4ec Mon Sep 17 00:00:00 2001
From: yueli <yueli@example.com>
Date: Mon, 7 Sep 2026 17:08:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=95=B4=E6=89=B9=E4=BF=AE=E6=94=B9=E9=87=8D?=
 =?UTF-8?q?=E6=8F=90=E2=80=94=E2=80=94=E6=89=B9=E6=AC=A1=E4=B8=BB=E8=A1=8C?=
 =?UTF-8?q?=E5=AF=B9=E6=9C=89=E8=A2=AB=E9=A9=B3=E5=9B=9E=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E7=9A=84=E6=89=B9=E6=AC=A1=E4=B8=80=E9=94=AE=E8=BD=BD=E5=85=A5?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E8=A2=AB=E9=A9=B3=E6=98=8E=E7=BB=86=E9=87=8D?=
 =?UTF-8?q?=E6=8F=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 inventory-web/src/views/purchase/index.vue | 63 ++++++++++++++--------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/inventory-web/src/views/purchase/index.vue b/inventory-web/src/views/purchase/index.vue
index 092d4ae..d83bed0 100644
--- a/inventory-web/src/views/purchase/index.vue
+++ b/inventory-web/src/views/purchase/index.vue
@@ -109,9 +109,11 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="220" fixed="right" align="center">
+      <el-table-column label="操作" width="250" fixed="right" align="center">
         <template #default="{ row }">
           <el-button type="info" link size="small" @click="openBatchDialog(row.batchKey)">查看整批</el-button>
+          <!-- ★ 整批修改重提：批次内有被驳回明细时提供 -->
+          <el-button v-if="batchHasRejected(row)" type="warning" link size="small" @click="handleReapplyBatch(row)">整批重提</el-button>
           <!-- ★ 一键审批本批 -->
           <template v-if="row.pendingCount > 0 && canApprove">
             <el-button type="success" link size="small" :loading="batchLoading" @click="handleApproveBatch(row.batchKey)">审批本批</el-button>
@@ -861,35 +863,50 @@ const openCreateDialog = (prefill?: { materialId?: number; name?: string; spec?:
 }
 
 // 获取当前用户上一次采购申请的审批人作为默认值
-// ★ 被驳回单"修改重提"：预填原单内容到新建弹窗，改后重新提交（生成新单，原驳回单保留）
-const handleReapply = (row: any) => {
-  dialogTitle.value = `重新申请（驳回单 ${row.request_no}）`
-  form.value = {
-    approver_id: row.approver_id ?? undefined,
-    remark: ''
-  }
-
+// ★ 被驳回单 → 构建预填行（保留物料/数量/日期/单价/税率/链接/备注/图片）
+const buildFormItemFromRequest = (row: any) => {
   let imgList: string[] = []
   if (Array.isArray(row.images)) imgList = row.images
   else if (row.images) { try { imgList = JSON.parse(row.images) } catch (e) { imgList = [] } }
 
-  const firstRow = createEmptyFormItem()
-  firstRow.materialBaseId = row.base_id ?? null
-  firstRow.name = row.name || ''
-  firstRow.spec_model = row.spec_model || ''
-  firstRow.quantity = Number(row.quantity || 1)
-  firstRow.purchase_date = row.purchase_date || new Date().toISOString().split('T')[0]
-  firstRow.unit_price = row.unit_price != null ? row.unit_price : undefined
-  firstRow.total_price = row.total_price != null ? row.total_price : undefined
-  firstRow.tax_rate = row.tax_rate ?? 0
-  firstRow.supplier_link = row.supplier_link || ''
-  firstRow.remark = row.remark || ''
-  firstRow.images = imgList
-  firstRow.fileList = imgList.map((u: string) => ({ name: (u.split('/').pop() || '图片'), url: u }))
+  const it = createEmptyFormItem()
+  it.materialBaseId = row.base_id ?? null
+  it.name = row.name || ''
+  it.spec_model = row.spec_model || ''
+  it.quantity = Number(row.quantity || 1)
+  it.purchase_date = row.purchase_date || new Date().toISOString().split('T')[0]
+  it.unit_price = row.unit_price != null ? row.unit_price : undefined
+  it.total_price = row.total_price != null ? row.total_price : undefined
+  it.tax_rate = row.tax_rate ?? 0
+  it.supplier_link = row.supplier_link || ''
+  it.remark = row.remark || ''
+  it.images = imgList
+  it.fileList = imgList.map((u: string) => ({ name: (u.split('/').pop() || '图片'), url: u }))
+  return it
+}
+
+// ★ 单条"修改重提"：预填一条被驳回申请到新建弹窗
+const handleReapply = (row: any) => {
+  dialogTitle.value = `重新申请（驳回单 ${row.request_no}）`
+  form.value = { approver_id: row.approver_id ?? undefined, remark: '' }
   materialOptions.value = row.base_id
       ? [{ id: row.base_id, name: row.name || '', spec_model: row.spec_model || '' }]
       : []
-  formItems.value = [firstRow]
+  formItems.value = [buildFormItemFromRequest(row)]
+  formDialogVisible.value = true
+}
+
+// 批次内是否有被驳回的明细（主行显示"整批重提"）
+const batchHasRejected = (row: any) => (row.items || []).some((it: any) => it.status === 2)
+
+// ★ 整批"修改重提"：把批次内所有被驳回的明细一起载入多行弹窗，改后重新提交
+const handleReapplyBatch = (row: any) => {
+  const rejected = (row.items || []).filter((it: any) => it.status === 2)
+  if (!rejected.length) { ElMessage.warning('该批没有被驳回的申请'); return }
+  dialogTitle.value = `整批重新申请（批次 ${row.batchKey}，${rejected.length} 项被驳回）`
+  form.value = { approver_id: rejected[0].approver_id ?? undefined, remark: '' }
+  materialOptions.value = []
+  formItems.value = rejected.map((it: any) => buildFormItemFromRequest(it))
   formDialogVisible.value = true
 }