From e507dd312be5bd83a1808f5e1e91f310b6c00522 Mon Sep 17 00:00:00 2001
From: lh <ch2203598@outlook.com>
Date: Fri, 26 Dec 2025 16:25:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E5=91=A8=E6=8A=A5=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=AE=8C=E5=96=84=EF=BC=9A=E8=A1=A8=E5=8D=95=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E7=95=8C=E9=9D=A2=E4=BB=A5=E5=8F=8A=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=AD=E7=9A=84=E9=99=84=E4=BB=B6=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E3=80=82=202.?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=91=A8=E6=8A=A5=E5=AF=BC=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84=E3=80=82=203.=E6=9C=BA=E7=A5=A8?=
 =?UTF-8?q?=E9=A2=84=E8=AE=A2=E4=BB=A3=E7=A0=81=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/oa/crm/flightBooking/index.ts       |  21 +-
 src/api/oa/erp/projectReportDetail/types.ts |   5 +-
 src/enums/OAEnum.ts                         |   4 +
 src/views/oa/crm/flightBooking/edit.vue     | 150 ++++-----
 src/views/oa/crm/flightBooking/index.vue    |  73 +++--
 src/views/oa/erp/projectReport/edit.vue     | 317 ++++++--------------
 src/views/oa/erp/projectReport/index.vue    |   4 +-
 7 files changed, 224 insertions(+), 350 deletions(-)

diff --git a/src/api/oa/crm/flightBooking/index.ts b/src/api/oa/crm/flightBooking/index.ts
index 02deea7..111a319 100644
--- a/src/api/oa/crm/flightBooking/index.ts
+++ b/src/api/oa/crm/flightBooking/index.ts
@@ -1,6 +1,6 @@
 import request from '@/utils/request';
 import { AxiosPromise } from 'axios';
