From 46c2207b986a40e0d44bfaf1dfaa19446f13938f Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 30 Jan 2026 13:57:07 +0800
Subject: [PATCH] =?UTF-8?q?feat(crm):=20=E5=B0=86=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BA=E6=8C=89=E9=92=AE=E8=A7=A6=E5=8F=91=E7=9A=84=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将礼品选择下拉框替换为按钮触发的礼品选择弹窗组件
- 集成 GiftSelect 组件实现单选礼品功能
- 移除原有的礼品列表加载逻辑，改用弹窗方式获取礼品信息
- 调整业务标题格式，简化显示内容
- 修复库存不足提示对话框组件引用问题
- 优化新增表单初始化逻辑，保留申请人信息并设置默认申请日期
- 调整表格列配置，隐藏流程状态列并重新排序创建时间列
- 添加详细的礼品选择确认回调处理逻辑
---
 src/views/oa/crm/crmGiftApply/edit.vue  | 87 ++++++++++++++-----------
 src/views/oa/crm/crmGiftApply/index.vue | 12 ++--
 2 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/src/views/oa/crm/crmGiftApply/edit.vue b/src/views/oa/crm/crmGiftApply/edit.vue
index fafc09c..2b92cde 100644
--- a/src/views/oa/crm/crmGiftApply/edit.vue
+++ b/src/views/oa/crm/crmGiftApply/edit.vue
@@ -85,16 +85,15 @@
           <el-table-column type="index" label="序号" width="60" align="center" />
           <el-table-column label="礼品" min-width="200" align="center">
             <template #default="scope">
-              <el-select
-                v-model="scope.row.giftId"
-                placeholder="请选择礼品"
-                filterable
-                @change="(val) => handleGiftChange(val, scope.$index)"
+              <el-button
+                type="primary"
+                link
+                icon="Search"
                 :disabled="routeParams.type === 'view' || routeParams.type === 'approval'"
-                style="width: 100%"
+                @click="openGiftSelect(scope.$index)"
               >
-                <el-option v-for="gift in giftList" :key="gift.giftId" :label="`${gift.giftCode} - ${gift.giftName}`" :value="gift.giftId" />
-              </el-select>
+                {{ scope.row.giftName ? `${scope.row.giftCode || ''} ${scope.row.giftName}` : '选择礼品' }}
+              </el-button>
             </template>
           </el-table-column>
           <el-table-column label="规格型号" prop="specification" min-width="120" align="center" />
@@ -179,6 +178,9 @@
       </el-form>
     </el-card>
 
+    <!-- 礼品选择弹窗（单选） -->
+    <GiftSelect ref="giftSelectRef" :multiple="false" @confirm-call-back="handleGiftSelectConfirm" />
+
     <!-- 审批弹窗 -->
     <SubmitVerify ref="submitVerifyRef" @submitCallback="submitCallback" />
     <!-- 审批记录 -->
@@ -189,7 +191,7 @@
 <script setup name="CrmGiftApplyEdit" lang="ts">
 import { addCrmGiftApply, getCrmGiftApply, giftApplySubmitAndFlowStart, updateCrmGiftApply } from '@/api/oa/crm/crmGiftApply';
 import { CrmGiftApplyForm } from '@/api/oa/crm/crmGiftApply/types';
-import { getCrmGiftInfoList } from '@/api/oa/crm/crmGiftInfo';
+import GiftSelect from '@/components/GiftSelect/index.vue';
 import { CrmGiftInfoVO } from '@/api/oa/crm/crmGiftInfo/types';
 import { getCrmCustomerInfoList } from '@/api/oa/crm/crmCustomerInfo';
 import { CrmCustomerInfoVO } from '@/api/oa/crm/crmCustomerInfo/types';
@@ -198,6 +200,8 @@ import { listUser } from '@/api/system/user';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import approvalButton from '@/components/Process/approvalButton.vue';
+import { ElMessageBox } from 'element-plus';
+import dayjs from 'dayjs';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -217,7 +221,9 @@ const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
 
 // 状态
 const buttonLoading = ref(false);
-const giftList = ref<CrmGiftInfoVO[]>([]);
+// 礼品选择组件引用与当前行索引
+const giftSelectRef = ref<InstanceType<typeof GiftSelect>>();
+const currentRowIndex = ref<number>(-1);
 const customerList = ref<CrmCustomerInfoVO[]>([]);
 const userList = ref<any[]>([]); // 用户列表，用于审批人选择
 
@@ -292,16 +298,6 @@ const loadCustomerList = async () => {
   }
 };
 
