From 64d26d9d9311347b2f92e77d1baad5c384c83755 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Thu, 12 Mar 2026 17:40:42 +0800
Subject: [PATCH] =?UTF-8?q?fix(flightBooking):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=BA=E7=A5=A8=E9=A2=84=E8=AE=A2=E8=A1=A8=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=87=E7=AD=BE=E5=92=8C=E9=AA=8C=E8=AF=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将机票预订编号字段标签统一改为流程编号
- 为附件字段添加必填验证规则
- 为文件上传组件添加禁用状态支持
---
 src/components/FileUpload/index.vue      |  4 ++--
 src/views/oa/crm/flightBooking/edit.vue  |  8 +++++---
 src/views/oa/crm/flightBooking/index.vue | 14 +++++++-------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue
index 6bba054..c8a08e0 100644
--- a/src/components/FileUpload/index.vue
+++ b/src/components/FileUpload/index.vue
@@ -35,8 +35,8 @@
       <li v-for="(file, index) in fileList" :key="file.uid" class="el-upload-list__item ele-upload-list__item-content">
         <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         <div class="ele-upload-list__item-content-action">
-          <el-button type="primary" link @click="handleDownload(file)">下载</el-button>
-          <el-button type="danger" v-if="!disabled" link @click="handleDelete(index)">删除</el-button>
+          <el-link type="primary" :underline="false" @click="handleDownload(file)">下载</el-link>
+          <el-link type="danger" v-if="!disabled" :underline="false" @click="handleDelete(index)">删除</el-link>
         </div>
       </li>
     </transition-group>
diff --git a/src/views/oa/crm/flightBooking/edit.vue b/src/views/oa/crm/flightBooking/edit.vue
index 4e4c78d..eb0015c 100644
--- a/src/views/oa/crm/flightBooking/edit.vue
+++ b/src/views/oa/crm/flightBooking/edit.vue
@@ -17,7 +17,7 @@
       <el-form ref="flightBookingFormRef" :model="form" :rules="rules" label-width="120px" :disabled="isFormDisabled">
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="机票预订编号" prop="applyCode">
+            <el-form-item label="流程编号" prop="applyCode">
               <el-input v-model="form.applyCode" placeholder="自动生成" :disabled="true" />
             </el-form-item>
           </el-col>
@@ -71,6 +71,7 @@
             <el-form-item label="附件" prop="ossId">
               <FileUpload
                 v-model="ossIdString"
+                :disabled="isFormDisabled"
                 :limit="5"
                 :fileSize="20"
                 :fileType="['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx']"
@@ -289,7 +290,8 @@ const data = reactive<PageData<FlightBookingForm, FlightBookingQuery>>({
     flightAmount: [
       { required: true, message: '机票金额不能为空', trigger: 'blur' },
       { validator: validateAmount, trigger: ['blur', 'change'] } // 添加自定义验证
-    ]
+    ],
+    ossId: [{ required: true, message: '请上传机票折扣信息页面截图', trigger: 'blur' }]
   }
 });
 
@@ -361,7 +363,7 @@ const submitForm = (status: string, mode: boolean) => {
     } else {
       // 验证不通过时，立即恢复按钮状态
       buttonLoading.value = false;
-      proxy?.$modal.msgWarning('s请检查表单填写是否正确');
+      proxy?.$modal.msgWarning('请检查表单填写是否正确');
     }
   });
 };
diff --git a/src/views/oa/crm/flightBooking/index.vue b/src/views/oa/crm/flightBooking/index.vue
index 8d074d4..281e4ae 100644
--- a/src/views/oa/crm/flightBooking/index.vue
+++ b/src/views/oa/crm/flightBooking/index.vue
@@ -4,8 +4,8 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
-            <el-form-item label="机票预订编号" prop="applyCode">
-              <el-input v-model="queryParams.applyCode" placeholder="请输入机票预订编号" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="流程编号" prop="applyCode">
+              <el-input v-model="queryParams.applyCode" placeholder="请输入流程编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="乘机人姓名" prop="passengerName">
               <!-- <el-input v-model="queryParams.passengerName" placeholder="请输入乘机人姓名" clearable @keyup.enter="handleQuery" /> -->
@@ -68,7 +68,7 @@
       <el-table v-loading="loading" border :data="flightBookingList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="机票预订ID" align="center" prop="bookingId" width="120" v-if="columns[0].visible" />
-        <el-table-column label="机票预订编号" align="center" prop="applyCode" width="160" v-if="columns[2].visible" />
+        <el-table-column label="流程编号" align="center" prop="applyCode" width="160" v-if="columns[2].visible" />
         <el-table-column label="乘机人ID" align="center" prop="passengerId" v-if="columns[3].visible" />
         <el-table-column label="乘机人姓名" align="center" prop="passengerName" width="120" v-if="columns[4].visible" />
         <el-table-column label="出行日期" align="center" prop="travelDate" width="120" v-if="columns[5].visible">
@@ -116,8 +116,8 @@
     <!-- 添加或修改机票预订对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="flightBookingFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="机票预订编号" prop="applyCode">
-          <el-input v-model="form.applyCode" placeholder="请输入机票预订编号" />
+        <el-form-item label="流程编号" prop="applyCode">
+          <el-input v-model="form.applyCode" placeholder="请输入流程编号" />
         </el-form-item>
         <el-form-item label="乘机人ID" prop="passengerId">
           <el-input v-model="form.passengerId" placeholder="请输入乘机人ID" />
@@ -203,7 +203,7 @@ const dialog = reactive<DialogOption>({
 const columns = ref<FieldOption[]>([
   { key: 0, label: `机票预订ID`, visible: false },
   { key: 1, label: `租户编号`, visible: true },
-  { key: 2, label: `机票预订编号`, visible: true },
+  { key: 2, label: `流程编号`, visible: true },
   { key: 3, label: `乘机人ID`, visible: false },
   { key: 4, label: `乘机人姓名`, visible: true },
   { key: 5, label: `出行日期`, visible: true },
@@ -392,7 +392,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: FlightBookingVO) => {
   const _bookingIds = row?.bookingId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除机票预订编号为"' + _bookingIds + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除流程编号为"' + _bookingIds + '"的数据项？').finally(() => (loading.value = false));
   await delFlightBooking(_bookingIds);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();