-import { FlightBookingVO, FlightBookingForm, FlightBookingQuery } from '@/api/oa/flightBooking/types';
+import { FlightBookingVO, FlightBookingForm, FlightBookingQuery } from '@/api/oa/crm/flightBooking/types';
 
 /**
  * 查询机票预订列表
@@ -33,7 +33,7 @@ export const getFlightBooking = (bookingId: string | number): AxiosPromise<Fligh
  */
 export const addFlightBooking = (data: FlightBookingForm) => {
   return request({
-    url: '/oa//crm/flightBooking',
+    url: '/oa/crm/flightBooking',
     method: 'post',
     data: data
   });
@@ -45,7 +45,7 @@ export const addFlightBooking = (data: FlightBookingForm) => {
  */
 export const updateFlightBooking = (data: FlightBookingForm) => {
   return request({
-    url: '/oa//crm/flightBooking',
+    url: '/oa/crm/flightBooking',
     method: 'put',
     data: data
   });
@@ -57,7 +57,7 @@ export const updateFlightBooking = (data: FlightBookingForm) => {
  */
 export const delFlightBooking = (bookingId: string | number | Array<string | number>) => {
   return request({
-    url: '/oa//crm/flightBooking/' + bookingId,
+    url: '/oa/crm/flightBooking/' + bookingId,
     method: 'delete'
   });
 };
@@ -69,8 +69,19 @@ export const delFlightBooking = (bookingId: string | number | Array<string | num
  */
 export function getCrmFlightBookingList(query) {
   return request({
-    url: '/oa//crm/flightBooking/getCrmFlightBookingList',
+    url: '/oa/crm/flightBooking/getCrmFlightBookingList',
     method: 'get',
     params: query
   });
 }
+/**
+ * 机票预订提交并发起流程
+ * @param data 表单数据
+ */
+export const submitAndFlowStart = (data: any) => {
+  return request({
+    url: '/oa/crm/flightBooking/submitAndFlowStart',
+    method: 'post',
+    data: data
+  });
+};
diff --git a/src/api/oa/erp/projectReportDetail/types.ts b/src/api/oa/erp/projectReportDetail/types.ts
index e40809b..e8efacf 100644
--- a/src/api/oa/erp/projectReportDetail/types.ts
+++ b/src/api/oa/erp/projectReportDetail/types.ts
@@ -323,8 +323,11 @@ export interface extraInfo {
   chargeName?: string;
 
   deputyName?: string;
-}
 
+  beginDate?: string;
+
+  endDate?: string;
+}
 // 扩展的项目周报明细表单类型（包含流程相关字段）
 export type ProjectReportDetailFormEx = ProjectReportDetailForm & {
   flowCode?: string;
diff --git a/src/enums/OAEnum.ts b/src/enums/OAEnum.ts
index 5aef2ff..3c48351 100644
--- a/src/enums/OAEnum.ts
+++ b/src/enums/OAEnum.ts
@@ -138,4 +138,8 @@ export enum FlowCodeEnum {
    * 合同订单标识KEY
    */
   CONTRACT_ORDER_KEY = 'htdd',
+  /**
+   * 机票预订KEY
+   */
+  FLIGHT_BOOKING_CODE = 'JPYD'
 }
diff --git a/src/views/oa/crm/flightBooking/edit.vue b/src/views/oa/crm/flightBooking/edit.vue
index 2c343b4..8655c6c 100644
--- a/src/views/oa/crm/flightBooking/edit.vue
+++ b/src/views/oa/crm/flightBooking/edit.vue
@@ -1,9 +1,6 @@
 <template>
   <div class="p-2">
     <el-card shadow="never" style="margin-top: 0">
-      <!--      <template #header>-->
-      <!--        <div style="text-align: left; font-weight: bold; font-size: 24px">合同{{ form.contractId ? ' - 修改' : ' - 新增' }}</div>-->
-      <!--      </template>-->
       <!-- 审批按钮组件 -->
       <approvalButton
         @submitForm="submitForm"
@@ -17,11 +14,11 @@
       />
     </el-card>
     <el-card shadow="never" style="margin-top: 0">
-      <el-form ref="flightBookingFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px">
+      <el-form ref="flightBookingFormRef" :model="form" :loading="buttonLoading" :rules="rules" label-width="120px" :disabled="isFormDisabled">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="机票预订编号" prop="applyCode">
-              <el-input v-model="form.applyCode" placeholder="请输入机票预订编号" :disabled="isFormDisabled">
+              <el-input v-model="form.applyCode" placeholder="请输入机票预订编号">
                 <template #append>
                   <el-button type="primary" @click="generateContractCode" :disabled="isCodeGenerated">生成机票预订编号 </el-button>
                 </template>
@@ -32,9 +29,9 @@
             <!-- <el-form-item label="乘机人姓名" prop="passengerName">
               <el-input v-model="form.passengerName" placeholder="请输入乘机人姓名" />
             </el-form-item> -->
-            <el-form-item label="乘机人姓名" prop="passengerName">
-              <el-select v-model="queryParams.passengerName" placeholder="请选择乘机人" filterable>
-                <el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName" :value="item.nickName" />
+            <el-form-item label="乘机人" prop="passengerId">
+              <el-select v-model="form.passengerId" placeholder="请选择乘机人" filterable>
+                <el-option v-for="item in userInfoList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -104,9 +101,7 @@
   </div>
 </template>
 
-<script setup name="ContractInfoEdit" lang="ts">
-import { addContractInfo, contractSubmitAndFlowStart, getContractInfo, updateContractInfo } from '@/api/oa/erp/contractInfo';
-import { ContractInfoForm } from '@/api/oa/erp/contractInfo/types';
+<script setup name="flightBooking" lang="ts">
 import { getRuleGenerateCode } from '@/api/system/codeRule';
 import { startWorkFlow } from '@/api/workflow/task';
 import { StartProcessBo } from '@/api/workflow/workflowCommon/types';
@@ -118,7 +113,7 @@ import { getUserList } from '@/api/system/user';
 import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
 import { getInfo } from '@/api/login';
 import FileUpload from '@/components/FileUpload/index.vue';
-import { listFlightBooking, getFlightBooking, delFlightBooking, addFlightBooking, updateFlightBooking } from '@/api/oa/crm/flightBooking';
+import { getFlightBooking, delFlightBooking, addFlightBooking, updateFlightBooking, submitAndFlowStart } from '@/api/oa/crm/flightBooking';
 import { FlightBookingVO, FlightBookingQuery, FlightBookingForm } from '@/api/oa/crm/flightBooking/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -208,8 +203,8 @@ const data = reactive<PageData<FlightBookingForm, FlightBookingQuery>>({
     params: {}
   },
   rules: {
-    bookingId: [{ required: true, message: '机票预订ID不能为空', trigger: 'blur' }],
     passengerId: [{ required: true, message: '乘机人ID不能为空', trigger: 'blur' }],
+    applyCode: [{ required: true, message: '机票编码不能为空', trigger: 'blur' }],
     travelDate: [{ required: true, message: '出行日期不能为空', trigger: 'blur' }],
     departureLocation: [{ required: true, message: '出发地点不能为空', trigger: 'blur' }],
     arrivalLocation: [{ required: true, message: '到达地点不能为空', trigger: 'blur' }],
@@ -225,17 +220,33 @@ const flightBookingFormRef = ref<ElFormInstance>();
 const generateContractCode = async () => {
   if (isCodeGenerated.value) return; // 如果已经生成过，直接返回
   try {
-    const params = { codeRuleCode: CodeRuleEnum.CONTRACT } as any;
+    const params = { codeRuleCode: 1016 } as any;
     const res = await getRuleGenerateCode(params);
     form.value.applyCode = res.msg;
     isCodeGenerated.value = true; // 标记为已生成
-    proxy?.$modal.msgSuccess('合同编号生成成功');
+    proxy?.$modal.msgSuccess('机票编号生成成功');
   } catch (error) {
-    console.error('生成合同编号失败:', error);
-    proxy?.$modal.msgError('生成合同编号失败');
+    console.error('生成机票编号失败:', error);
+    proxy?.$modal.msgError('机票编号生成成功');
   }
 };
-
+watch(
+  () => form.value.passengerId, // 监听 passengerId
+  (newPassengerId) => {
+    if (newPassengerId && userInfoList.value.length > 0) {
+      // 在用户列表中查找对应的用户
+      const selectedUser = userInfoList.value.find((user) => user.userId === newPassengerId);
+      if (selectedUser) {
+        // 自动设置 passengerName
+        form.value.passengerName = selectedUser.nickName;
+      }
+    } else {
+      // 如果 passengerId 为空，清空 passengerName
+      form.value.passengerName = '';
+    }
+  },
+  { immediate: true } // 立即执行一次，用于编辑模式的数据回显
+);
 /** 提交按钮 */
 const submitForm = (status: string, mode: boolean) => {
   try {
@@ -248,33 +259,30 @@ const submitForm = (status: string, mode: boolean) => {
           form.value.flowCode = FlowCodeEnum.FLIGHT_BOOKING_CODE;
           // 流程变量
           form.value.variables = {
-            contractName: form.value.contractName,
-            totalPrice: form.value.totalPrice,
-            businessDirection: form.value.businessDirection,
-            contractCode: form.value.contractCode
+            flightDiscount: form.value.flightDiscount
           };
           // 流程实例业务扩展字段
           form.value.bizExt = {
-            businessTitle: '合同审批',
-            businessCode: form.value.contractCode
+            businessTitle: '机票预订',
+            businessCode: form.value.applyCode
           };
-          form.value.contractStatus = '2';
           form.value.flowStatus = 'waiting';
-          const res = await contractSubmitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
+          form.value.bookingStatus = '2';
+          const res = await submitAndFlowStart(form.value).finally(() => (buttonLoading.value = false));
           form.value = res.data;
           proxy?.$modal.msgSuccess('操作成功');
           proxy?.$tab.closePage();
           router.go(-1);
         } else {
-          if (status === 'draft') {
-            form.value.contractStatus = '1';
-            form.value.flowStatus = 'draft';
-          }
-          if (form.value.contractId) {
-            await updateContractInfo(form.value).finally(() => (buttonLoading.value = false));
+          form.value.flowStatus = 'draft';
+          form.value.bookingStatus = '1';
+
+          if (form.value.bookingId) {
+            await updateFlightBooking(form.value).finally(() => (buttonLoading.value = false));
           } else {
-            await addContractInfo(form.value).finally(() => (buttonLoading.value = false));
+            await addFlightBooking(form.value).finally(() => (buttonLoading.value = false));
           }
+
           proxy?.$modal.msgSuccess('暂存成功');
           proxy?.$tab.closePage();
           router.go(-1);
@@ -286,42 +294,6 @@ const submitForm = (status: string, mode: boolean) => {
   }
 };
 
-// 提交申请
-const handleStartWorkFlow = async (data: ContractInfoForm) => {
-  try {
-    submitFormData.value.flowCode = 'OAC';
-    submitFormData.value.businessId = data.contractId;
-
-    // 流程变量
-    taskVariables.value = {
-      contractId: data.contractId,
-      contractName: data.contractName,
-      totalPrice: data.totalPrice,
-      businessDirection: data.businessDirection,
-      contractCode: data.contractCode
-    };
-
-    // 流程实例业务扩展字段
-    flowInstanceBizExtBo.value = {
-      businessTitle: '合同审批',
-      businessCode: data.contractCode
-    };
-
-    submitFormData.value.variables = taskVariables.value;
-    submitFormData.value.bizExt = flowInstanceBizExtBo.value;
-
-    const resp = await startWorkFlow(submitFormData.value);
-
-    if (submitVerifyRef.value) {
-      buttonLoading.value = false;
-      await submitVerifyRef.value.openDialog(resp.data.taskId);
-    }
-  } finally {
-    buttonLoading.value = false;
-    router.go(-1);
-  }
-};
-
 onMounted(async () => {
   nextTick(async () => {
     // 获取路由参数
@@ -330,36 +302,34 @@ onMounted(async () => {
     const id = routeParams.value.id as string | number;
     if (id && (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval')) {
       proxy?.$modal.loading('正在加载数据，请稍后...');
-      const res = await getContractInfo(id);
+      const res = await getFlightBooking(id);
       Object.assign(form.value, res.data);
 
       proxy?.$modal.closeLoading();
       // 编辑模式：如果已有合同编号，禁用生成按钮
-      if (form.value.contractCode) {
+      if (form.value.applyCode) {
         isCodeGenerated.value = true;
-      } else if (form.value.contractFlag === '1') {
-        // 如果有合同但没有编号，允许生成
+      } else {
         isCodeGenerated.value = false;
       }
     } else {
       // 新增模式：获取登录用户部门ID并自动赋值
-      try {
-        const userInfoRes = await getInfo();
-        if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
-          form.value.contractDeptId = userInfoRes.data.user.deptId;
-        }
-        form.value.contractCategory = routeParams.value.contractCategory as string;
-      } catch (error) {
-        console.error('获取用户信息失败:', error);
-      }
-
-      // 新增模式：如果已有合同编号，禁用生成按钮
-      if (form.value.contractCode) {
-        isCodeGenerated.value = true;
-      } else if (form.value.contractFlag === '1') {
-        // 如果有合同但没有编号，允许生成
-        isCodeGenerated.value = false;
-      }
+      // try {
+      //   const userInfoRes = await getInfo();
+      //   if (userInfoRes.data?.user?.deptId && !form.value.contractDeptId) {
+      //     form.value.contractDeptId = userInfoRes.data.user.deptId;
+      //   }
+      //   form.value.contractCategory = routeParams.value.contractCategory as string;
+      // } catch (error) {
+      //   console.error('获取用户信息失败:', error);
+      // }
+      // // 新增模式：如果已有合同编号，禁用生成按钮
+      // if (form.value.contractCode) {
+      //   isCodeGenerated.value = true;``
+      // } else if (form.value.contractFlag === '1') {
+      //   // 如果有合同但没有编号，允许生成
+      //   isCodeGenerated.value = false;
+      // }
     }
   });
 });
diff --git a/src/views/oa/crm/flightBooking/index.vue b/src/views/oa/crm/flightBooking/index.vue
index 16c68cb..d343ba7 100644
--- a/src/views/oa/crm/flightBooking/index.vue
+++ b/src/views/oa/crm/flightBooking/index.vue
@@ -48,11 +48,11 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['oa/crm:flightBooking:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['oa/crm:flightBooking:edit']"
               >修改</el-button
             >
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['oa/crm:flightBooking:remove']"
               >删除</el-button
@@ -78,24 +78,32 @@
         </el-table-column>
         <el-table-column label="出发地点" align="center" prop="departureLocation" v-if="columns[6].visible" />
         <el-table-column label="到达地点" align="center" prop="arrivalLocation" v-if="columns[7].visible" />
-        <!-- <el-table-column label="机票折扣" align="center" prop="flightDiscount" v-if="columns[8].visible" /> -->
         <el-table-column label="机票折扣" align="center" prop="flightDiscount" v-if="columns[8].visible">
           <template #default="scope">
             <dict-tag :options="flight_discount" :value="scope.row.flightDiscount" />
           </template>
         </el-table-column>
         <el-table-column label="机票金额" align="center" prop="flightAmount" v-if="columns[9].visible" />
-        <el-table-column label="附件ID" align="center" prop="ossId" v-if="columns[10].visible" />
-        <el-table-column label="申请状态" align="center" prop="bookingStatus" v-if="columns[11].visible" />
+        <el-table-column label="附件ID" align="center" prop="ossId" width="100" v-if="columns[10].visible">
+          <template #default="scope">
+            <el-button v-if="scope.row.ossId" link type="primary" icon="Download" @click="downloadOss(scope.row.ossId)">下载 </el-button>
+            <span v-else style="color: #999">未上传</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="申请状态" align="center" prop="bookingStatus" v-if="columns[11].visible">
+          <template #default="scope">
+            <dict-tag :options="booking_status" :value="scope.row.bookingStatus" />
+          </template>
+        </el-table-column>
         <el-table-column label="流程状态" align="center" prop="flowStatus" v-if="columns[12].visible" />
         <el-table-column label="备注" align="center" prop="remark" v-if="columns[13].visible" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa:flightBooking:edit']"></el-button>
+            <el-tooltip content="查看详情" placement="top" v-if="scope.row.flowStatus !== 'draft'">
+              <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:flightBooking:remove']"></el-button>
+            <el-tooltip content="修改" placement="top" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'back'">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['oa/crm:flightBooking:edit']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -165,11 +173,13 @@ import { listFlightBooking, getFlightBooking, delFlightBooking, addFlightBooking
 import { FlightBookingVO, FlightBookingQuery, FlightBookingForm } from '@/api/oa/crm/flightBooking/types';
 import FileUpload from '@/components/FileUpload/index.vue';
 import { getUserList } from '@/api/system/user';
+import download from '@/plugins/download';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
-const { flight_discount } = toRefs<any>(proxy?.useDict('flight_discount'));
+const { flight_discount, booking_status } = toRefs<any>(proxy?.useDict('flight_discount', 'booking_status'));
 
 const flightBookingList = ref<FlightBookingVO[]>([]);
 const buttonLoading = ref(false);
@@ -267,7 +277,10 @@ const ossIdString = computed({
     form.value.ossId = val || (undefined as any);
   }
 });
-
+// 下载附件
+const downloadOss = (ossId: string | number) => {
+  download.oss(ossId);
+};
 /** 查询用户信息下拉框结构 */
 const userInfoList = ref([]);
 const getUserInfoListSelect = async () => {
@@ -314,12 +327,6 @@ const handleSelectionChange = (selection: FlightBookingVO[]) => {
   multiple.value = !selection.length;
 };
 
-// /** 新增按钮操作 */
-// const handleAdd = () => {
-//   reset();
-//   dialog.visible = true;
-//   dialog.title = '添加机票预订';
-// };
 /** 新增按钮操作 */
 const handleAdd = () => {
   proxy.$tab.closePage(route);
@@ -330,15 +337,37 @@ const handleAdd = () => {
     }
   });
 };
+/** 查看按钮操作 */
+const handleView = (row?: FlightBookingVO) => {
+  const _bookingId = row?.bookingId || ids.value[0];
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/crm/flightBooking/edit',
+    query: {
+      id: _bookingId,
+      type: 'view'
+    }
+  });
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: FlightBookingVO) => {
-  reset();
   const _bookingId = row?.bookingId || ids.value[0];
-  const res = await getFlightBooking(_bookingId);
-  Object.assign(form.value, res.data);
-  dialog.visible = true;
-  dialog.title = '修改机票预订';
+  proxy.$tab.closePage(route);
+  router.push({
+    path: '/crm/flightBooking/edit',
+    query: {
+      id: _bookingId,
+      type: 'update'
+    }
+  });
+};
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+// 审批记录
+const handleApprovalRecord = (row?: FlightBookingVO) => {
+  if (row) {
+    approvalRecordRef.value.init(row?.bookingId);
+  }
 };
 
 /** 提交按钮 */
diff --git a/src/views/oa/erp/projectReport/edit.vue b/src/views/oa/erp/projectReport/edit.vue
index 8539deb..be9e6fb 100644
--- a/src/views/oa/erp/projectReport/edit.vue
+++ b/src/views/oa/erp/projectReport/edit.vue
@@ -180,6 +180,16 @@
             <span>{{ parseTime(scope.row.fillTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="开始时间" align="center" prop="beginDate" width="180" v-if="columns[23].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.beginDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="结束时间" align="center" prop="endDate" width="180" v-if="columns[24].visible">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="所在的工作周" align="center" prop="currentWorkWeek" width="100" v-if="columns[4].visible" />
         <el-table-column label="所属里程碑" align="center" prop="milestonePlan" width="100" v-if="columns[5].visible" />
         <el-table-column label="二级进度阶段" align="center" prop="secondaryPhase" width="100" v-if="columns[6].visible" />
@@ -255,20 +265,30 @@
             <el-form-item label="填写日期" prop="fillTime">
               <el-date-picker
                 clearable
-                v-model="datePart"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+                v-model="projectReportForm.fillTime"
+                type="datetime"
+                value-format="YYYY-MM-DD HH:mm:ss"
                 placeholder="请选择填写日期"
-                @change="handleDateChange"
+                :disabled="true"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所在的工作周" prop="currentWorkWeek">
               <el-input v-model="projectReportForm.currentWorkWeek" placeholder="请输入所在的工作周" clearable />
             </el-form-item>
-          </el-col>
+          </el-col> -->
+          <el-form-item label="起始时间">
+            <el-date-picker
+              v-model="dateRange"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+            ></el-date-picker>
+          </el-form-item>
           <el-col :span="12">
             <el-form-item label="所属里程碑" prop="milestonePlan">
               <el-input v-model="projectReportForm.milestonePlan" placeholder="请输入所属里程碑" clearable />
@@ -569,13 +589,13 @@ import {
   ProjectReportDetailFormEx
 } from '@/api/oa/erp/projectReportDetail/types';
 import ProjectSelect from '@/components/ProjectSelect/index.vue';
-// 导入FileUpload组件
 import FileUpload from '@/components/FileUpload/index.vue';
 import download from '@/plugins/download';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const route = useRoute();
 const router = useRouter();
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const modifiedPageType = computed(() => {
   // 在新增状态下且存在审批中记录时，将 pageType 改为 'view' 来隐藏提交按钮
   if (routeParams.value.type === 'add' && projectReportForm.value.flowStatus === 'waiting') {
@@ -733,7 +753,9 @@ const initProjectReportFormData: ProjectReportDetailFormEx = {
   bizExt: undefined,
   variables: undefined,
   createTime: undefined,
-  updateTime: undefined
+  updateTime: undefined,
+  beginDate: undefined,
+  endDate: undefined
 } as any;
 const projectReportForm = ref<ProjectReportDetailFormEx>({ ...initProjectReportFormData });
 // 新增模式下项目周报明细表单规则验证
@@ -798,7 +820,9 @@ const initProjectReportDetailFormData: ProjectReportDetailForm = {
   contractId: undefined,
   ossId: undefined,
   remark: undefined,
-  activeFlag: undefined
+  activeFlag: undefined,
+  beginDate: undefined,
+  endDate: undefined
 };
 const projectReportDetailData = reactive<PageData<ProjectReportDetailForm, ProjectReportDetailQuery>>({
   form: { ...initProjectReportDetailFormData },
@@ -824,6 +848,8 @@ const projectReportDetailData = reactive<PageData<ProjectReportDetailForm, Proje
     contractId: undefined,
     ossId: undefined,
     activeFlag: undefined,
+    beginDate: undefined,
+    endDate: undefined,
     params: {}
   },
   rules: {
@@ -975,7 +1001,7 @@ const columns = ref<FieldOption[]>([
   { key: 1, label: `项目周报ID`, visible: false },
   { key: 2, label: `项目ID`, visible: false },
   { key: 3, label: `填写日期`, visible: true },
-  { key: 4, label: `所在的工作周`, visible: true },
+  { key: 4, label: `所在的工作周`, visible: false },
   { key: 5, label: `所属里程碑`, visible: true },
   { key: 6, label: `二级进度阶段`, visible: true },
   { key: 7, label: `本周完成工作`, visible: true },
@@ -993,11 +1019,11 @@ const columns = ref<FieldOption[]>([
   { key: 19, label: `备注`, visible: false },
   { key: 20, label: `激活标识`, visible: false },
   { key: 21, label: `创建时间`, visible: true },
-  { key: 22, label: `更新时间`, visible: true }
+  { key: 22, label: `更新时间`, visible: true },
   // { key: 21, label: `删除标志`, visible: true },
   // { key: 22, label: `创建部门`, visible: true },
-  // { key: 23, label: `创建时间`, visible: true },
-  // { key: 24, label: `创建人`, visible: true },
+  { key: 23, label: `开始时间`, visible: true },
+  { key: 24, label: `结束时间`, visible: true }
   // { key: 25, label: `更新人`, visible: true },
   // { key: 26, label: `更新时间`, visible: true }
 ]);
@@ -1126,185 +1152,6 @@ const submitProjectReportForm = () => {
     }
   });
 };
-// 添加响应式变量来存储日期部分
-const datePart = ref(''); // 日期部分（YYYY-MM-DD）
-// 统一处理日期时间格式的函数
-const formatDateTime = (dateStr?: string, includeTime: boolean = true): string => {
-  if (!dateStr) {
-    const now = new Date();
-    const year = now.getFullYear();
-    const month = String(now.getMonth() + 1).padStart(2, '0');
-    const day = String(now.getDate()).padStart(2, '0');
-
-    if (includeTime) {
-      const hours = String(now.getHours()).padStart(2, '0');
-      const minutes = String(now.getMinutes()).padStart(2, '0');
-      const seconds = String(now.getSeconds()).padStart(2, '0');
-      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-    }
-    return `${year}-${month}-${day}`;
-  }
-
-  // 如果传入的日期字符串已经包含时间，直接返回
-  if (dateStr.includes(' ')) {
-    return dateStr;
-  }
-
-  // 如果只有日期，添加默认时间
-  if (includeTime) {
-    const now = new Date();
-    const hours = String(now.getHours()).padStart(2, '0');
-    const minutes = String(now.getMinutes()).padStart(2, '0');
-    const seconds = String(now.getSeconds()).padStart(2, '0');
-    return `${dateStr} ${hours}:${minutes}:${seconds}`;
-  }
-
-  return dateStr;
-};
-
-// 解析日期时间，提取日期部分
-const parseDatePart = (dateTimeStr?: string): string => {
-  if (!dateTimeStr) return '';
-
-  const [date] = dateTimeStr.split(' ');
-  return date || '';
-};
-
-// 工作周计算函数 - 包含星期几
-const getWorkWeek = (dateString: string): string => {
-  if (!dateString) return '';
-
-  try {
-    // 处理可能包含时间的字符串
-    const [datePart] = dateString.split(' ');
-    const date = new Date(datePart);
-
-    if (isNaN(date.getTime())) {
-      console.warn('无效的日期格式:', dateString);
-      return '';
-    }
-
-    const year = date.getFullYear();
-    const firstDayOfYear = new Date(year, 0, 1);
-
-    // 使用时间戳计算天数差
-    const timeDiff = date.getTime() - firstDayOfYear.getTime();
-    const days = Math.floor(timeDiff / (24 * 60 * 60 * 1000)) + 1;
-
-    // 计算周数
-    const firstDayWeek = firstDayOfYear.getDay();
-    const isoFirstDayWeek = firstDayWeek === 0 ? 7 : firstDayWeek;
-    const weekNumber = Math.ceil((days + isoFirstDayWeek - 1) / 7);
-
-    // 获取星期几（0-周日，1-周一，...，6-周六）
-    const weekday = date.getDay();
-    const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
-
-    return `${weekdays[weekday]}`;
-  } catch (error) {
-    console.error('计算工作周失败:', error);
-    return '';
-  }
-};
-
-// 初始化默认日期
-const initDefaultDate = () => {
-  if (routeParams.value.type === 'add') {
-    // 确保 fillTime 有完整的日期时间格式
-    if (!projectReportForm.value.fillTime) {
-      projectReportForm.value.fillTime = formatDateTime();
-    } else {
-      // 确保已有的 fillTime 是完整的格式
-      projectReportForm.value.fillTime = formatDateTime(projectReportForm.value.fillTime, true);
-    }
-
-    // 从 fillTime 中提取日期部分设置到 datePart
-    datePart.value = parseDatePart(projectReportForm.value.fillTime);
-
-    // 计算工作周
-    if (datePart.value) {
-      projectReportForm.value.currentWorkWeek = getWorkWeek(datePart.value);
-    }
-  }
-};
-
-// 处理日期变化 - 优化版本
-const handleDateChange = (selectedDate: string) => {
-  if (selectedDate) {
-    // 获取当前的时间部分，如果已有 fillTime 则保留原时间，否则使用当前时间
-    let timeStr = '00:00:00'; // 默认时间
-
-    if (projectReportForm.value.fillTime && projectReportForm.value.fillTime.includes(' ')) {
-      const [, existingTime] = projectReportForm.value.fillTime.split(' ');
-      if (existingTime) {
-        timeStr = existingTime;
-      } else {
-        const now = new Date();
-        const hours = String(now.getHours()).padStart(2, '0');
-        const minutes = String(now.getMinutes()).padStart(2, '0');
-        const seconds = String(now.getSeconds()).padStart(2, '0');
-        timeStr = `${hours}:${minutes}:${seconds}`;
-      }
-    } else {
-      const now = new Date();
-      const hours = String(now.getHours()).padStart(2, '0');
-      const minutes = String(now.getMinutes()).padStart(2, '0');
-      const seconds = String(now.getSeconds()).padStart(2, '0');
-      timeStr = `${hours}:${minutes}:${seconds}`;
-    }
-
-    // 组合成完整的日期时间字符串
-    projectReportForm.value.fillTime = `${selectedDate} ${timeStr}`;
-
-    // 计算工作周
-    projectReportForm.value.currentWorkWeek = getWorkWeek(selectedDate);
-  } else {
-    // 如果清空了日期
-    projectReportForm.value.fillTime = '';
-    projectReportForm.value.currentWorkWeek = '';
-  }
-};
-
-// 添加修改对话框的日期部分变量
-const modifyDatePart = ref('');
-
-// 处理修改对话框日期变化
-const handleModifyDateChange = (selectedDate: string) => {
-  if (selectedDate) {
-    // 获取当前的时间部分，如果已有 fillTime 则保留原时间
-    let timeStr = '00:00:00'; // 默认时间
-
-    if (detailForm.value.fillTime && detailForm.value.fillTime.includes(' ')) {
-      const [, existingTime] = detailForm.value.fillTime.split(' ');
-      if (existingTime) {
-        timeStr = existingTime;
-      } else {
-        const now = new Date();
-        const hours = String(now.getHours()).padStart(2, '0');
-        const minutes = String(now.getMinutes()).padStart(2, '0');
-        const seconds = String(now.getSeconds()).padStart(2, '0');
-        timeStr = `${hours}:${minutes}:${seconds}`;
-      }
-    } else {
-      const now = new Date();
-      const hours = String(now.getHours()).padStart(2, '0');
-      const minutes = String(now.getMinutes()).padStart(2, '0');
-      const seconds = String(now.getSeconds()).padStart(2, '0');
-      timeStr = `${hours}:${minutes}:${seconds}`;
-    }
-
-    // 组合成完整的日期时间字符串
-    detailForm.value.fillTime = `${selectedDate} ${timeStr}`;
-
-    // 计算工作周
-    detailForm.value.currentWorkWeek = getWorkWeek(selectedDate);
-  } else {
-    // 如果清空了日期
-    detailForm.value.fillTime = '';
-    detailForm.value.currentWorkWeek = '';
-  }
-};
-
 // 审批记录
 const handleApprovalRecord = (row?: ProjectReportDetailVO) => {
   if (row) {
@@ -1349,11 +1196,6 @@ const getProjectDetail = async () => {
     reportId: form.value.reportId
   });
   projectReportDetailList.value = res.rows;
-  // 确保每条数据的 fillTime 都有完整格式
-  projectReportDetailList.value = res.rows.map((item) => ({
-    ...item,
-    fillTime: formatDateTime(item.fillTime, true)
-  }));
   total.value = res.total;
   loading.value = false;
 };
@@ -1370,8 +1212,8 @@ const isDetailFormDisabled = computed(() => {
 const shouldCheckApprovalData = computed(() => {
   return (routeParams.value.type === 'add' || routeParams.value.type === 'update') && routeParams.value.reportData;
 });
+
 // 查询是否存在审批中的数据
-// 在 checkApprovalData 函数中确保日期格式
 const checkApprovalData = async () => {
   try {
     if (!shouldCheckApprovalData.value) return;
@@ -1396,14 +1238,12 @@ const checkApprovalData = async () => {
           const approvalData = res.rows[0];
           Object.assign(projectReportForm.value, approvalData);
 
-          // 确保 fillTime 有完整格式
-          projectReportForm.value.fillTime = formatDateTime(approvalData.fillTime, true);
-
-          // 设置日期部分
-          datePart.value = parseDatePart(projectReportForm.value.fillTime);
-
           // 确保 flowStatus 被正确设置为 'waiting'
           projectReportForm.value.flowStatus = 'waiting';
+          // 设置日期范围
+          if (approvalData.beginDate && approvalData.endDate) {
+            dateRange.value = [approvalData.beginDate, approvalData.endDate];
+          }
         } else {
           hasApprovalData.value = false;
         }
@@ -1433,6 +1273,15 @@ watch(
 const submitForm = async (status: string, mode: boolean) => {
   try {
     buttonLoading.value = true;
+    // 处理日期范围数据
+    if (dateRange.value && dateRange.value.length === 2) {
+      // 将日期范围拆分为 beginDate 和 endDate
+      projectReportForm.value.beginDate = String(dateRange.value[0]);
+      projectReportForm.value.endDate = String(dateRange.value[1]);
+    } else if (projectReportForm.value.beginDate && projectReportForm.value.endDate) {
+      // 如果已经存在 beginDate 和 endDate，则设置到 dateRange 中
+      dateRange.value = [projectReportForm.value.beginDate, projectReportForm.value.endDate];
+    }
     // 验证两个表单
     let formValid = false;
     let detailFormValid = false;
@@ -1484,11 +1333,9 @@ const submitForm = async (status: string, mode: boolean) => {
         businessTitle: '项目周报明细',
         businessCode: msg
       };
-      form.value.status = '0';
       // 直接使用现有的两个表单数据
       projectReportForm.value.projectId = form.value.projectId;
       projectReportForm.value.flowStatus = 'waiting';
-      // projectReportForm.value.projectPhases = String(form.value.reportId);
 
       const requestData = {
         projectReport: form.value, // 项目周报数据
@@ -1497,8 +1344,6 @@ const submitForm = async (status: string, mode: boolean) => {
       const res = await projectReportSubmitAndFlowStart(requestData).finally(() => (buttonLoading.value = false));
       projectReportForm.value = { ...projectReportForm.value, ...res.data };
 
-      // // 提交成功后清除缓存
-      // clearDraftCache();
       proxy?.$modal.msgSuccess('操作成功');
       proxy?.$tab.closePage();
       router.go(-1);
@@ -1545,14 +1390,19 @@ onMounted(async () => {
 
       if (routeParams.value.type === 'add') {
         // 检查是否有审批中的数据（在add模式下）
-        initDefaultDate();
         if (shouldCheckApprovalData.value) {
           await checkApprovalData();
         } else {
           Object.assign(projectReportForm.value, reportData);
-          // 确保项目周报表单的日期格式正确
-          projectReportForm.value.fillTime = formatDateTime(projectReportForm.value.fillTime, true);
-          datePart.value = parseDatePart(projectReportForm.value.fillTime);
+          // 新增模式下自动设置当前日期时间
+          const now = new Date();
+          const year = now.getFullYear();
+          const month = String(now.getMonth() + 1).padStart(2, '0');
+          const day = String(now.getDate()).padStart(2, '0');
+          const hours = String(now.getHours()).padStart(2, '0');
+          const minutes = String(now.getMinutes()).padStart(2, '0');
+          const seconds = String(now.getSeconds()).padStart(2, '0');
+          projectReportForm.value.fillTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
           projectReportForm.value.informationNote = undefined;
           projectReportForm.value.remark = undefined;
           projectReportForm.value.ossId = undefined;
@@ -1570,18 +1420,25 @@ onMounted(async () => {
         const res = await listProjectReportDetail({ pageNum: 1, pageSize: 10, reportId: reportId });
         if (res.rows && res.rows.length > 0) {
           const detailData = res.rows[0];
-          // 确保日期格式正确
-          detailData.fillTime = formatDateTime(detailData.fillTime, true);
           Object.assign(projectReportForm.value, detailData);
-          datePart.value = parseDatePart(projectReportForm.value.fillTime);
         }
-        Object.assign(projectReportForm.value, res.rows[0]);
+        // view模式下设置日期范围
+        if (projectReportForm.value.beginDate && projectReportForm.value.endDate) {
+          dateRange.value = [projectReportForm.value.beginDate, projectReportForm.value.endDate];
+        }
       }
       proxy?.$modal.closeLoading();
     } else if (routeParams.value.type === 'add') {
-      // 纯新增模式，初始化默认日期和时间，会检查缓存
-      initDefaultDate();
-    } else if (routeParams.value.type === 'approval' || routeParams.value.type === 'view') {
+      // 纯新增模式，设置当前日期时间
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = String(now.getMonth() + 1).padStart(2, '0');
+      const day = String(now.getDate()).padStart(2, '0');
+      const hours = String(now.getHours()).padStart(2, '0');
+      const minutes = String(now.getMinutes()).padStart(2, '0');
+      const seconds = String(now.getSeconds()).padStart(2, '0');
+      projectReportForm.value.fillTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    } else if (routeParams.value.type === 'approval' || routeParams.value.type === 'view' || routeParams.value.type === 'update') {
       // 编辑或审批模式：从接口获取数据
       const projectDetailReportId = routeParams.value.id;
       if (projectDetailReportId) {
@@ -1591,24 +1448,24 @@ onMounted(async () => {
         if (reportId && routeParams.value.type === 'view') {
           const reportRes = await getProjectReport(reportId);
           Object.assign(form.value, reportRes.data);
-          // 确保日期格式正确
-          reportDetailRes.data.fillTime = formatDateTime(reportDetailRes.data.fillTime, true);
           Object.assign(projectReportForm.value, reportDetailRes.data);
-
-          // 设置日期部分
-          datePart.value = parseDatePart(projectReportForm.value.fillTime);
           projectReportDetailList.value = [reportDetailRes.data];
         }
         if (reportId && routeParams.value.type === 'approval') {
           const reportRes = await getProjectReport(reportId);
           Object.assign(form.value, reportRes.data);
-          // 确保日期格式正确
-          reportDetailRes.data.fillTime = formatDateTime(reportDetailRes.data.fillTime, true);
           Object.assign(projectReportForm.value, reportDetailRes.data);
-
-          // 设置日期部分
-          datePart.value = parseDatePart(projectReportForm.value.fillTime);
         }
+        // view模式下设置日期范围
+        if (projectReportForm.value.beginDate && projectReportForm.value.endDate) {
+          dateRange.value = [projectReportForm.value.beginDate, projectReportForm.value.endDate];
+        }
+        if (reportId && routeParams.value.type === 'update') {
+          const reportRes = await getProjectReport(reportId);
+          Object.assign(form.value, reportRes.data);
+          Object.assign(projectReportForm.value, reportDetailRes.data);
+        }
+
         proxy?.$modal.closeLoading();
       }
     }
diff --git a/src/views/oa/erp/projectReport/index.vue b/src/views/oa/erp/projectReport/index.vue
index ba041ab..44f2c87 100644
--- a/src/views/oa/erp/projectReport/index.vue
+++ b/src/views/oa/erp/projectReport/index.vue
@@ -131,7 +131,7 @@
         <el-table-column label="更新时间" align="center" prop="updateTime" width="100" v-if="columns[15].visible" />
         <el-table-column label="操作" align="center" width="150" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="新增已有周报明细" placement="top" v-if="scope.row.status === '0'">
+            <el-tooltip content="新增已有周报明细" placement="top" v-if="scope.row.status !== '1'">
               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['oa/erp:projectReport:add']"></el-button>
             </el-tooltip>
             <el-tooltip content="修改" placement="top" v-if="scope.row.status === '1'">
@@ -143,7 +143,7 @@
                 v-hasPermi="['oa/erp:projectReport:edit']"
               ></el-button>
             </el-tooltip>
-            <el-tooltip content="查看详情" placement="top">
+            <el-tooltip content="查看详情" placement="top" v-if="scope.row.status !== '1'">
               <el-button link type="info" icon="DocumentChecked" @click="handleView(scope.row)"></el-button>
             </el-tooltip>
             <!-- <el-tooltip content="删除" placement="top">