-/** 加载礼品列表 */
-const loadGiftList = async () => {
-  try {
-    const res = await getCrmGiftInfoList({});
-    giftList.value = res.data || [];
-  } catch (error) {
-    console.error('加载礼品列表失败:', error);
-  }
-};
-
 /** 加载表单数据 */
 const loadFormData = async (id: string | number) => {
   try {
@@ -369,19 +365,21 @@ const handleCustomerChange = (customerId: number | string) => {
   }
 };
 
-/** 礼品选择变更 */
-const handleGiftChange = (giftId: string | number, index: number) => {
-  const gift = giftList.value.find((g) => g.giftId === giftId);
-  if (gift && form.value.detailList) {
-    const detail = form.value.detailList[index];
-    detail.giftCode = gift.giftCode;
-    detail.giftName = gift.giftName;
-    detail.specification = gift.specification;
-    detail.unitPrice = gift.unitPrice;
-    detail.inventoryQuantity = gift.inventoryQuantity;
-    detail.applicationQuantity = 1;
-    calculateAmount(index);
+/** 礼品选择回填 */
+const handleGiftSelectConfirm = (data: CrmGiftInfoVO[]) => {
+  if (currentRowIndex.value < 0 || !data || data.length === 0) {
+    return;
   }
+  const gift = data[0];
+  const detail = form.value.detailList[currentRowIndex.value];
+  detail.giftId = gift.giftId as any;
+  detail.giftCode = gift.giftCode;
+  detail.giftName = gift.giftName;
+  detail.specification = gift.specification;
+  detail.unitPrice = gift.unitPrice;
+  detail.inventoryQuantity = gift.inventoryQuantity;
+  detail.applicationQuantity = 1;
+  calculateAmount(currentRowIndex.value);
 };
 
 /** 计算金额 */
@@ -420,6 +418,12 @@ const handleAddDetail = () => {
   });
 };
 
+/** 打开礼品选择弹窗 */
+const openGiftSelect = (index: number) => {
+  currentRowIndex.value = index;
+  giftSelectRef.value?.open();
+};
+
 /** 删除礼品明细 */
 const handleDeleteDetail = (index: number) => {
   if (form.value.detailList) {
@@ -490,7 +494,7 @@ const submitForm = async (status: string) => {
       };
       // P2-2: 完善 businessTitle 格式，包含申请人和客户单位信息
       form.value.bizExt = {
-        businessTitle: `礼品申请审批 - ${form.value.applicantName} - ${form.value.customerUnitName}`,
+        businessTitle: `礼品申请审批`,
         businessCode: form.value.applicationCode,
         businessId: String(form.value.giftApplyId)
       };
@@ -502,7 +506,7 @@ const submitForm = async (status: string) => {
         if (submitError?.message && submitError.message.includes('库存不足')) {
           // 将换行符转换为HTML换行标签，便于弹窗展示
           const formattedMsg = submitError.message.replace(/\n/g, '<br/>');
-          await proxy?.$alert(formattedMsg, '库存不足提示', {
+          await ElMessageBox.alert(formattedMsg, '库存不足提示', {
             type: 'warning',
             dangerouslyUseHTMLString: true,
             confirmButtonText: '我知道了'
@@ -553,15 +557,22 @@ onMounted(async () => {
   // 初始化用户信息（申请人）
   await initUserInfo();
 
-  // 查询客户、礼品列表
-  await Promise.all([loadCustomerList(), loadGiftList()]);
+  // 查询客户列表
+  await loadCustomerList();
 
   // 如果有ID则查询详情
   if (currentId.value) {
     await loadFormData(currentId.value);
   } else {
-    // 新增时初始化默认数据
-    form.value = { ...initFormData } as any;
+    // 新增时初始化默认数据（保留 initUserInfo 已写入的申请人/领用人信息）
+    // 注意：initFormData 中 recipientName 为 undefined，直接 Object.assign 会覆盖已有值
+    Object.assign(form.value, { ...initFormData, ...form.value });
+    console.debug('[crmGiftApply] init defaults merged', {
+      applicantName: form.value.applicantName,
+      recipientName: form.value.recipientName
+    });
+    // 申请日期默认当天，便于快速选择
+    form.value.applicationDate = dayjs().format('YYYY-MM-DD');
     calculateTotalAmount();
   }
 });
diff --git a/src/views/oa/crm/crmGiftApply/index.vue b/src/views/oa/crm/crmGiftApply/index.vue
index fb8977d..1a0cc12 100644
--- a/src/views/oa/crm/crmGiftApply/index.vue
+++ b/src/views/oa/crm/crmGiftApply/index.vue
@@ -63,12 +63,12 @@
             <dict-tag :options="gift_apply_status" :value="scope.row.applicationStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="流程状态" align="center" prop="flowStatus" width="100" v-if="columns[9].visible">
+        <!-- <el-table-column label="流程状态" align="center" prop="flowStatus" width="100" v-if="columns[9].visible">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus" />
           </template>
-        </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime" width="160" v-if="columns[10].visible">
+        </el-table-column> -->
+        <el-table-column label="创建时间" align="center" prop="createTime" width="160" v-if="columns[9].visible">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
           </template>
@@ -178,9 +178,9 @@ const columns = ref<FieldOption[]>([
   { key: 5, label: `客人姓名`, visible: true },
   { key: 6, label: `人数`, visible: true },
   { key: 7, label: `申请总金额`, visible: true },
-  { key: 8, label: `申请状态`, visible: true },
-  { key: 9, label: `流程状态`, visible: true },
-  { key: 10, label: `创建时间`, visible: true }
+  // { key: 8, label: `申请状态`, visible: true },
+  { key: 8, label: `流程状态`, visible: true },
+  { key: 9, label: `创建时间`, visible: true }
 ]);
 
 const queryParams = reactive<CrmGiftApplyQuery>({