From 8a2fe85238f34264983717f20a75e9c9eb6288c7 Mon Sep 17 00:00:00 2001
From: Yangk <yangk@menace.com>
Date: Wed, 4 Mar 2026 11:09:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E5=AE=8C=E5=96=84=E5=87=BA?=
 =?UTF-8?q?=E5=B7=AE=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在出差申请编辑页面增加查看模式下的交流过程简述和结果反馈字段
- 为出差历史页面添加筛选表单，支持按申请人和出差日期范围搜索
- 在出差历史页面移除流程状态列的显示
- 集成用户列表数据用于申请人下拉选择
- 实现出差历史页面的分页查询和重置功能
- 添加日期范围选择器用于出差时间筛选
---
 src/views/oa/crm/businessTripApply/edit.vue   | 20 +++++-
 src/views/oa/crm/customerInfo/tripHistory.vue | 67 +++++++++++++++++--
 2 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/src/views/oa/crm/businessTripApply/edit.vue b/src/views/oa/crm/businessTripApply/edit.vue
index 7b74b3a..557ab72 100644
--- a/src/views/oa/crm/businessTripApply/edit.vue
+++ b/src/views/oa/crm/businessTripApply/edit.vue
@@ -16,7 +16,9 @@
 
     <el-card shadow="never" style="margin-top: 0">
       <template #header>
-        <div style="text-align: left; font-weight: bold; font-size: 24px">出差申请{{ form.tripId ? ' - 修改' : ' - 新增' }}</div>
+        <div style="text-align: left; font-weight: bold; font-size: 24px">
+          出差申请{{ routeParams.type === 'view' ? ' - 查看' : form.tripId ? ' - 修改' : ' - 新增' }}
+        </div>
       </template>
       <el-form ref="businessTripApplyFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px">
         <!-- 通用字段区域 -->
@@ -113,6 +115,22 @@
                 <el-input v-model="form.exchangePurpose" placeholder="请输入交流目的" :disabled="isFormDisabled" />
               </el-form-item>
             </el-col>
+            <el-col :span="24" v-if="routeParams.type === 'view'">
+              <el-form-item label="交流过程简述" prop="exchangeProcess">
+                <el-input
+                  v-model="form.exchangeProcess"
+                  type="textarea"
+                  placeholder="如与某某客户某某负责人交谈，参观XX等"
+                  :disabled="isFormDisabled"
+                  :rows="3"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="routeParams.type === 'view'">
+              <el-form-item label="结果反馈" prop="feedback">
+                <el-input v-model="form.feedback" type="textarea" placeholder="达成某种共识或初步合作意向" :disabled="isFormDisabled" :rows="3" />
+              </el-form-item>
+            </el-col>
           </template>
 
           <!-- 动态字段：展会/会议 (Type 3) -->
diff --git a/src/views/oa/crm/customerInfo/tripHistory.vue b/src/views/oa/crm/customerInfo/tripHistory.vue
index e640662..2b0ef06 100644
--- a/src/views/oa/crm/customerInfo/tripHistory.vue
+++ b/src/views/oa/crm/customerInfo/tripHistory.vue
@@ -8,6 +8,30 @@
         </div>
       </template>
 
+      <!-- 筛选表单 -->
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" style="margin-bottom: 15px">
+        <el-form-item label="申请人" prop="applicantId">
+          <el-select v-model="queryParams.applicantId" placeholder="请选择申请人" clearable filterable style="width: 200px">
+            <el-option v-for="user in userList" :key="user.userId" :label="user.nickName" :value="user.userId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="出差日期" prop="dateRange">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="YYYY-MM-DD"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            clearable
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
       <el-table v-loading="loading" border :data="tripList">
         <el-table-column label="申请编号" align="center" prop="applyCode" width="140" />
         <el-table-column label="申请人" align="center" prop="applicantName" width="100" />
@@ -32,7 +56,7 @@
         <el-table-column label="交流目的" align="center" prop="exchangePurpose" width="150" show-overflow-tooltip />
         <el-table-column label="交流过程简述" align="center" prop="exchangeProcess" width="200" show-overflow-tooltip />
         <el-table-column label="结果反馈" align="center" prop="feedback" width="200" show-overflow-tooltip />
-        <el-table-column label="流程状态" align="center" prop="flowStatus" width="100">
+        <!-- <el-table-column label="流程状态" align="center" prop="flowStatus" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.flowStatus === 'finish'" type="success">已完成</el-tag>
             <el-tag v-else-if="scope.row.flowStatus === 'running'" type="warning">审批中</el-tag>
@@ -40,7 +64,7 @@
             <el-tag v-else-if="scope.row.flowStatus === 'back'" type="danger">已退回</el-tag>
             <el-tag v-else type="info">{{ scope.row.flowStatus }}</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="备注" align="center" prop="remark" width="200" show-overflow-tooltip />
         <el-table-column label="操作" align="center" fixed="right" width="100">
           <template #default="scope">
@@ -57,6 +81,8 @@
 <script setup name="CustomerTripHistory" lang="ts">
 import { listBusinessTripApply } from '@/api/oa/crm/businessTripApply';
 import { BusinessTripApplyVO } from '@/api/oa/crm/businessTripApply/types';
+import { getUserList } from '@/api/system/user';
+import { UserVO } from '@/api/system/user/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
@@ -68,18 +94,32 @@ const tripList = ref<BusinessTripApplyVO[]>([]);
 const total = ref(0);
 const customerId = ref<string | number>('');
 const customerName = ref<string>('');
+const dateRange = ref<string[]>([]);
+const queryFormRef = ref<ElFormInstance>();
+const userList = ref<UserVO[]>([]);
 
 const queryParams = ref({
   pageNum: 1,
   pageSize: 20,
   tripType: '2', // 市场交流类型
-  customerId: undefined as string | number | undefined
+  customerId: undefined as string | number | undefined,
+  applicantId: undefined as string | number | undefined,
+  startTime: undefined as string | undefined,
+  endTime: undefined as string | undefined
 });
 
 /** 获取出差记录列表 */
 const getList = async () => {
   loading.value = true;
   try {
+    // 处理日期范围参数
+    if (dateRange.value && dateRange.value.length === 2) {
+      queryParams.value.startTime = dateRange.value[0];
+      queryParams.value.endTime = dateRange.value[1];
+    } else {
+      queryParams.value.startTime = undefined;
+      queryParams.value.endTime = undefined;
+    }
     const res = await listBusinessTripApply(queryParams.value);
     tripList.value = res.rows;
     total.value = res.total;
@@ -90,6 +130,22 @@ const getList = async () => {
   }
 };
 
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  dateRange.value = [];
+  queryParams.value.applicantId = undefined;
+  queryParams.value.startTime = undefined;
+  queryParams.value.endTime = undefined;
+  handleQuery();
+};
+
 /** 查看详情 */
 const handleView = (row: BusinessTripApplyVO) => {
   router.push({
@@ -106,7 +162,10 @@ const goBack = () => {
   router.push('/crm/customerInfo');
 };
 
-onMounted(() => {
+onMounted(async () => {
+  // 加载用户列表
+  const userRes = await getUserList(undefined);
+  userList.value = userRes.data;
   // 获取路由参数
   customerId.value = route.query.customerId as string;
   customerName.value = (route.query.customerName as string) || '未知客户';